From d86db78f18c03d97b7b856fd37cd10d6297eecc7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 24 二月 2024 13:40:18 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/system/menu/index.jsx | 188 +++++++++++++++++++++-------------------------
1 files changed, 87 insertions(+), 101 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/menu/index.jsx b/zy-asrs-flow/src/pages/system/menu/index.jsx
index bb9d2e4..a420387 100644
--- a/zy-asrs-flow/src/pages/system/menu/index.jsx
+++ b/zy-asrs-flow/src/pages/system/menu/index.jsx
@@ -11,18 +11,12 @@
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: '姝ｅ父',
- },
- 0: {
- color: 'red',
- text: '绂佺敤',
- },
-};
+const TABLE_KEY = "pro-table-menu";
const typeMap = {
0: {
@@ -131,12 +125,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 +146,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 +164,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 +188,7 @@
title: '绠�杩�',
dataIndex: 'brief',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <TextFilter
name='brief'
@@ -233,7 +201,7 @@
title: '鏍囪瘑',
dataIndex: 'code',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <TextFilter
name='code'
@@ -252,16 +220,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 +237,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 +250,9 @@
valueType: 'text',
hidden: false,
width: 140,
+ render: (_, record) => {
+ return createIcon(_);
+ }
},
{
title: '鎺掑簭',
@@ -290,14 +261,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 +287,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: '姝ｅ父', value: 1 },
- { label: '绂佺敤', value: 0 },
- ]}
- />,
+ // filterDropdown: (props) => <SelectFilter
+ // name='status'
+ // {...props}
+ // actionRef={actionRef}
+ // setSearchParam={setSearchParam}
+ // data={[
+ // { label: '姝ｅ父', value: 1 },
+ // { label: '绂佺敤', value: 0 },
+ // ]}
+ // />,
},
{
title: '娣诲姞鏃堕棿',
dataIndex: 'createTime$',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <DatetimeRangeFilter
name='createTime'
@@ -344,7 +315,7 @@
title: '娣诲姞浜哄憳',
dataIndex: 'createBy$',
valueType: 'text',
- hidden: true,
+ hidden: false,
width: 140,
filterDropdown: (props) => <LinkFilter
name='createBy'
@@ -360,12 +331,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 +344,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'
@@ -437,7 +408,11 @@
];
return (
- <PageContainer>
+ <PageContainer
+ header={{
+ breadcrumb: {},
+ }}
+ >
<div style={{ width: '100%', float: 'right' }}>
<ProTable
key="menu"
@@ -491,7 +466,10 @@
}}
request={(params, sorter, filter) =>
Http.doPostPromise('/api/menu/tree', { ...params, ...searchParam }, (res) => {
- 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,
@@ -504,9 +482,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) {
@@ -550,7 +536,7 @@
<Edit
open={modalVisible}
values={currentRow || {}}
- treeData = {treeData}
+ treeData={treeData}
onCancel={
() => {
setModalVisible(false);
--
Gitblit v1.9.1