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 | 226 +++++++++++++++++++++++++++----------------------------
1 files changed, 111 insertions(+), 115 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..a420387 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,23 @@
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 TABLE_KEY = "pro-table-menu";
+
+const typeMap = {
+ 0: {
+ color: 'blue',
+ text: '鑿滃崟',
+ },
+ 1: {
+ color: '',
+ text: '鎸夐挳',
+ },
+};
const handleSave = async (val) => {
const hide = message.loading('姝ｅ湪娣诲姞');
@@ -104,24 +120,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 +146,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 +163,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 +215,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 +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: '鑿滃崟鍥炬爣',
@@ -257,25 +250,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 +283,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 +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: '淇敼浜哄憳',
@@ -353,13 +344,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: '澶囨敞',
@@ -417,7 +408,11 @@
];
return (
- <PageContainer>
+ <PageContainer
+ header={{
+ breadcrumb: {},
+ }}
+ >
<div style={{ width: '100%', float: 'right' }}>
<ProTable
key="menu"
@@ -428,7 +423,7 @@
cardBordered
scroll={{ x: 1300 }}
dateFormatter="string"
- pagination={{ pageSize: 20 }}
+ pagination={{ pageSize: 100 }}
search={false}
toolbar={{
search: {
@@ -470,20 +465,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,
}
})
@@ -494,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) {
@@ -540,6 +536,7 @@
<Edit
open={modalVisible}
values={currentRow || {}}
+ treeData={treeData}
onCancel={
() => {
setModalVisible(false);
@@ -560,8 +557,7 @@
actionRef.current.reload();
}
}
- }
- }
+ }}
/>
</PageContainer>
);
--
Gitblit v1.9.1