From 7af31594ce22ef04c53f187d29aee949b1332b6c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 20 二月 2024 09:40:35 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/system/menu/index.jsx | 9 ++--
zy-asrs-flow/src/pages/system/menu/components/edit.jsx | 83 ++++++++---------------------------------
zy-asrs-flow/src/utils/tree-util.js | 1
3 files changed, 22 insertions(+), 71 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/menu/components/edit.jsx b/zy-asrs-flow/src/pages/system/menu/components/edit.jsx
index 937adec..686a006 100644
--- a/zy-asrs-flow/src/pages/system/menu/components/edit.jsx
+++ b/zy-asrs-flow/src/pages/system/menu/components/edit.jsx
@@ -58,21 +58,22 @@
disabled
hidden={true}
/>
-
- <ProFormTreeSelect
- name="parentId"
- label="涓婄骇鑿滃崟"
- params={props.treeData}
- request={async () => {
- return props.treeData;
- }}
- placeholder="璇烽�夋嫨"
- rules={[{ required: true, message: "涓婄骇鑿滃崟涓嶈兘涓虹┖" }]}
- fieldProps={{
- defaultValue: 0
- }}
- />
<ProForm.Group>
+ <ProFormTreeSelect
+ name="parentId"
+ label="涓婄骇鑿滃崟"
+ params={props.treeData}
+ request={async () => {
+ return props.treeData;
+ }}
+ colProps={{ md: 12, xl: 12 }}
+ placeholder="璇烽�夋嫨"
+ rules={[{ required: true, message: "涓婄骇鑿滃崟涓嶈兘涓虹┖" }]}
+ fieldProps={{
+ defaultValue: 0,
+ treeDefaultExpandedKeys: [0]
+ }}
+ />
<ProFormText
name="name"
label="鍚嶇О"
@@ -80,63 +81,22 @@
placeholder="璇疯緭鍏�"
rules={[{ required: true, message: "鍚嶇О涓嶈兘涓虹┖锛�" }]}
/>
- <ProFormDigit
- name="parentId"
- label="涓婄骇鑿滃崟"
- colProps={{ md: 12, xl: 12 }}
- fieldProps={{ precision: 0 }}
- placeholder="璇疯緭鍏�"
- />
</ProForm.Group>
<ProForm.Group>
- <ProFormText
- name="parentName"
- label="涓婄骇鑿滃崟鍚�"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- />
- <ProFormText
- name="path"
- label="鍏宠仈璺緞"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- />
- </ProForm.Group>
- <ProForm.Group>
- <ProFormText
- name="pathName"
- label="鍏宠仈璺緞鍚�"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- />
<ProFormText
name="route"
label="璺敱鍦板潃"
colProps={{ md: 12, xl: 12 }}
placeholder="璇疯緭鍏�"
/>
- </ProForm.Group>
- <ProForm.Group>
<ProFormText
name="component"
label="椤甸潰缁勪欢"
colProps={{ md: 12, xl: 12 }}
placeholder="璇疯緭鍏�"
/>
- <ProFormText
- name="brief"
- label="绠�杩�"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- />
</ProForm.Group>
<ProForm.Group>
- <ProFormText
- name="code"
- label="鏍囪瘑"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- />
<ProFormSelect
name="type"
label="绫诲瀷"
@@ -152,12 +112,12 @@
setMenuType(e);
},
}}
+ rules={[{ required: true, message: "绫诲瀷涓嶈兘涓虹┖锛�" }]}
/>
- </ProForm.Group>
- <ProForm.Group>
<ProFormText
name="authority"
label="鏉冮檺鏍囪瘑"
+ hidden={menuType !== 1}
colProps={{ md: 12, xl: 12 }}
placeholder="璇疯緭鍏�"
/>
@@ -177,14 +137,6 @@
fieldProps={{ precision: 0 }}
placeholder="璇疯緭鍏�"
/>
- <ProFormText
- name="meta"
- label="鍏冧俊鎭�"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- />
- </ProForm.Group>
- <ProForm.Group>
<ProFormSelect
name="status"
label="鐘舵��"
@@ -196,7 +148,6 @@
]}
/>
</ProForm.Group>
-
</ProForm>
</Modal>
</>
diff --git a/zy-asrs-flow/src/pages/system/menu/index.jsx b/zy-asrs-flow/src/pages/system/menu/index.jsx
index a4bf013..9a983c5 100644
--- a/zy-asrs-flow/src/pages/system/menu/index.jsx
+++ b/zy-asrs-flow/src/pages/system/menu/index.jsx
@@ -491,11 +491,10 @@
}}
request={(params, sorter, filter) =>
Http.doPostPromise('/api/menu/tree', { ...params, ...searchParam }, (res) => {
-
- // const rootMenu = { id: 0, name: '涓荤被鐩�', children: [], value: 0 };
- // rootMenu.children = res.data;
- // const treeData = transformTreeData(rootMenu);
- // setTreeData([treeData]);
+ const rootMenu = { id: 0, name: '鏍圭洰褰�', value: 0, children: [] };
+ rootMenu.children = res.data;
+ const treeData = transformTreeData([rootMenu]);
+ setTreeData(treeData);
return {
data: res.data,
success: true,
diff --git a/zy-asrs-flow/src/utils/tree-util.js b/zy-asrs-flow/src/utils/tree-util.js
index 0298ccd..3c9f43b 100644
--- a/zy-asrs-flow/src/utils/tree-util.js
+++ b/zy-asrs-flow/src/utils/tree-util.js
@@ -1,6 +1,7 @@
export function transformTreeData(originalData) {
return originalData.map(item => {
let newItem = {
+ key: item.id,
title: item.name,
value: item.id,
// 鍏跺畠闇�瑕佺殑灞炴��...
--
Gitblit v1.9.1