From 28d1abc0ca7b2ad9599413ecd454796d05b2ccc4 Mon Sep 17 00:00:00 2001
From: shiyang <liaosy21@gmail.com>
Date: Sun, 9 May 2021 16:20:43 +0800
Subject: [PATCH] update global cluster_id

---
 web/src/models/global.js                          |  1 +
 .../pages/SearchManage/models/searchTemplate.js   | 13 +++++++++----
 .../pages/SearchManage/template/SearchTemplate.js | 15 ++++++---------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/web/src/models/global.js b/web/src/models/global.js
index a8e194ef..935a9873 100644
--- a/web/src/models/global.js
+++ b/web/src/models/global.js
@@ -71,6 +71,7 @@ export default {
             type: 'saveData',
             payload:{
               selectedCluster: data[0],
+              selectedClusterID: (data[0] || {}).id
             }
           });
         }
diff --git a/web/src/pages/SearchManage/models/searchTemplate.js b/web/src/pages/SearchManage/models/searchTemplate.js
index 8b43cc90..97ff3e9a 100644
--- a/web/src/pages/SearchManage/models/searchTemplate.js
+++ b/web/src/pages/SearchManage/models/searchTemplate.js
@@ -14,7 +14,8 @@ export default {
   },
 
   effects: {
-    *fetchList({ payload }, { call, put }) {
+    *fetchList({ payload }, { call, put , select }) {
+      payload.cluster_id = yield select(state => state.global.selectedClusterID);
       const res = yield call(getTemplateList, payload);
       console.log("fetchList response:",res);
       if (res.hits) {
@@ -39,7 +40,8 @@ export default {
         message.warning(res.msg);
       }
     },
-    *add({ payload, callback }, { call, put }) {
+    *add({ payload, callback }, { call, put , select }) {
+      payload.cluster_id =yield select(state => state.global.selectedClusterID);
       const res = yield call(addTemplate, payload);
       console.log("add res:",res);
       //业务数据格式化处理
@@ -59,7 +61,8 @@ export default {
 
       if (callback) callback();
     },
-    *update({ payload, callback }, { call, put }) {
+    *update({ payload, callback }, { call, put , select }) {
+      payload.cluster_id = yield select(state => state.global.selectedClusterID);
       const res = yield call(updateTemplate, payload);
       console.log("update res:",res);
       //业务数据格式化处理
@@ -69,7 +72,9 @@ export default {
 
       if (callback) callback();
     },
-    *delete({ payload, callback }, { call, put }) {
+    *delete({ payload, callback }, { call, put, select }) {
+      // payload.cluster_id =yield select(state => state.global.selectedClusterID);
+      payload.cluster_id = yield select(state => state.global.selectedClusterID);
       const payloadNew = {...payload};
       if (Array.isArray(payload.id)) {
         payloadNew.id = payload.id.toString();
diff --git a/web/src/pages/SearchManage/template/SearchTemplate.js b/web/src/pages/SearchManage/template/SearchTemplate.js
index 0bcf135a..a754683c 100644
--- a/web/src/pages/SearchManage/template/SearchTemplate.js
+++ b/web/src/pages/SearchManage/template/SearchTemplate.js
@@ -108,8 +108,8 @@ const UpdateForm = Form.create()(props => {
   loading: loading.effects['searchTemplate/fetchList'],
   list:searchTemplate.list,
   pagination: searchTemplate.pagination,
-  clusterID:global.selectedCluster.id,
 }))
+
 @Form.create()
 class SearchTemplate extends PureComponent {
   state = {
@@ -156,8 +156,8 @@ class SearchTemplate extends PureComponent {
 
   //获取基本数据列表
   handleGetListData = () => {
-    const {dispatch,clusterID} = this.props;
-    let payload = {size: 10, from: 0,cluster_id:clusterID};
+    const {dispatch} = this.props;
+    let payload = {size: 10, from: 0};
     if (this.state.formValues.name) {
       payload.name = this.state.formValues.name;
     }
@@ -202,14 +202,13 @@ class SearchTemplate extends PureComponent {
   };
 
   handleDeleteClick = e => {
-    const { dispatch,clusterID } = this.props;
+    const { dispatch} = this.props;
     const { selectedRows } = this.state;
 
     if (!selectedRows) return message.warn("请选择需要删除的行");
         dispatch({
           type: 'searchTemplate/delete',
           payload: {
-            cluster_id: clusterID,
             id: selectedRows.map(row => row.id),
           },
           callback: () => {
@@ -264,11 +263,10 @@ class SearchTemplate extends PureComponent {
   };
 
   handleAdd = fields => {
-    const { dispatch,clusterID } = this.props;
+    const { dispatch} = this.props;
     dispatch({
       type: 'searchTemplate/add',
       payload: {
-        cluster_id: clusterID,
         name: fields.name,
         source: fields.source,
       },
@@ -279,11 +277,10 @@ class SearchTemplate extends PureComponent {
   };
 
   handleUpdate = fields => {
-    const { dispatch,clusterID } = this.props;
+    const { dispatch} = this.props;
     dispatch({
       type: 'searchTemplate/update',
       payload: {
-        cluster_id: clusterID,
         id: fields.id,
         name: fields.name,
         source: fields.source,