From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/system/menu/index.jsx |  263 ++++++++++++++++++++++++----------------------------
 1 files changed, 121 insertions(+), 142 deletions(-)

diff --git a/zy-asrs-flow/src/pages/system/menu/index.jsx b/zy-asrs-flow/src/pages/system/menu/index.jsx
index e79d9a3..3c83f35 100644
--- a/zy-asrs-flow/src/pages/system/menu/index.jsx
+++ b/zy-asrs-flow/src/pages/system/menu/index.jsx
@@ -7,102 +7,97 @@
     ProTable,
     LightFilter,
 } from '@ant-design/pro-components';
+import { FormattedMessage, useIntl } from '@umijs/max';
 import { PlusOutlined, ExportOutlined } from '@ant-design/icons';
 import Http from '@/utils/http';
 import Edit from './components/edit'
 import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
-import { buildTreeData } from '@/utils/tree-util'
+import { transformTreeData } from '@/utils/tree-util'
+import { createIcon } from '@/utils/icon-util'
+import { statusMap } from '@/utils/enum-util'
+import { repairBug } from '@/utils/common-util';
 
-const statusMap = {
-    1: {
-        color: 'green',
-        text: '姝e父',
-    },
-    0: {
-        color: 'red',
-        text: '绂佺敤',
-    },
-};
+const TABLE_KEY = "pro-table-menu";
 
 const typeMap = {
     0: {
-        color: 'blue',
+        color: 'success',
         text: '鑿滃崟',
     },
     1: {
-        color: '',
+        color: 'default',
         text: '鎸夐挳',
     },
 };
 
-const handleSave = async (val) => {
-    const hide = message.loading('姝e湪娣诲姞');
+const handleSave = async (val, intl) => {
+    const hide = message.loading(intl.formatMessage({ id: 'page.adding', defaultMessage: '姝e湪娣诲姞' }));
     try {
         const resp = await Http.doPost('api/menu/save', val);
         if (resp.code === 200) {
-            message.success('娣诲姞鎴愬姛');
+            message.success(intl.formatMessage({ id: 'page.add.success', defaultMessage: '娣诲姞鎴愬姛' }));
             return true;
         } else {
             message.error(resp.msg);
             return false;
         }
     } catch (error) {
-        message.error('娣诲姞澶辫触璇烽噸璇曪紒');
+        message.error(intl.formatMessage({ id: 'page.add.fail', defaultMessage: '娣诲姞澶辫触璇烽噸璇曪紒' }));
         return false;
     } finally {
         hide();
     }
 };
 
-const handleUpdate = async (val) => {
-    const hide = message.loading('姝e湪鏇存柊');
+const handleUpdate = async (val, intl) => {
+    const hide = message.loading(intl.formatMessage({ id: 'page.updating', defaultMessage: '姝e湪鏇存柊' }));
     try {
         const resp = await Http.doPost('api/menu/update', val);
         if (resp.code === 200) {
-            message.success('鏇存柊鎴愬姛');
+            message.success(intl.formatMessage({ id: 'page.update.success', defaultMessage: '鏇存柊鎴愬姛' }));
             return true;
         } else {
             message.error(resp.msg);
             return false;
         }
     } catch (error) {
-        message.error('閰嶇疆澶辫触璇烽噸璇曪紒');
+        message.error(intl.formatMessage({ id: 'page.update.fail', defaultMessage: '鏇存柊澶辫触璇烽噸璇曪紒' }));
         return false;
     } finally {
         hide();
     }
 };
 
-const handleRemove = async (rows) => {
+const handleRemove = async (rows, intl) => {
     if (!rows) return true;
-    const hide = message.loading('姝e湪鍒犻櫎');
+    const hide = message.loading(intl.formatMessage({ id: 'page.deleting', defaultMessage: '姝e湪鍒犻櫎' }));
     try {
         const resp = await Http.doPost('api/menu/remove/' + rows.map((row) => row.id).join(','));
         if (resp.code === 200) {
-            message.success('鍒犻櫎鎴愬姛');
+            message.success(intl.formatMessage({ id: 'page.delete.success', defaultMessage: '鍒犻櫎鎴愬姛' }));
             return true;
         } else {
             message.error(resp.msg);
             return false;
         }
     } catch (error) {
-        message.error('鍒犻櫎澶辫触锛岃閲嶈瘯');
+        message.error(intl.formatMessage({ id: 'page.delete.fail', defaultMessage: '鍒犻櫎澶辫触锛岃閲嶈瘯锛�' }));
         return false;
     } finally {
         hide();
     }
 };
 
-const handleExport = async () => {
-    const hide = message.loading('姝e湪瀵煎嚭');
+const handleExport = async (intl) => {
+    const hide = message.loading(intl.formatMessage({ id: 'page.exporting', defaultMessage: '姝e湪瀵煎嚭' }));
     try {
         const resp = await Http.doPostBlob('api/menu/export');
         const blob = new Blob([resp], { type: 'application/vnd.ms-excel' });
         window.location.href = window.URL.createObjectURL(blob);
-        message.success('瀵煎嚭鎴愬姛');
+        message.success(intl.formatMessage({ id: 'page.export.success', defaultMessage: '瀵煎嚭鎴愬姛' }));
         return true;
     } catch (error) {
-        message.error('瀵煎嚭澶辫触锛岃閲嶈瘯');
+        message.error(intl.formatMessage({ id: 'page.export.fail', defaultMessage: '瀵煎嚭澶辫触锛岃閲嶈瘯' }));
         return false;
     } finally {
         hide();
@@ -111,6 +106,7 @@
 
 
 const Main = () => {
+    const intl = useIntl();
     const formTableRef = useRef();
     const actionRef = useRef();
     const [selectedRows, setSelectedRows] = useState([]);
@@ -131,12 +127,12 @@
             valueType: 'text',
             hidden: false,
             width: 240,
-            filterDropdown: (props) => <TextFilter
-                name='name'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
+            // filterDropdown: (props) => <TextFilter
+            //     name='name'
+            //     {...props}
+            //     actionRef={actionRef}
+            //     setSearchParam={setSearchParam}
+            // />,
         },
         {
             title: '涓婄骇鑿滃崟',
@@ -152,36 +148,10 @@
             />,
         },
         {
-            title: '涓婄骇鑿滃崟鍚�',
-            dataIndex: 'parentName',
-            valueType: 'text',
-            hidden: true,
-            width: 140,
-            filterDropdown: (props) => <TextFilter
-                name='parentName'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
-        },
-        {
             title: '鍏宠仈璺緞',
-            dataIndex: 'path',
-            valueType: 'text',
-            hidden: true,
-            width: 140,
-            filterDropdown: (props) => <TextFilter
-                name='path'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
-        },
-        {
-            title: '鍏宠仈璺緞鍚�',
             dataIndex: 'pathName',
             valueType: 'text',
-            hidden: true,
+            hidden: false,
             width: 140,
             filterDropdown: (props) => <TextFilter
                 name='pathName'
@@ -196,18 +166,18 @@
             valueType: 'text',
             hidden: false,
             width: 200,
-            filterDropdown: (props) => <TextFilter
-                name='route'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
+            // filterDropdown: (props) => <TextFilter
+            //     name='route'
+            //     {...props}
+            //     actionRef={actionRef}
+            //     setSearchParam={setSearchParam}
+            // />,
         },
         {
             title: '椤甸潰缁勪欢',
             dataIndex: 'component',
             valueType: 'text',
-            hidden: true,
+            hidden: false,
             width: 140,
             filterDropdown: (props) => <TextFilter
                 name='component'
@@ -220,7 +190,7 @@
             title: '绠�杩�',
             dataIndex: 'brief',
             valueType: 'text',
-            hidden: true,
+            hidden: false,
             width: 140,
             filterDropdown: (props) => <TextFilter
                 name='brief'
@@ -233,7 +203,7 @@
             title: '鏍囪瘑',
             dataIndex: 'code',
             valueType: 'text',
-            hidden: true,
+            hidden: false,
             width: 140,
             filterDropdown: (props) => <TextFilter
                 name='code'
@@ -252,16 +222,16 @@
                 const type = typeMap[record.type]
                 return <Tag color={type.color}>{type.text}</Tag>
             },
-            filterDropdown: (props) => <SelectFilter
-                name='type'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-                data={[
-                    { label: '鑿滃崟', value: 0 },
-                    { label: '鎸夐挳', value: 1 },
-                ]}
-            />,
+            // filterDropdown: (props) => <SelectFilter
+            //     name='type'
+            //     {...props}
+            //     actionRef={actionRef}
+            //     setSearchParam={setSearchParam}
+            //     data={[
+            //         { label: '鑿滃崟', value: 0 },
+            //         { label: '鎸夐挳', value: 1 },
+            //     ]}
+            // />,
         },
         {
             title: '鏉冮檺鏍囪瘑',
@@ -269,12 +239,12 @@
             valueType: 'text',
             hidden: false,
             width: 140,
-            filterDropdown: (props) => <TextFilter
-                name='authority'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
+            // filterDropdown: (props) => <TextFilter
+            //     name='authority'
+            //     {...props}
+            //     actionRef={actionRef}
+            //     setSearchParam={setSearchParam}
+            // />,
         },
         {
             title: '鑿滃崟鍥炬爣',
@@ -282,6 +252,9 @@
             valueType: 'text',
             hidden: false,
             width: 140,
+            render: (_, record) => {
+                return createIcon(_);
+            }
         },
         {
             title: '鎺掑簭',
@@ -290,14 +263,14 @@
             hidden: false,
             width: 100,
             render: (_, record) => {
-                return <span st yle={{ fontWeight: "bold" }}>{_}</span>
+                return <span style={{ fontWeight: "bold" }}>{_}</span>
             }
         },
         {
             title: '鍏冧俊鎭�',
             dataIndex: 'meta',
             valueType: 'text',
-            hidden: true,
+            hidden: false,
             width: 140,
             filterDropdown: (props) => <TextFilter
                 name='meta'
@@ -316,22 +289,22 @@
                 const status = statusMap[record.status]
                 return <Tag color={status.color}>{status.text}</Tag>
             },
-            filterDropdown: (props) => <SelectFilter
-                name='status'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-                data={[
-                    { label: '姝e父', value: 1 },
-                    { label: '绂佺敤', value: 0 },
-                ]}
-            />,
+            // filterDropdown: (props) => <SelectFilter
+            //     name='status'
+            //     {...props}
+            //     actionRef={actionRef}
+            //     setSearchParam={setSearchParam}
+            //     data={[
+            //         { label: '姝e父', value: 1 },
+            //         { label: '绂佺敤', value: 0 },
+            //     ]}
+            // />,
         },
         {
             title: '娣诲姞鏃堕棿',
             dataIndex: 'createTime$',
             valueType: 'text',
-            hidden: true,
+            hidden: false,
             width: 140,
             filterDropdown: (props) => <DatetimeRangeFilter
                 name='createTime'
@@ -344,7 +317,7 @@
             title: '娣诲姞浜哄憳',
             dataIndex: 'createBy$',
             valueType: 'text',
-            hidden: true,
+            hidden: false,
             width: 140,
             filterDropdown: (props) => <LinkFilter
                 name='createBy'
@@ -360,12 +333,12 @@
             valueType: 'text',
             hidden: false,
             width: 140,
-            filterDropdown: (props) => <DatetimeRangeFilter
-                name='updateTime'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
+            // filterDropdown: (props) => <DatetimeRangeFilter
+            //     name='updateTime'
+            //     {...props}
+            //     actionRef={actionRef}
+            //     setSearchParam={setSearchParam}
+            // />,
         },
         {
             title: '淇敼浜哄憳',
@@ -373,19 +346,19 @@
             valueType: 'text',
             hidden: false,
             width: 140,
-            filterDropdown: (props) => <LinkFilter
-                name='updateBy'
-                major='user'
-                {...props}
-                actionRef={actionRef}
-                setSearchParam={setSearchParam}
-            />,
+            // filterDropdown: (props) => <LinkFilter
+            //     name='updateBy'
+            //     major='user'
+            //     {...props}
+            //     actionRef={actionRef}
+            //     setSearchParam={setSearchParam}
+            // />,
         },
         {
             title: '澶囨敞',
             dataIndex: 'memo',
             valueType: 'text',
-            hidden: true,
+            hidden: false,
             width: 140,
             filterDropdown: (props) => <TextFilter
                 name='memo'
@@ -409,7 +382,7 @@
                         setCurrentRow(record);
                     }}
                 >
-                    缂栬緫
+                    <FormattedMessage id='page.edit' defaultMessage='缂栬緫' />
                 </Button>,
                 <Button
                     type="link"
@@ -417,10 +390,10 @@
                     key="batchRemove"
                     onClick={async () => {
                         Modal.confirm({
-                            title: '鍒犻櫎',
-                            content: '纭畾鍒犻櫎璇ラ」鍚楋紵',
+                            title: intl.formatMessage({ id: 'page.delete', defaultMessage: '鍒犻櫎' }),
+                            content: intl.formatMessage({ id: 'page.delete.confirm', defaultMessage: '纭畾鍒犻櫎璇ラ」鍚楋紵' }),
                             onOk: async () => {
-                                const success = await handleRemove([record]);
+                                const success = await handleRemove([record], intl);
                                 if (success) {
                                     if (actionRef.current) {
                                         actionRef.current.reload();
@@ -430,14 +403,18 @@
                         });
                     }}
                 >
-                    鍒犻櫎
+                    <FormattedMessage id='page.delete' defaultMessage='鍒犻櫎' />
                 </Button>,
             ],
         },
     ];
 
     return (
-        <PageContainer>
+        <PageContainer
+            header={{
+                breadcrumb: {},
+            }}
+        >
             <div style={{ width: '100%', float: 'right' }}>
                 <ProTable
                     key="menu"
@@ -476,30 +453,25 @@
                                 }}
                             >
                                 <PlusOutlined />
-                                娣诲姞
+                                <FormattedMessage id='page.add' defaultMessage='娣诲姞' />
                             </Button>,
                             <Button
                                 key="export"
                                 onClick={async () => {
-                                    handleExport();
+                                    handleExport(intl);
                                 }}
                             >
                                 <ExportOutlined />
-                                瀵煎嚭
+                                <FormattedMessage id='page.export' defaultMessage='瀵煎嚭' />
                             </Button>,
                         ],
                     }}
                     request={(params, sorter, filter) =>
                         Http.doPostPromise('/api/menu/tree', { ...params, ...searchParam }, (res) => {
-
-                            // const rootMenu = { id: 0, label: '涓荤被鐩�', children: [], value: 0 };
-                            // const memuData = buildTreeData(res.data, 'menuId', 'menuName', '', '', '');
-                            // rootMenu.children = memuData;
-                            // const treeData = [];
-                            // treeData.push(rootMenu);
-                            // setMenuTree(treeData);
-
-                            setTreeData(res.data);
+                            const rootMenu = { id: 0, name: '鏍圭洰褰�', value: 0, children: [] };
+                            rootMenu.children = res.data;
+                            const treeData = transformTreeData([rootMenu]);
+                            setTreeData(treeData);
                             return {
                                 data: res.data,
                                 success: true,
@@ -512,9 +484,17 @@
                         }
                     }}
                     columnsState={{
-                        persistenceKey: 'pro-table-menu',
+                        persistenceKey: TABLE_KEY,
                         persistenceType: 'localStorage',
                         defaultValue: {
+                            pathName: { show: repairBug(TABLE_KEY, 'pathName', false) },
+                            component: { show: repairBug(TABLE_KEY, 'component', false) },
+                            brief: { show: repairBug(TABLE_KEY, 'brief', false) },
+                            code: { show: repairBug(TABLE_KEY, 'code', false) },
+                            meta: { show: repairBug(TABLE_KEY, 'meta', false) },
+                            createTime$: { show: repairBug(TABLE_KEY, 'createTime$', false) },
+                            createBy$: { show: repairBug(TABLE_KEY, 'createBy$', false) },
+                            memo: { show: repairBug(TABLE_KEY, 'memo', false) },
                             option: { fixed: 'right', disable: true },
                         },
                         onChange(value) {
@@ -527,9 +507,8 @@
                 <FooterToolbar
                     extra={
                         <div>
-                            宸查�夋嫨
                             <a style={{ fontWeight: 600 }}>{selectedRows.length}</a>
-                            椤�
+                            <FormattedMessage id='page.selected' defaultMessage=' 椤瑰凡閫夋嫨' />
                         </div>
                     }
                 >
@@ -538,10 +517,10 @@
                         danger
                         onClick={async () => {
                             Modal.confirm({
-                                title: '鍒犻櫎',
-                                content: '纭畾鍒犻櫎璇ラ」鍚楋紵',
+                                title: intl.formatMessage({ id: 'page.delete', defaultMessage: '鍒犻櫎' }),
+                                content: intl.formatMessage({ id: 'page.delete.confirm', defaultMessage: '纭畾鍒犻櫎璇ラ」鍚楋紵' }),
                                 onOk: async () => {
-                                    const success = await handleRemove(selectedRows);
+                                    const success = await handleRemove(selectedRows, intl);
                                     if (success) {
                                         setSelectedRows([]);
                                         actionRef.current?.reloadAndRest?.();
@@ -550,7 +529,7 @@
                             });
                         }}
                     >
-                        鎵归噺鍒犻櫎
+                        <FormattedMessage id='page.delete.batch' defaultMessage='鎵归噺鍒犻櫎' />
                     </Button>
                 </FooterToolbar>
             )}
@@ -568,9 +547,9 @@
                 onSubmit={async (values) => {
                     let ok = false;
                     if (values.id) {
-                        ok = await handleUpdate({ ...values })
+                        ok = await handleUpdate({ ...values }, intl)
                     } else {
-                        ok = await handleSave({ ...values })
+                        ok = await handleSave({ ...values }, intl)
                     }
                     if (ok) {
                         setModalVisible(false);

--
Gitblit v1.9.1