From 4ed59b0664e2655f51caad0de25004bab2ecc77e Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Fri, 5 Nov 2021 23:14:57 +0800
Subject: [PATCH] =?UTF-8?q?A=20=E8=A1=A8=E6=A0=BC=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=88=97=E7=BC=96=E8=BE=91=E5=90=8E=E8=87=AA=E5=8A=A8=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spug_web/src/components/TableCard.js          | 27 ++++++++++++++++---
 spug_web/src/pages/alarm/alarm/Table.js       |  1 +
 spug_web/src/pages/alarm/contact/Table.js     |  1 +
 spug_web/src/pages/alarm/group/Table.js       |  1 +
 spug_web/src/pages/config/app/Table.js        |  1 +
 .../src/pages/config/environment/Table.js     |  1 +
 spug_web/src/pages/config/service/Table.js    |  1 +
 spug_web/src/pages/deploy/app/Table.js        |  1 +
 spug_web/src/pages/deploy/repository/Table.js |  1 +
 spug_web/src/pages/deploy/request/Table.js    |  1 +
 spug_web/src/pages/exec/template/Table.js     |  1 +
 spug_web/src/pages/host/Table.js              |  1 +
 spug_web/src/pages/monitor/Table.js           |  1 +
 spug_web/src/pages/schedule/Table.js          |  1 +
 spug_web/src/pages/system/account/Table.js    |  1 +
 spug_web/src/pages/system/role/Table.js       |  2 +-
 16 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/spug_web/src/components/TableCard.js b/spug_web/src/components/TableCard.js
index b9e2b25..46e974a 100644
--- a/spug_web/src/components/TableCard.js
+++ b/spug_web/src/components/TableCard.js
@@ -8,6 +8,9 @@ import { Table, Space, Divider, Popover, Checkbox, Button, Input, Select } from
 import { ReloadOutlined, SettingOutlined, FullscreenOutlined, SearchOutlined } from '@ant-design/icons';
 import styles from './index.module.less';
 
+let TableFields = localStorage.getItem('TableFields')
+TableFields = TableFields ? JSON.parse(TableFields) : {}
+
 function Search(props) {
   let keys = props.keys || [''];
   keys = keys.map(x => x.split('/'));
@@ -135,13 +138,31 @@ function TableCard(props) {
         _columns = [props.children.props]
       }
     }
+    let hideFields = _columns.filter(x => x.hide).map(x => x.title)
+    if (props.tKey) {
+      if (TableFields[props.tKey]) {
+        hideFields = TableFields[props.tKey]
+      } else {
+        TableFields[props.tKey] = hideFields
+        localStorage.setItem('TableFields', JSON.stringify(TableFields))
+      }
+    }
     for (let [index, item] of _columns.entries()) {
-      if (!item.hide) _fields.push(index)
+      if (!hideFields.includes(item.title)) _fields.push(index)
     }
     setFields(_fields);
     setColumns(_columns);
     setDefaultFields(_fields);
-  }, [props.columns, props.children])
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
+  function handleFieldsChange(fields) {
+    setFields(fields)
+    if (props.tKey) {
+      TableFields[props.tKey] = columns.filter((_, index) => !fields.includes(index)).map(x => x.title)
+      localStorage.setItem('TableFields', JSON.stringify(TableFields))
+    }
+  }
 
   return (
     <div ref={rootRef} className={styles.tableCard}>
@@ -152,7 +173,7 @@ function TableCard(props) {
         fields={fields}
         rootRef={rootRef}
         defaultFields={defaultFields}
-        onFieldsChange={setFields}
+        onFieldsChange={handleFieldsChange}
         onReload={props.onReload}/>
       <Table
         rowKey={props.rowKey}
diff --git a/spug_web/src/pages/alarm/alarm/Table.js b/spug_web/src/pages/alarm/alarm/Table.js
index 42afd6d..32595cb 100644
--- a/spug_web/src/pages/alarm/alarm/Table.js
+++ b/spug_web/src/pages/alarm/alarm/Table.js
@@ -67,6 +67,7 @@ class ComTable extends React.Component {
   render() {
     return (
       <TableCard
+        tKey="aa"
         rowKey="id"
         title="报警历史记录"
         loading={store.isFetching}
diff --git a/spug_web/src/pages/alarm/contact/Table.js b/spug_web/src/pages/alarm/contact/Table.js
index 3ee3d6f..635bc8c 100644
--- a/spug_web/src/pages/alarm/contact/Table.js
+++ b/spug_web/src/pages/alarm/contact/Table.js
@@ -34,6 +34,7 @@ class ComTable extends React.Component {
   render() {
     return (
       <TableCard
+        tKey="ac"
         rowKey="id"
         title="报警联系人"
         loading={store.isFetching}
diff --git a/spug_web/src/pages/alarm/group/Table.js b/spug_web/src/pages/alarm/group/Table.js
index c058af1..02478ad 100644
--- a/spug_web/src/pages/alarm/group/Table.js
+++ b/spug_web/src/pages/alarm/group/Table.js
@@ -56,6 +56,7 @@ class ComTable extends React.Component {
   render() {
     return (
       <TableCard
+        tKey="ag"
         rowKey="id"
         title="报警联系组"
         loading={store.isFetching}
diff --git a/spug_web/src/pages/config/app/Table.js b/spug_web/src/pages/config/app/Table.js
index dc22064..db6c64e 100644
--- a/spug_web/src/pages/config/app/Table.js
+++ b/spug_web/src/pages/config/app/Table.js
@@ -43,6 +43,7 @@ class ComTable extends React.Component {
     }
     return (
       <TableCard
+        tKey="ca"
         rowKey="id"
         title="应用列表"
         loading={store.isFetching}
diff --git a/spug_web/src/pages/config/environment/Table.js b/spug_web/src/pages/config/environment/Table.js
index d9f0345..7a8ed65 100644
--- a/spug_web/src/pages/config/environment/Table.js
+++ b/spug_web/src/pages/config/environment/Table.js
@@ -38,6 +38,7 @@ function ComTable() {
 
   return (
     <TableCard
+      tKey="ce"
       rowKey="id"
       title="环境列表"
       loading={store.isFetching}
diff --git a/spug_web/src/pages/config/service/Table.js b/spug_web/src/pages/config/service/Table.js
index 16ee38f..f19cb77 100644
--- a/spug_web/src/pages/config/service/Table.js
+++ b/spug_web/src/pages/config/service/Table.js
@@ -39,6 +39,7 @@ class ComTable extends React.Component {
   render() {
     return (
       <TableCard
+        tKey="cs"
         rowKey="id"
         title="服务列表"
         loading={store.isFetching}
diff --git a/spug_web/src/pages/deploy/app/Table.js b/spug_web/src/pages/deploy/app/Table.js
index 2e801d5..93c119b 100644
--- a/spug_web/src/pages/deploy/app/Table.js
+++ b/spug_web/src/pages/deploy/app/Table.js
@@ -118,6 +118,7 @@ function ComTable() {
 
   return (
     <TableCard
+      tKey="da"
       title="应用列表"
       rowKey="id"
       loading={store.isFetching}
diff --git a/spug_web/src/pages/deploy/repository/Table.js b/spug_web/src/pages/deploy/repository/Table.js
index 1faa30e..069f26d 100644
--- a/spug_web/src/pages/deploy/repository/Table.js
+++ b/spug_web/src/pages/deploy/repository/Table.js
@@ -64,6 +64,7 @@ function ComTable() {
   const statusColorMap = {'0': 'cyan', '1': 'blue', '2': 'red', '5': 'green'};
   return (
     <TableCard
+      tKey="dre"
       rowKey="id"
       title="构建版本列表"
       loading={store.isFetching}
diff --git a/spug_web/src/pages/deploy/request/Table.js b/spug_web/src/pages/deploy/request/Table.js
index 280b298..7edc112 100644
--- a/spug_web/src/pages/deploy/request/Table.js
+++ b/spug_web/src/pages/deploy/request/Table.js
@@ -154,6 +154,7 @@ function ComTable() {
 
   return (
     <TableCard
+      tKey="dr"
       rowKey="id"
       title="申请列表"
       columns={columns}
diff --git a/spug_web/src/pages/exec/template/Table.js b/spug_web/src/pages/exec/template/Table.js
index c8a8cfe..c270c2e 100644
--- a/spug_web/src/pages/exec/template/Table.js
+++ b/spug_web/src/pages/exec/template/Table.js
@@ -41,6 +41,7 @@ class ComTable extends React.Component {
     }
     return (
       <TableCard
+        tKey="et"
         title="模板列表"
         rowKey="id"
         loading={store.isFetching}
diff --git a/spug_web/src/pages/host/Table.js b/spug_web/src/pages/host/Table.js
index 600f35c..83fd049 100644
--- a/spug_web/src/pages/host/Table.js
+++ b/spug_web/src/pages/host/Table.js
@@ -49,6 +49,7 @@ function ComTable() {
 
   return (
     <TableCard
+      tKey="hi"
       rowKey="id"
       title={<Input placeholder="输入检索" style={{maxWidth: 250}} onChange={e => store.f_word = e.target.value}/>}
       loading={store.isFetching}
diff --git a/spug_web/src/pages/monitor/Table.js b/spug_web/src/pages/monitor/Table.js
index daddc8c..449af4f 100644
--- a/spug_web/src/pages/monitor/Table.js
+++ b/spug_web/src/pages/monitor/Table.js
@@ -71,6 +71,7 @@ class ComTable extends React.Component {
   render() {
     return (
       <TableCard
+        tKey="mi"
         rowKey="id"
         title="监控任务"
         loading={store.isFetching}
diff --git a/spug_web/src/pages/schedule/Table.js b/spug_web/src/pages/schedule/Table.js
index 793d95d..950f444 100644
--- a/spug_web/src/pages/schedule/Table.js
+++ b/spug_web/src/pages/schedule/Table.js
@@ -124,6 +124,7 @@ class ComTable extends React.Component {
   render() {
     return (
       <TableCard
+        tKey="si"
         rowKey="id"
         title="任务列表"
         loading={store.isFetching}
diff --git a/spug_web/src/pages/system/account/Table.js b/spug_web/src/pages/system/account/Table.js
index 1b1cc17..671f723 100644
--- a/spug_web/src/pages/system/account/Table.js
+++ b/spug_web/src/pages/system/account/Table.js
@@ -95,6 +95,7 @@ class ComTable extends React.Component {
   render() {
     return (
       <TableCard
+        tKey="sa"
         rowKey="id"
         title="账户列表"
         loading={store.isFetching}
diff --git a/spug_web/src/pages/system/role/Table.js b/spug_web/src/pages/system/role/Table.js
index 5d68dd9..ed56b02 100644
--- a/spug_web/src/pages/system/role/Table.js
+++ b/spug_web/src/pages/system/role/Table.js
@@ -58,7 +58,7 @@ class ComTable extends React.Component {
   render() {
     return (
       <TableCard
-        rowKey="id"
+        rowKey="sr"
         title="角色列表"
         loading={store.isFetching}
         dataSource={store.dataSource}