From b6659fce86e4fb7e26b80d34b90e3054a0c3e989 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 19 二月 2024 13:59:46 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/system/menu/index.jsx | 106 ++++++++++++++++++++++++++++++++---------------------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java | 4 +
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java | 8 ++++
3 files changed, 75 insertions(+), 43 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..50891f7 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,
@@ -12,6 +12,28 @@
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: '绂佺敤',
+ },
+};
+
+const typeMap = {
+ 0: {
+ color: 'blue',
+ text: '鑿滃崟',
+ },
+ 1: {
+ color: '',
+ text: '鎸夐挳',
+ },
+};
const handleSave = async (val) => {
const hide = message.loading('姝ｅ湪娣诲姞');
@@ -104,12 +126,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 +142,7 @@
title: '涓婄骇鑿滃崟',
dataIndex: 'parentId',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='parentId'
@@ -134,7 +155,7 @@
title: '涓婄骇鑿滃崟鍚�',
dataIndex: 'parentName',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='parentName'
@@ -147,7 +168,7 @@
title: '鍏宠仈璺緞',
dataIndex: 'path',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='path'
@@ -160,7 +181,7 @@
title: '鍏宠仈璺緞鍚�',
dataIndex: 'pathName',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='pathName'
@@ -174,7 +195,7 @@
dataIndex: 'route',
valueType: 'text',
hidden: false,
- width: 140,
+ width: 200,
filterDropdown: (props) => <TextFilter
name='route'
{...props}
@@ -186,7 +207,7 @@
title: '椤甸潰缁勪欢',
dataIndex: 'component',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='component'
@@ -199,7 +220,7 @@
title: '绠�杩�',
dataIndex: 'brief',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='brief'
@@ -212,7 +233,7 @@
title: '鏍囪瘑',
dataIndex: 'code',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='code'
@@ -226,7 +247,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 +282,23 @@
valueType: 'text',
hidden: false,
width: 140,
- filterDropdown: (props) => <TextFilter
- name='icon'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
},
{
title: '鎺掑簭',
dataIndex: 'sort',
valueType: 'text',
hidden: false,
- width: 140,
- filterDropdown: (props) => <TextFilter
- name='sort'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
+ width: 100,
+ render: (_, record) => {
+ console.log(_);
+ return <span style={{ fontWeight: "bold" }}>{_}</span>
+ }
},
{
title: '鍏冧俊鎭�',
dataIndex: 'meta',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='meta'
@@ -296,6 +313,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 +332,7 @@
title: '娣诲姞鏃堕棿',
dataIndex: 'createTime$',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <DatetimeRangeFilter
name='createTime'
@@ -324,7 +345,7 @@
title: '娣诲姞浜哄憳',
dataIndex: 'createBy$',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <LinkFilter
name='createBy'
@@ -365,7 +386,7 @@
title: '澶囨敞',
dataIndex: 'memo',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='memo'
@@ -428,7 +449,7 @@
cardBordered
scroll={{ x: 1300 }}
dateFormatter="string"
- pagination={{ pageSize: 20 }}
+ pagination={{ pageSize: 100 }}
search={false}
toolbar={{
search: {
@@ -470,20 +491,21 @@
],
}}
request={(params, sorter, filter) =>
- Http.doPostPromise('/api/menu/page', { ...params, ...searchParam }, (res) => {
- const records = res.data.records;
- console.log(records);
+ Http.doPostPromise('/api/menu/tree', { ...params, ...searchParam }, (res) => {
+ console.log(res.data);
+ // console.log(res); return;
+ // 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);
- setTreeData(treeData);
+ // const rootMenu = { id: 0, label: '涓荤被鐩�', children: [], value: 0 };
+ // const memuData = buildTreeData(records, 'menuId', 'menuName', '', '', '');
+ // rootMenu.children = memuData;
+ // const treeData = [];
+ // treeData.push(rootMenu);
+ // setTreeData(treeData);
return {
- data: treeData,
- total: res.data.total,
+ data: res.data,
success: true,
}
})
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java
index a5db7c6..d98d507 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java
@@ -11,6 +11,7 @@
import com.zy.asrs.wcs.system.entity.Menu;
import com.zy.asrs.wcs.system.service.MenuService;
import com.zy.asrs.wcs.utils.ExcelUtil;
+import com.zy.asrs.wcs.utils.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -43,6 +44,13 @@
}
@PreAuthorize("hasAuthority('system:menu:list')")
+ @PostMapping("/menu/tree")
+ public R tree(@RequestBody Map<String, Object> map) {
+ List<Menu> menus = menuService.list();
+ return R.ok().add(Utils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren));
+ }
+
+ @PreAuthorize("hasAuthority('system:menu:list')")
@GetMapping("/menu/{id}")
public R get(@PathVariable("id") Long id) {
return R.ok().add(menuService.getById(id));
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java
index 1881c3b..fe7d834 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java
@@ -39,7 +39,9 @@
if (parentId.equals(dParentId)) {
R dId = idMapper.apply(d);
List<T> children = toTreeData(data, dId, parentIdMapper, idMapper, consumer);
- consumer.accept(d, children);
+ if(children.size() > 0) {
+ consumer.accept(d, children);
+ }
result.add(d);
}
}
--
Gitblit v1.9.1