cfel-base-components 2.3.1 → 2.3.2

package/package.json

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

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

@@ -14,3 +14,13 @@
   align-items: center;
   margin: 10px 0px;
 }
+.deviceTopTitle{
+  display: flex;
+  align-items: center;
+  .deviceTopDivider{
+    flex: 1;
+  }
+  .deviceTopButton{
+    margin: 0px 5px;
+  }
+}

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

@@ -16,6 +16,7 @@ import {
   message,
   Tabs,
   Table,
+  Spin
 } from "antd";
 import EditAccountDrawer from "./EditAccountDrawer/index";
 import { timeFormatter, getUrlParams } from "../../../utils";
@@ -51,6 +52,7 @@ export default function RoleInfo({ isShowTab, getAuthTree }: RoleInfoProps) {
 
   const [ResourceTableData, setResourceTableData]: any = useState([]); //关联资源
   const [isTableLoading, setisTableLoading] = useState(false);
+  const [loading, setLoading] = useState(false)
 
   const [TableItemData, setTableItemData]: any = useState([
     {
@@ -173,6 +175,7 @@ export default function RoleInfo({ isShowTab, getAuthTree }: RoleInfoProps) {
   ];
   useEffect(() => {
     init();
+    getRoleFunc({ roleCode });
   }, []);
 
   const init = () => {
@@ -200,7 +203,8 @@ export default function RoleInfo({ isShowTab, getAuthTree }: RoleInfoProps) {
     }
     setTableItemData([...TableItemData, ...data]);
   };
-  useEffect(() => {
+  
+  const tabCheckFunc = () => {
     if (tabCheck == "tableEmpower") {
       policy?.execute({
         subjectCodes: [roleCode],
@@ -208,8 +212,11 @@ export default function RoleInfo({ isShowTab, getAuthTree }: RoleInfoProps) {
     } else if (tabCheck == "tableResource") {
       getAuthTreeFunc(); // 获取关联资源
     } else {
-      initGetData();
+      execute({ roleCode: roleCode });
     }
+  };
+  useEffect(() => {
+    tabCheckFunc();
   }, [tabCheck]);
 
   //获取关联资源
@@ -240,19 +247,16 @@ export default function RoleInfo({ isShowTab, getAuthTree }: RoleInfoProps) {
     }
   };
 
-  //初始化请求数据
-  const initGetData = () => {
-    if (roleCode) {
-      getRoleFunc({ roleCode });
-      execute({ roleCode: roleCode });
-    }
-  };
+
   const getRoleFunc = (data: any) => {
     setRoleInfo({});
+    setLoading(true);
     getRole({
       ...data,
     }).then((res: any) => {
+      setLoading(false);
       setRoleInfo(res || {});
+      tabCheckFunc();
     });
   };
   const roleUnboundAccountsFunc = (account: any) => {
@@ -350,7 +354,15 @@ export default function RoleInfo({ isShowTab, getAuthTree }: RoleInfoProps) {
 
   return (
     <PageContainer>
-      <Divider orientation="left">{roleInfo?.roleName || "-"}</Divider>
+      <Spin spinning={loading}>
+      <div className="deviceTopTitle">
+          <div className="deviceTopDivider">
+            <Divider orientation="left">{roleInfo?.roleName || "-"}</Divider>
+          </div>
+          <Button className="deviceTopButton" onClick={(() => {
+              getRoleFunc({ roleCode });
+          })} >刷新</Button>
+      </div>
       <Descriptions className="basicInfoWrap">
         <Descriptions.Item label="角色名称">
           {roleInfo?.roleName || ""}
@@ -463,6 +475,7 @@ export default function RoleInfo({ isShowTab, getAuthTree }: RoleInfoProps) {
           {tabCheck == "tableData" && <></>}
         </div>
       </div>
+      </Spin>
       {/*  */}
       <EditAccountDrawer
         open={editAccountOpen} // 状态