@mu-cabin/opms-permission 0.8.29 → 0.8.31

package/dist/index.cjs

@@ -204,12 +204,12 @@ function findFirstEnableNode(data) {
   }
   return null;
 }
-function handleOrgTreeByPermission(data) {
+function handlePermissionTree(data, key) {
   const orgNoAuthMap = {};
   function processNode(node) {
     const processedChildren = node.children?.map((child) => processNode(child)).filter((child) => child !== null);
     if (node.disabled) {
-      orgNoAuthMap[node.orgId] = node;
+      orgNoAuthMap[node[key]] = { ...node, children: [] };
       if (!processedChildren?.length) {
         return null;
       }
@@ -234,6 +234,7 @@ var USER_INFO_KEY = "opms_user_info";
 var RESOURCE_KEY = "opms_resources";
 var TOKEN_KEY = "omps_authorization";
 var ORG_COMPANY_KEY = "opms_org_company";
+var USER_ORG_KEY = "opms_user_org";
 
 // src/api.ts
 var axiosClient = import_axios.default.create();
@@ -469,25 +470,33 @@ var Permission = class {
    */
   async queryUserOrgs() {
     try {
-      const res = await getUserOrgTree(this.baseUrl);
-      const { obj, success, msg, code } = res;
-      const newTree = iterateNestedArray(obj, (item) => {
-        return {
-          label: item.orgShortName,
-          value: item.orgCode,
-          title: item.orgShortName,
-          key: item.orgCode,
-          nodeLevel: item.nodeLevel,
-          children: item.children,
-          // TODO: 新接口只返回有权限的节点
-          disabled: !item.hasPermission,
-          orgType: item.orgType,
-          orgId: item.orgId
-        };
-      });
-      const { orgTree, orgNoAuthMap } = handleOrgTreeByPermission(newTree);
-      this._orgTree = newTree;
-      return { orgTree: newTree, orgNoAuthMap, authOrgTree: orgTree };
+      let orgTreeData = storage.getItem(USER_ORG_KEY) || null;
+      if (!orgTreeData) {
+        const res = await getUserOrgTree(this.baseUrl);
+        const { obj } = res;
+        orgTreeData = iterateNestedArray(obj, (item) => {
+          return {
+            label: item.orgShortName,
+            value: item.orgCode,
+            title: item.orgShortName,
+            key: item.orgCode,
+            nodeLevel: item.nodeLevel,
+            children: item.children,
+            disabled: !item.hasPermission,
+            orgType: item.orgType,
+            orgId: item.orgId
+          };
+        });
+        storage.setItem(USER_ORG_KEY, orgTreeData);
+      }
+      const data = handlePermissionTree(orgTreeData, "orgId");
+      const { orgNoAuthMap } = data;
+      let { orgTree } = data;
+      if (orgTree.length === 1 && orgTree[0].orgType === "HEAD" && orgTree[0].disabled) {
+        orgTree = orgTree[0].children || [];
+      }
+      this._orgTree = orgTreeData;
+      return { orgTree: orgTreeData, orgNoAuthMap, authOrgTree: orgTree };
     } catch (error) {
       console.log(error);
       return null;

package/dist/index.mjs

@@ -165,12 +165,12 @@ function findFirstEnableNode(data) {
   }
   return null;
 }
-function handleOrgTreeByPermission(data) {
+function handlePermissionTree(data, key) {
   const orgNoAuthMap = {};
   function processNode(node) {
     const processedChildren = node.children?.map((child) => processNode(child)).filter((child) => child !== null);
     if (node.disabled) {
-      orgNoAuthMap[node.orgId] = node;
+      orgNoAuthMap[node[key]] = { ...node, children: [] };
       if (!processedChildren?.length) {
         return null;
       }
@@ -195,6 +195,7 @@ var USER_INFO_KEY = "opms_user_info";
 var RESOURCE_KEY = "opms_resources";
 var TOKEN_KEY = "omps_authorization";
 var ORG_COMPANY_KEY = "opms_org_company";
+var USER_ORG_KEY = "opms_user_org";
 
 // src/api.ts
 var axiosClient = axios.create();
@@ -430,25 +431,33 @@ var Permission = class {
    */
   async queryUserOrgs() {
     try {
-      const res = await getUserOrgTree(this.baseUrl);
-      const { obj, success, msg, code } = res;
-      const newTree = iterateNestedArray(obj, (item) => {
-        return {
-          label: item.orgShortName,
-          value: item.orgCode,
-          title: item.orgShortName,
-          key: item.orgCode,
-          nodeLevel: item.nodeLevel,
-          children: item.children,
-          // TODO: 新接口只返回有权限的节点
-          disabled: !item.hasPermission,
-          orgType: item.orgType,
-          orgId: item.orgId
-        };
-      });
-      const { orgTree, orgNoAuthMap } = handleOrgTreeByPermission(newTree);
-      this._orgTree = newTree;
-      return { orgTree: newTree, orgNoAuthMap, authOrgTree: orgTree };
+      let orgTreeData = storage.getItem(USER_ORG_KEY) || null;
+      if (!orgTreeData) {
+        const res = await getUserOrgTree(this.baseUrl);
+        const { obj } = res;
+        orgTreeData = iterateNestedArray(obj, (item) => {
+          return {
+            label: item.orgShortName,
+            value: item.orgCode,
+            title: item.orgShortName,
+            key: item.orgCode,
+            nodeLevel: item.nodeLevel,
+            children: item.children,
+            disabled: !item.hasPermission,
+            orgType: item.orgType,
+            orgId: item.orgId
+          };
+        });
+        storage.setItem(USER_ORG_KEY, orgTreeData);
+      }
+      const data = handlePermissionTree(orgTreeData, "orgId");
+      const { orgNoAuthMap } = data;
+      let { orgTree } = data;
+      if (orgTree.length === 1 && orgTree[0].orgType === "HEAD" && orgTree[0].disabled) {
+        orgTree = orgTree[0].children || [];
+      }
+      this._orgTree = orgTreeData;
+      return { orgTree: orgTreeData, orgNoAuthMap, authOrgTree: orgTree };
     } catch (error) {
       console.log(error);
       return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mu-cabin/opms-permission",
-  "version": "0.8.29",
+  "version": "0.8.31",
   "description": "Frontend SDK for OPMS permission and auth management.",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",