From e54c84cc9742d20b80c454827d5be5e0bdbf779b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 23 二月 2024 16:01:34 +0800
Subject: [PATCH] #
---
zy-asrs-framework/src/main/resources/templates/react/Index.txt | 1 +
zy-asrs-flow/src/utils/common-util.js | 2 +-
zy-asrs-flow/src/pages/system/user/index.jsx | 47 ++++++++++++++++++++++++++++++++---------------
3 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/user/index.jsx b/zy-asrs-flow/src/pages/system/user/index.jsx
index 6e13316..170b255 100644
--- a/zy-asrs-flow/src/pages/system/user/index.jsx
+++ b/zy-asrs-flow/src/pages/system/user/index.jsx
@@ -15,6 +15,9 @@
import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
import { transformTreeData, getTreeAllKeys } from '@/utils/tree-util'
import { statusMap } from '@/utils/enum-util'
+import { repairBug } from '@/utils/common-util';
+
+const TABLE_KEY = "pro-table-user";
const handleSave = async (val) => {
const hide = message.loading('姝ｅ湪娣诲姞');
@@ -218,7 +221,7 @@
title: '瀵嗙爜',
dataIndex: 'password',
valueType: 'password',
- hidden: true,
+ hidden: false,
width: 100,
filterDropdown: (props) => <TextFilter
name='password'
@@ -231,7 +234,7 @@
title: '澶村儚',
dataIndex: 'avatar',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <TextFilter
name='avatar'
@@ -244,7 +247,7 @@
title: '宸ュ彿',
dataIndex: 'code',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <TextFilter
name='code'
@@ -275,7 +278,7 @@
title: '鎵嬫満鍙�',
dataIndex: 'phone',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 100,
filterDropdown: (props) => <TextFilter
name='phone'
@@ -288,7 +291,7 @@
title: '閭',
dataIndex: 'email',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <TextFilter
name='email'
@@ -301,7 +304,7 @@
title: '閭楠岃瘉',
dataIndex: 'emailVerified$',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <SelectFilter
name='emailVerified'
@@ -333,7 +336,7 @@
title: '鐪熷疄濮撳悕',
dataIndex: 'realName',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <TextFilter
name='realName'
@@ -346,7 +349,7 @@
title: '韬唤璇佸彿',
dataIndex: 'idCard',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <TextFilter
name='idCard'
@@ -359,7 +362,7 @@
title: '鍑虹敓鏃ユ湡',
dataIndex: 'birthday',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <TextFilter
name='birthday'
@@ -372,7 +375,7 @@
title: '涓汉绠�浠�',
dataIndex: 'introduction',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <TextFilter
name='introduction'
@@ -406,7 +409,7 @@
title: '娣诲姞鏃堕棿',
dataIndex: 'createTime$',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <DatetimeRangeFilter
name='createTime'
@@ -419,7 +422,7 @@
title: '淇敼鏃堕棿',
dataIndex: 'updateTime$',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <DatetimeRangeFilter
name='updateTime'
@@ -432,7 +435,7 @@
title: '淇敼浜哄憳',
dataIndex: 'updateBy$',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <LinkFilter
name='updateBy'
@@ -446,7 +449,7 @@
title: '澶囨敞',
dataIndex: 'memo',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <TextFilter
name='memo'
@@ -658,9 +661,23 @@
}
}}
columnsState={{
- persistenceKey: 'pro-table-user',
+ persistenceKey: TABLE_KEY,
persistenceType: 'localStorage',
defaultValue: {
+ password: { show: repairBug(TABLE_KEY, 'password', false) },
+ avatar: { show: repairBug(TABLE_KEY, 'avatar', false) },
+ code: { show: repairBug(TABLE_KEY, 'code', false) },
+ phone: { show: repairBug(TABLE_KEY, 'phone', false) },
+ email: { show: repairBug(TABLE_KEY, 'email', false) },
+ emailVerified$: { show: repairBug(TABLE_KEY, 'emailVerified$', false) },
+ realName: { show: repairBug(TABLE_KEY, 'realName', false) },
+ idCard: { show: repairBug(TABLE_KEY, 'idCard', false) },
+ birthday: { show: repairBug(TABLE_KEY, 'birthday', false) },
+ introduction: { show: repairBug(TABLE_KEY, 'introduction', false) },
+ createTime$: { show: repairBug(TABLE_KEY, 'createTime$', false) },
+ updateTime$: { show: repairBug(TABLE_KEY, 'updateTime$', false) },
+ updateBy$: { show: repairBug(TABLE_KEY, 'updateBy$', false) },
+ memo: { show: repairBug(TABLE_KEY, 'memo', false) },
option: { fixed: 'right', disable: true },
},
onChange(value) {
diff --git a/zy-asrs-flow/src/utils/common-util.js b/zy-asrs-flow/src/utils/common-util.js
index 60875e4..b8939ba 100644
--- a/zy-asrs-flow/src/utils/common-util.js
+++ b/zy-asrs-flow/src/utils/common-util.js
@@ -5,7 +5,7 @@
const stateStr = localStorage.getItem(tabKey);
if (stateStr) {
const state = JSON.parse(stateStr);
- const oldVal = state[key].show;
+ const oldVal = state[key]?.show;
let hasVal = false;
if (oldVal === true) {
hasVal = true;
diff --git a/zy-asrs-framework/src/main/resources/templates/react/Index.txt b/zy-asrs-framework/src/main/resources/templates/react/Index.txt
index 5608a6c..f253b50 100644
--- a/zy-asrs-framework/src/main/resources/templates/react/Index.txt
+++ b/zy-asrs-framework/src/main/resources/templates/react/Index.txt
@@ -227,6 +227,7 @@
persistenceKey: TABLE_KEY,
persistenceType: 'localStorage',
defaultValue: {
+ memo: { show: repairBug(TABLE_KEY, 'memo', false) },
option: { fixed: 'right', disable: true },
},
onChange(value) {
--
Gitblit v1.9.1