From abfd32608966243794c4fa8834cacec7f0fec489 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 二月 2024 14:07:04 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/system/role/components/scope.jsx |   45 ++++++++++++++++++++++++++++++---------------
 zy-asrs-flow/src/pages/system/user/index.jsx            |    2 +-
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/zy-asrs-flow/src/pages/system/role/components/scope.jsx b/zy-asrs-flow/src/pages/system/role/components/scope.jsx
index 84c3b84..141f89f 100644
--- a/zy-asrs-flow/src/pages/system/role/components/scope.jsx
+++ b/zy-asrs-flow/src/pages/system/role/components/scope.jsx
@@ -14,6 +14,10 @@
     const { } = props;
     const [menuTreeLoading, setMenuTreeLoading] = useState(false);
     const [menuTreeData, setMenuTreeData] = useState([]);
+    const [menuExpandedKeys, setMenuExpandedKeys] = useState([]);
+    const [menuIds, setMenuIds] = useState([]);
+
+    const [menuTreeAllKeys, setMenuTreeAllKeys] = useState([]);
 
     const loadMenuTree = (param) => {
         setMenuTreeLoading(true);
@@ -24,8 +28,8 @@
             // const treeData = transformTreeData([rootMenu]);
             const treeData = transformTreeData(res.data);
             setMenuTreeData(treeData);
-            // const treeAllKeys = getTreeAllKeys(treeData);
-            // setDeptExpandedKeys(treeAllKeys);
+            const treeAllKeys = getTreeAllKeys(treeData);
+            setMenuTreeAllKeys(treeAllKeys);
         }).catch((err) => {
             console.error(err);
             setMenuTreeLoading(false);
@@ -87,11 +91,20 @@
                             <Col md={24}>
                                 <Checkbox.Group
                                     options={[
-                                        { label: '灞曞紑/鎶樺彔', value: 'deptExpand' },
-                                        { label: '鍏ㄩ��/鍏ㄤ笉閫�', value: 'deptNodeAll' },
+                                        { label: '灞曞紑/鎶樺彔', value: 'expandAll' },
+                                        { label: '鍏ㄩ��/鍏ㄤ笉閫�', value: 'checkAll' },
                                     ]}
-                                    onChange={(checkedValue) => {
-                                        console.log(checkedValue);
+                                    onChange={(values) => {
+                                        if(values.includes('expandAll')) {
+                                            setMenuExpandedKeys(menuTreeAllKeys);
+                                        } else {
+                                            setMenuExpandedKeys([]);
+                                        }
+                                        if(values.includes('checkAll')) {
+
+                                        } else {
+
+                                        }
                                     }} />
                             </Col>
                             <Col md={24}>
@@ -100,16 +113,18 @@
                                 ) : (
                                     <Tree
                                         checkable
-                                        onExpand={(expandedKeys, { expanded, node }) => {
-
-                                        }}
-                                        // expandedKeys={expandedKeys}
-                                        // autoExpandParent={autoExpandParent}
-                                        // onCheck={onCheck}
-                                        // checkedKeys={checkedKeys}
-                                        // onSelect={onSelect}
-                                        // selectedKeys={selectedKeys}
                                         treeData={menuTreeData}
+                                        expandedKeys={menuExpandedKeys}
+                                        onExpand={(expandedKeys) => {
+                                            setMenuExpandedKeys(expandedKeys)
+                                        }}
+                                        // checkedKeys={menuIds}
+                                        
+                                        
+                                        // onCheck={(checkedKeys, checkInfo) => {
+                                        //     console.log(checkedKeys, checkInfo);
+                                        // }}
+                                        // defaultCheckedKeys={onSelect}
                                     />
                                 )}
                             </Col>
diff --git a/zy-asrs-flow/src/pages/system/user/index.jsx b/zy-asrs-flow/src/pages/system/user/index.jsx
index 27cd485..6052f28 100644
--- a/zy-asrs-flow/src/pages/system/user/index.jsx
+++ b/zy-asrs-flow/src/pages/system/user/index.jsx
@@ -505,7 +505,7 @@
                             {deptTreeLoading ? (
                                 <Skeleton active />
                             ) : (
-                                < Tree
+                                <Tree
                                     showLine
                                     blockNode
                                     defaultExpandAll    // 寮傛鍔犺浇澶辨晥

--
Gitblit v1.9.1