cfel-base-components 2.3.4-base2 → 2.3.5

package/package.json

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

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

@@ -47,6 +47,8 @@ export default function AccountInfo({ isShowTab, getAuthTree }: RoleInfoProps) {
   const [tabCheck, setTabCheck] = useState("main");
   const [ResourceTableData, setResourceTableData]: any = useState([]); //关联资源
   const [isTableLoading, setisTableLoading] = useState(false);
+  const [selectedRowKeys, setselectedRowKeys]: any = useState([]); 
+  const [defaultExpandedRowKeys, setdefaultExpandedRowKeys]: any = useState([]); 
   const [TableItemData, setTableItemData]: any = useState([
     {
       key: "main",
@@ -82,7 +84,7 @@ export default function AccountInfo({ isShowTab, getAuthTree }: RoleInfoProps) {
           return "系统创建";
         } else if (cell == "user") {
           return "用户自建";
-        } else if (cell == "user") {
+        } else  {
           return "未知";
         }
       },
@@ -222,22 +224,33 @@ export default function AccountInfo({ isShowTab, getAuthTree }: RoleInfoProps) {
       getAuthTree({
         accountId: pageId,
       }).then((res: any) => {
-        setisTableLoading(false);
-        let data: any = resourceAction(res);
-        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.checked)list.push(data.id)
       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;
+        drkey.push(data.id)
         return data;
       }
     }
@@ -425,6 +438,17 @@ export default function AccountInfo({ isShowTab, getAuthTree }: RoleInfoProps) {
                   pagination={false}
                   columns={TableResource}
                   dataSource={ResourceTableData || []}
+                  rowSelection={{
+                    selectedRowKeys:selectedRowKeys,
+                    getCheckboxProps: (record: any) => {
+                      return {
+                        disabled: true
+                      };
+                    }
+                  }}
+                  expandable={{
+                    expandedRowKeys:defaultExpandedRowKeys, //defaultExpandAllRows 不走，不是初始化tab
+                  }}
                 />
               </>
             )}

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

@@ -61,6 +61,20 @@ export default function Role({
       dataIndex: 'roleCode',
       key: 'roleCode',
     },
+    {
+      title: "来源",
+      dataIndex: "source",
+      key: "source",
+      render: (cell: any) => {
+        if (cell == "system") {
+          return "系统创建";
+        } else if (cell == "user") {
+          return "用户自建";
+        } else{
+          return "未知";
+        }
+      },
+    },
     {
       title: '角色描述',
       dataIndex: 'description',
@@ -99,7 +113,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

@@ -6,7 +6,7 @@ import QueryFilter from "../../base-component/QueryFilter";
 import ProTable from "../../base-component/ProTable";
 import Pagination from "../../base-component/Pagination";
 import { get } from "lodash";
-import { ProFormText } from "@ant-design/pro-components";
+import { ProFormText,ProFormSelect } from "@ant-design/pro-components";
 import {
   Button,
   Divider,
@@ -46,6 +46,7 @@ export interface RoleInfoProps {
 
 export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInfoProps) {
   const searchFormRef: any = useRef();
+  const searchPolicyFormRef: any = useRef();
   const [roleCode, setRoleCode] = useState(getUrlParams("roleCode"));
   const [roleInfo, setRoleInfo]: any = useState({});
   const [editAccountOpen, setEditAccountOpen] = useState(false);
@@ -55,7 +56,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 +243,7 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
         icon: <InteractionOutlined />,
       });
     }
-    if (isShowTab?.tableEmpower) {
+    if (isShowTab?.tableEmpower && roleCode !== "admin") {
       data.push({
         label: "关联授权",
         key: "tableEmpower",
@@ -259,9 +261,7 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
   };
   const tabCheckFunc = () => {
     if (tabCheck == "tableEmpower") {
-      policy?.execute({
-        subjectCodes: [roleCode],
-      }); // 获取授权策略
+      policy?.execute(); // 获取授权策略
       empowerCom?.empowerInit();
     } else if (tabCheck == "tableResource") {
       getAuthTreeFunc(); // 获取关联资源
@@ -280,24 +280,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.checked)list.push(data.id)
       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;
+        drkey.push(data.id)
         return data;
       }
     }
@@ -391,6 +401,8 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
     ...otherOptions
   }: any) => {
     return policyAuthorizePage({
+      subjectCodes: [roleCode],
+      ...searchPolicyFormRef.current,
       currentPage: innerPageNo,
       pageSize: innerPageSize,
       ...otherOptions,
@@ -411,10 +423,21 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
     empowerCom?.RevokeFunc({ authorizeList }).then((res: any) => {
       message.success("解除成功");
       setRowKeys([]);
-      policy?.execute({ subjectCodes: [roleCode] });
+      policy?.execute();
     });
   };
-
+  const resOnFinish: any = async (values: any) => {
+    if (values?.policyIds) {
+      let policyData = values.policyIds.findIndex((item: any) => {
+        return item == "";
+      });
+      if (policyData > -1) values.policyIds = [];
+    }
+    searchPolicyFormRef.current = {
+      ...values,
+    };
+    policy?.execute({ innerPageNo: 1 });
+  };
   return (
     <PageContainer>
       <Spin spinning={loading}>
@@ -513,35 +536,87 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
                   pagination={false}
                   columns={TableResource}
                   dataSource={ResourceTableData || []}
+                  rowSelection={{
+                    selectedRowKeys:selectedRowKeys,
+                    getCheckboxProps: (record: any) => {
+                      return {
+                        disabled: true
+                      };
+                    }
+                  }}
+                  expandable={{
+                    expandedRowKeys:defaultExpandedRowKeys, //defaultExpandAllRows 不走，不是初始化tab
+                  }}
                 />
               </>
             )}
 
             {tabCheck == "tableEmpower" && (
               <>
-                <div className="tableActionWarp">
-                  <Button
-                    size="middle"
-                    type="primary"
-                    onClick={() => {
-                      console.log(empowerCom?.action);
-                      empowerCom?.action?.editOpenStatus(true);
+                <QueryFilter
+                  style={{ padding: "0px" }}
+                  size="middle"
+                  onFinish={resOnFinish}
+                >
+                  <ProFormSelect
+                    options={[
+                      {
+                        label: "所有资源组",
+                        value: (window as any)?.g_config?.tenant?.id,
+                      },
+                      ...empowerCom?.action?.shareData?.attributeQueryListData,
+                    ]}
+                    name="groupIds"
+                    label="资源组"
+                    fieldProps={{
+                      mode: "multiple",
+                      showSearch: true,
+                      
                     }}
-                  >
-                    新增
-                  </Button>
-                </div>
-                <Table
-                  style={{ width: "100%" }}
-                  size="small"
-                  rowKey="id"
+                  />
+                  <ProFormSelect
+                    options={[
+                      {
+                        label: "所有权限策略",
+                        value: "",
+                      },
+                      ...empowerCom?.action?.shareData?.policQueryListData,
+                    ]}
+                    name="policyIds"
+                    label="权限策略"
+                    fieldProps={{
+                      mode: "multiple",
+                      showSearch: true,
+                    }}
+                  />
+                 
+                </QueryFilter>
+                <ProTable
+                  style={{ margin: "20px 0" }}
+                  toolBarRender={() => {
+                    return [
+                      <Button
+                        key="add"
+                        size="middle"
+                        type="primary"
+                        onClick={() => {
+                          empowerCom?.action?.editOpenStatus(true);
+                        }}
+                      >
+                        新增
+                      </Button>,
+                    ];
+                  }}
                   dataSource={policy?.dataList}
                   loading={policy?.isLoading}
                   columns={TablePolicy}
-                  pagination={false}
+                  tableAlertRender={false}
+                  tableAlertOptionRender={false}
+                  rowKey="id"
+                  headerTitle={false}
+                  options={false}
                   rowSelection={{
                     type: "checkbox",
-                    //   selectedRowKeys: rowKeys,
                     onChange: (selectedRowKeys: any, list: any) => {
                       let data = list?.map((item: any) => {
                         return {
@@ -570,13 +645,6 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
                   </Button>
                   <Pagination
                     {...policy?.pagination}
-                    onChange={(innerPageNo: number, innerPageSize: number) => {
-                      policy?.execute({
-                        innerPageNo,
-                        innerPageSize,
-                        subjectCodes: [roleCode],
-                      });
-                    }}
                   />
                 </div>
               </>
@@ -597,7 +665,7 @@ export default function RoleInfo({ isShowTab, getAuthTree , empowerCom}: RoleInf
         actionFunc={(data: any) => {
           return empowerCom?.action?.actionFunc(data).then(() => {
             message.success("新增成功");
-            policy?.execute({ subjectCodes: [roleCode] });
+            policy?.execute();
           });
         }}
       />