cfel-base-components 2.3.4-base2 → 2.3.4-base3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfel-base-components",
-  "version": "2.3.4-base2",
+  "version": "2.3.4-base3",
   "description": "cfel-base-components",
   "main": "/src/index.tsx",
   "types": "src/index.d.ts",

package/src/components/universal-pages/cpcRole/index.tsx

@@ -99,7 +99,7 @@ export default function Role({
             pathname: `/role-info`,
             search: `?roleCode=${rowdata.roleCode}`,
           });
-        }}>赋予账号</a>
+        }}>配置</a>
         {
           rowdata.source !== "system"  && 
           <a onClick={() => {

package/src/components/universal-pages/cpcRoleInfo/index.tsx

@@ -55,7 +55,8 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
   const [isTableLoading, setisTableLoading] = useState(false);
   const [loading, setLoading] = useState(false);
   const [rowKeys, setRowKeys]: any = useState([]); //关联多选数据
-
+  const [selectedRowKeys, setselectedRowKeys]: any = useState([]); 
+  const [defaultExpandedRowKeys, setdefaultExpandedRowKeys]: any = useState([]); 
   const [TableItemData, setTableItemData]: any = useState([
     {
       key: "main",
@@ -241,7 +242,7 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
         icon: <InteractionOutlined />,
       });
     }
-    if (isShowTab?.tableEmpower) {
+    if (isShowTab?.tableEmpower && roleCode !== "admin") {
       data.push({
         label: "关联授权",
         key: "tableEmpower",
@@ -280,24 +281,34 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
       getAuthTree({
         roleCode: roleCode,
       }).then((res: any) => {
-        setisTableLoading(false);
-        let data: any = resourceAction(res);
-        console.log(data, "data2");
-        setResourceTableData(data);
+        let listId :Array<[]>= []
+        let defaultRowKeys :Array<[]>= []
+        let {data,list,drkey}: any = resourceAction(res,listId,defaultRowKeys);
+          setselectedRowKeys(list)
+          setdefaultExpandedRowKeys(drkey)
+          setResourceTableData(data);
+          setisTableLoading(false);
       });
   };
 
-  const resourceAction: any = (data: any) => {
+  const resourceAction: any = (data: any,list:any,drkey:any) => {
     if (Object.prototype.toString.call(data) === "[object Array]") {
       data.map((item: any) => {
-        return resourceAction(item);
+        return resourceAction(item,list,drkey);
       });
-      return data;
+      return {
+        data,
+        list,
+        drkey
+      }
     } else if (Object.prototype.toString.call(data) === "[object Object]") {
       if (data.children && data.children.length !== 0) {
-        return resourceAction(data.children);
+        drkey.push(data.id)
+        return resourceAction(data.children,list,drkey);
       } else {
         delete data.children;
+        if(data.checked)list.push(data.id)
+        drkey.push(data.id)
         return data;
       }
     }
@@ -513,6 +524,12 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
                   pagination={false}
                   columns={TableResource}
                   dataSource={ResourceTableData || []}
+                  rowSelection={{
+                    selectedRowKeys:selectedRowKeys,
+                  }}
+                  expandable={{
+                    expandedRowKeys:defaultExpandedRowKeys, //defaultExpandAllRows 无效
+                  }}
                 />
               </>
             )}