From dca78d5fd0c67fd841d6841ef2cd94a10669c356 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 21 二月 2024 15:40:48 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/system/menu/index.jsx | 99 ++++++++++++++++++++++++++-----------------------
1 files changed, 53 insertions(+), 46 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..d2ad362 100644
--- a/zy-asrs-flow/src/pages/system/menu/index.jsx
+++ b/zy-asrs-flow/src/pages/system/menu/index.jsx
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Button, message, Modal } from 'antd';
+import { Button, message, Modal, Tag } from 'antd';
import {
FooterToolbar,
PageContainer,
@@ -11,7 +11,20 @@
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'
+
+const typeMap = {
+ 0: {
+ color: 'blue',
+ text: '鑿滃崟',
+ },
+ 1: {
+ color: '',
+ text: '鎸夐挳',
+ },
+};
const handleSave = async (val) => {
const hide = message.loading('姝ｅ湪娣诲姞');
@@ -104,12 +117,11 @@
const columns = [
{
- title: '鍚嶇О',
+ title: '鑿滃崟鍚嶇О',
dataIndex: 'name',
valueType: 'text',
hidden: false,
- width: 140,
- copyable: true,
+ width: 240,
filterDropdown: (props) => <TextFilter
name='name'
{...props}
@@ -121,7 +133,7 @@
title: '涓婄骇鑿滃崟',
dataIndex: 'parentId',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='parentId'
@@ -134,7 +146,7 @@
title: '涓婄骇鑿滃崟鍚�',
dataIndex: 'parentName',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='parentName'
@@ -147,7 +159,7 @@
title: '鍏宠仈璺緞',
dataIndex: 'path',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='path'
@@ -160,7 +172,7 @@
title: '鍏宠仈璺緞鍚�',
dataIndex: 'pathName',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='pathName'
@@ -174,7 +186,7 @@
dataIndex: 'route',
valueType: 'text',
hidden: false,
- width: 140,
+ width: 200,
filterDropdown: (props) => <TextFilter
name='route'
{...props}
@@ -186,7 +198,7 @@
title: '椤甸潰缁勪欢',
dataIndex: 'component',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='component'
@@ -199,7 +211,7 @@
title: '绠�杩�',
dataIndex: 'brief',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='brief'
@@ -212,7 +224,7 @@
title: '鏍囪瘑',
dataIndex: 'code',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='code'
@@ -226,7 +238,11 @@
dataIndex: 'type$',
valueType: 'text',
hidden: false,
- width: 140,
+ width: 100,
+ render: (_, record) => {
+ const type = typeMap[record.type]
+ return <Tag color={type.color}>{type.text}</Tag>
+ },
filterDropdown: (props) => <SelectFilter
name='type'
{...props}
@@ -257,31 +273,25 @@
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: '鍏冧俊鎭�',
dataIndex: 'meta',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='meta'
@@ -296,6 +306,10 @@
valueType: 'text',
hidden: false,
width: 140,
+ render: (_, record) => {
+ const status = statusMap[record.status]
+ return <Tag color={status.color}>{status.text}</Tag>
+ },
filterDropdown: (props) => <SelectFilter
name='status'
{...props}
@@ -311,7 +325,7 @@
title: '娣诲姞鏃堕棿',
dataIndex: 'createTime$',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <DatetimeRangeFilter
name='createTime'
@@ -324,7 +338,7 @@
title: '娣诲姞浜哄憳',
dataIndex: 'createBy$',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <LinkFilter
name='createBy'
@@ -365,7 +379,7 @@
title: '澶囨敞',
dataIndex: 'memo',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='memo'
@@ -428,7 +442,7 @@
cardBordered
scroll={{ x: 1300 }}
dateFormatter="string"
- pagination={{ pageSize: 20 }}
+ pagination={{ pageSize: 100 }}
search={false}
toolbar={{
search: {
@@ -470,20 +484,13 @@
],
}}
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,
}
})
@@ -540,6 +547,7 @@
<Edit
open={modalVisible}
values={currentRow || {}}
+ treeData={treeData}
onCancel={
() => {
setModalVisible(false);
@@ -560,8 +568,7 @@
actionRef.current.reload();
}
}
- }
- }
+ }}
/>
</PageContainer>
);
--
Gitblit v1.9.1