#
luxiaotao1123
2024-02-23 0778a1c1aeface0f6602d0fbf44da96e31566034
#
2个文件已修改
1个文件已添加
36 ■■■■■ 已修改文件
zy-asrs-flow/src/pages/system/role/index.jsx 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/src/utils/common-util.js 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-framework/src/main/resources/templates/react/Index.txt 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/src/pages/system/role/index.jsx
@@ -13,6 +13,9 @@
import Scope from './components/scope'
import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
import { statusMap } from '@/utils/enum-util'
import { repairBug } from '@/utils/common-util';
const TABLE_KEY = "pro-table-role";
const handleSave = async (val) => {
    const hide = message.loading('正在添加');
@@ -203,7 +206,6 @@
            title: '备注',
            dataIndex: 'memo',
            valueType: 'text',
            hidden: false,
            filterDropdown: (props) => <TextFilter
                name='memo'
                {...props}
@@ -340,9 +342,10 @@
                        }
                    }}
                    columnsState={{
                        persistenceKey: 'pro-table-role',
                        persistenceKey: TABLE_KEY,
                        persistenceType: 'localStorage',
                        defaultValue: {
                            memo: { show: repairBug(TABLE_KEY, 'memo', false) },
                            option: { fixed: 'right', disable: true },
                        },
                        onChange(value) {
zy-asrs-flow/src/utils/common-util.js
New file
@@ -0,0 +1,24 @@
export const generateColumnsState = (cols) => cols.reduce((acc, { dataIndex, show = true }) => ({ ...acc, [dataIndex]: { show: show } }), {});
export const repairBug = (tabKey, key, val) => {
    const stateStr = localStorage.getItem(tabKey);
    if (stateStr) {
        const state = JSON.parse(stateStr);
        const oldVal = state[key].show;
        let hasVal = false;
        if (oldVal === true) {
            hasVal = true;
        }
        if (oldVal === false) {
            hasVal = true;
        }
        if (hasVal) {
            return oldVal;
        } else {
            return val;
        }
    } else {
        return val;
    }
}
zy-asrs-framework/src/main/resources/templates/react/Index.txt
@@ -12,6 +12,9 @@
import Edit from './components/edit'
import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
import { statusMap } from '@/utils/enum-util'
import { repairBug } from '@/utils/common-util';
const TABLE_KEY = "pro-table-role";
const handleSave = async (val) => {
    const hide = message.loading('正在添加');
@@ -221,7 +224,7 @@
                        }
                    }}
                    columnsState={{
                        persistenceKey: 'pro-table-@{SIMPLEENTITYNAME}',
                        persistenceKey: TABLE_KEY,
                        persistenceType: 'localStorage',
                        defaultValue: {
                            option: { fixed: 'right', disable: true },