From 074513acdfed38c8537a046801ee5dbc8f01e2eb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 二月 2024 10:06:42 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/system/menu/index.jsx | 129 +++++++++++++++++++++----------------------
1 files changed, 63 insertions(+), 66 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..c86ee75 100644
--- a/zy-asrs-flow/src/pages/system/menu/index.jsx
+++ b/zy-asrs-flow/src/pages/system/menu/index.jsx
@@ -11,18 +11,9 @@
import Http from '@/utils/http';
import Edit from './components/edit'
import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
-import { buildTreeData } from '@/utils/tree-util'
-
-const statusMap = {
- 1: {
- color: 'green',
- text: '姝ｅ父',
- },
- 0: {
- color: 'red',
- text: '绂佺敤',
- },
-};
+import { transformTreeData } from '@/utils/tree-util'
+import { createIcon } from '@/utils/icon-util'
+import { statusMap } from '@/utils/enum-util'
const typeMap = {
0: {
@@ -131,12 +122,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: '涓婄骇鑿滃崟',
@@ -196,12 +187,12 @@
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: '椤甸潰缁勪欢',
@@ -252,16 +243,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 +260,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 +273,9 @@
valueType: 'text',
hidden: false,
width: 140,
+ render: (_, record) => {
+ return createIcon(_);
+ }
},
{
title: '鎺掑簭',
@@ -290,7 +284,7 @@
hidden: false,
width: 100,
render: (_, record) => {
- return <span st yle={{ fontWeight: "bold" }}>{_}</span>
+ return <span style={{ fontWeight: "bold" }}>{_}</span>
}
},
{
@@ -316,16 +310,16 @@
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: '娣诲姞鏃堕棿',
@@ -360,12 +354,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,13 +367,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: '澶囨敞',
@@ -491,7 +485,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,
@@ -550,7 +547,7 @@
<Edit
open={modalVisible}
values={currentRow || {}}
- treeData = {treeData}
+ treeData={treeData}
onCancel={
() => {
setModalVisible(false);
--
Gitblit v1.9.1