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 | 291 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 144 insertions(+), 147 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/menu/index.jsx b/zy-asrs-flow/src/pages/system/menu/index.jsx
index ad61038..3c83f35 100644
--- a/zy-asrs-flow/src/pages/system/menu/index.jsx
+++ b/zy-asrs-flow/src/pages/system/menu/index.jsx
@@ -1,86 +1,103 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Button, message, Modal } from 'antd';
+import { Button, message, Modal, Tag } from 'antd';
import {
FooterToolbar,
PageContainer,
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 handleSave = async (val) => {
- const hide = message.loading('姝ｅ湪娣诲姞');
+const TABLE_KEY = "pro-table-menu";
+
+const typeMap = {
+ 0: {
+ color: 'success',
+ text: '鑿滃崟',
+ },
+ 1: {
+ color: 'default',
+ text: '鎸夐挳',
+ },
+};
+
+const handleSave = async (val, intl) => {
+ const hide = message.loading(intl.formatMessage({ id: 'page.adding', defaultMessage: '姝ｅ湪娣诲姞' }));
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('姝ｅ湪鏇存柊');
+const handleUpdate = async (val, intl) => {
+ const hide = message.loading(intl.formatMessage({ id: 'page.updating', defaultMessage: '姝ｅ湪鏇存柊' }));
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('姝ｅ湪鍒犻櫎');
+ const hide = message.loading(intl.formatMessage({ id: 'page.deleting', defaultMessage: '姝ｅ湪鍒犻櫎' }));
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('姝ｅ湪瀵煎嚭');
+const handleExport = async (intl) => {
+ const hide = message.loading(intl.formatMessage({ id: 'page.exporting', defaultMessage: '姝ｅ湪瀵煎嚭' }));
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();
@@ -89,6 +106,7 @@
const Main = () => {
+ const intl = useIntl();
const formTableRef = useRef();
const actionRef = useRef();
const [selectedRows, setSelectedRows] = useState([]);
@@ -104,24 +122,23 @@
const columns = [
{
- title: '鍚嶇О',
+ title: '鑿滃崟鍚嶇О',
dataIndex: 'name',
valueType: 'text',
hidden: false,
- width: 140,
- copyable: true,
- filterDropdown: (props) => <TextFilter
- name='name'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
+ width: 240,
+ // filterDropdown: (props) => <TextFilter
+ // name='name'
+ // {...props}
+ // actionRef={actionRef}
+ // setSearchParam={setSearchParam}
+ // />,
},
{
title: '涓婄骇鑿滃崟',
dataIndex: 'parentId',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='parentId'
@@ -131,33 +148,7 @@
/>,
},
{
- title: '涓婄骇鑿滃崟鍚�',
- dataIndex: 'parentName',
- valueType: 'text',
- hidden: false,
- width: 140,
- filterDropdown: (props) => <TextFilter
- name='parentName'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
- },
- {
title: '鍏宠仈璺緞',
- dataIndex: 'path',
- valueType: 'text',
- hidden: false,
- width: 140,
- filterDropdown: (props) => <TextFilter
- name='path'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
- },
- {
- title: '鍏宠仈璺緞鍚�',
dataIndex: 'pathName',
valueType: 'text',
hidden: false,
@@ -174,13 +165,13 @@
dataIndex: 'route',
valueType: 'text',
hidden: false,
- width: 140,
- filterDropdown: (props) => <TextFilter
- name='route'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
+ width: 200,
+ // filterDropdown: (props) => <TextFilter
+ // name='route'
+ // {...props}
+ // actionRef={actionRef}
+ // setSearchParam={setSearchParam}
+ // />,
},
{
title: '椤甸潰缁勪欢',
@@ -226,17 +217,21 @@
dataIndex: 'type$',
valueType: 'text',
hidden: false,
- width: 140,
- filterDropdown: (props) => <SelectFilter
- name='type'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- data={[
- { label: '鑿滃崟', value: 0 },
- { label: '鎸夐挳', value: 1 },
- ]}
- />,
+ width: 100,
+ render: (_, record) => {
+ 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 },
+ // ]}
+ // />,
},
{
title: '鏉冮檺鏍囪瘑',
@@ -244,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: '鑿滃崟鍥炬爣',
@@ -257,25 +252,19 @@
valueType: 'text',
hidden: false,
width: 140,
- filterDropdown: (props) => <TextFilter
- name='icon'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
+ render: (_, record) => {
+ return createIcon(_);
+ }
},
{
title: '鎺掑簭',
dataIndex: 'sort',
valueType: 'text',
hidden: false,
- width: 140,
- filterDropdown: (props) => <TextFilter
- name='sort'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
+ width: 100,
+ render: (_, record) => {
+ return <span style={{ fontWeight: "bold" }}>{_}</span>
+ }
},
{
title: '鍏冧俊鎭�',
@@ -296,16 +285,20 @@
valueType: 'text',
hidden: false,
width: 140,
- filterDropdown: (props) => <SelectFilter
- name='status'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- data={[
- { label: '姝ｅ父', value: 1 },
- { label: '绂佺敤', value: 0 },
- ]}
- />,
+ render: (_, record) => {
+ 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: '姝ｅ父', value: 1 },
+ // { label: '绂佺敤', value: 0 },
+ // ]}
+ // />,
},
{
title: '娣诲姞鏃堕棿',
@@ -340,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: '淇敼浜哄憳',
@@ -353,13 +346,13 @@
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: '澶囨敞',
@@ -389,7 +382,7 @@
setCurrentRow(record);
}}
>
- 缂栬緫
+ <FormattedMessage id='page.edit' defaultMessage='缂栬緫' />
</Button>,
<Button
type="link"
@@ -397,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();
@@ -410,14 +403,18 @@
});
}}
>
- 鍒犻櫎
+ <FormattedMessage id='page.delete' defaultMessage='鍒犻櫎' />
</Button>,
],
},
];
return (
- <PageContainer>
+ <PageContainer
+ header={{
+ breadcrumb: {},
+ }}
+ >
<div style={{ width: '100%', float: 'right' }}>
<ProTable
key="menu"
@@ -428,7 +425,7 @@
cardBordered
scroll={{ x: 1300 }}
dateFormatter="string"
- pagination={{ pageSize: 20 }}
+ pagination={{ pageSize: 100 }}
search={false}
toolbar={{
search: {
@@ -456,34 +453,27 @@
}}
>
<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/page', { ...params, ...searchParam }, (res) => {
- const records = res.data.records;
- console.log(records);
-
- const rootMenu = { id: 0, label: '涓荤被鐩�', children: [], value: 0 };
- const memuData = buildTreeData(records, 'menuId', 'menuName', '', '', '');
- rootMenu.children = memuData;
- const treeData = [];
- treeData.push(rootMenu);
+ Http.doPostPromise('/api/menu/tree', { ...params, ...searchParam }, (res) => {
+ const rootMenu = { id: 0, name: '鏍圭洰褰�', value: 0, children: [] };
+ rootMenu.children = res.data;
+ const treeData = transformTreeData([rootMenu]);
setTreeData(treeData);
-
return {
- data: treeData,
- total: res.data.total,
+ data: res.data,
success: true,
}
})
@@ -494,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) {
@@ -509,9 +507,8 @@
<FooterToolbar
extra={
<div>
- 宸查�夋嫨
<a style={{ fontWeight: 600 }}>{selectedRows.length}</a>
- 椤�
+ <FormattedMessage id='page.selected' defaultMessage=' 椤瑰凡閫夋嫨' />
</div>
}
>
@@ -520,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?.();
@@ -532,7 +529,7 @@
});
}}
>
- 鎵归噺鍒犻櫎
+ <FormattedMessage id='page.delete.batch' defaultMessage='鎵归噺鍒犻櫎' />
</Button>
</FooterToolbar>
)}
@@ -540,6 +537,7 @@
<Edit
open={modalVisible}
values={currentRow || {}}
+ treeData={treeData}
onCancel={
() => {
setModalVisible(false);
@@ -549,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);
@@ -560,8 +558,7 @@
actionRef.current.reload();
}
}
- }
- }
+ }}
/>
</PageContainer>
);
--
Gitblit v1.9.1