@mu-cabin/opms-permission 0.8.13 → 0.8.16

package/dist/index.cjs

@@ -245,10 +245,9 @@ async function queryResource(baseUrl, params) {
     params
   );
 }
-async function getUserOrgTree(baseUrl, params) {
+async function getUserOrgTree(baseUrl) {
   return await axiosClient.post(
-    `${baseUrl}/opmsDefaultUser/orgTree`,
-    params
+    `${baseUrl}/user/userInfo`
   );
 }
 async function queryOrgCompanies(baseUrl, params) {
@@ -261,7 +260,7 @@ async function queryOrgCompanies(baseUrl, params) {
 // src/permission.ts
 var DataHandler = {
   iterateOrgTree(orgTree) {
-    return iterateNestedArray([orgTree], (item) => {
+    return iterateNestedArray(orgTree, (item) => {
       return {
         label: item.orgShortName,
         value: item.orgCode,
@@ -273,27 +272,28 @@ var DataHandler = {
         orgType: item.orgType,
         orgId: item.orgId
       };
-    })?.[0];
+    });
   },
   // 获取单位组织
-  getUnitOptions(orgTree) {
-    if (!orgTree) return [];
-    return orgTree.disabled ? orgTree.children ?? [] : [orgTree];
-  },
+  // getUnitOptions(orgTree: OrgTreeItem[]): Option[] {
+  //   if (!orgTree) return [];
+  //   return orgTree.disabled ? (orgTree.children ?? []) : [orgTree];
+  // },
   // 获取所有单位组织
   getAllUnitOptions(orgTree) {
     if (!orgTree) return [];
     const newTree = iterateNestedArray(
-      [orgTree],
+      orgTree,
       ({ disabled, ...other }) => ({ ...other })
     )?.[0];
     return newTree ? newTree.children ?? [] : [];
   },
   getCompaniesOptions(orgTree, hasRootAuth) {
     if (!orgTree) return [];
-    const list = (orgTree.children || []).map(
-      ({ children, ...others }) => ({ ...others, disabled: false })
-    );
+    const list = (orgTree || []).map(({ children, ...others }) => ({
+      ...others,
+      disabled: false
+    }));
     if (hasRootAuth) {
       list.unshift({ ...orgTree, label: "\u5168\u516C\u53F8", children: [] });
     }
@@ -302,9 +302,7 @@ var DataHandler = {
   // 获取所有顶级单位组织代码
   topLevelUnitOrgCodes(orgTree) {
     if (!orgTree) return [];
-    return findAllEnableTopLevelCodes(
-      Array.isArray(orgTree) ? orgTree : [orgTree]
-    );
+    return findAllEnableTopLevelCodes(orgTree);
   },
   // 获取资源数据, 包含资源map和组件map
   getResourceData(resources) {
@@ -315,7 +313,7 @@ var DataHandler = {
     return createMenuList(resources);
   },
   getFirstUnitOrgCode(orgTree) {
-    return findFirstEnableCode([orgTree]) ?? "";
+    return findFirstEnableCode(orgTree) ?? "";
   }
 };
 var Permission = class {
@@ -392,24 +390,24 @@ var Permission = class {
    */
   async getResources() {
     let resources = storage.getItem(RESOURCE_KEY) || null;
-    if (resources) {
-      const { menuList: menuList2, menuMap: menuMap2 } = createMenuList(resources);
-      return {
-        resources,
-        menuList: menuList2,
-        menuMap: menuMap2
-      };
-    }
-    const { obj, success, msg, code } = await queryResource(this.baseUrl, {
-      systemId: this.systemId
-    });
-    if (!success) {
-      return Promise.reject({
-        code,
-        msg
+    if (!resources) {
+      const { obj, success, msg, code } = await queryResource(this.baseUrl, {
+        systemId: this.systemId
       });
+      if (!success) {
+        return Promise.reject({
+          code,
+          msg
+        });
+      }
+      resources = obj;
+      storage.setItem(
+        RESOURCE_KEY,
+        resources,
+        60 * 24
+        // 24 hours
+      );
     }
-    resources = obj;
     const { resourceMap, widgetMap } = createResourceMap(resources);
     const { menuList, menuMap } = createMenuList(resources);
     this.resources = resources;
@@ -417,12 +415,6 @@ var Permission = class {
     this.widgetMap = widgetMap;
     this.menuList = menuList;
     this.menuMap = menuMap;
-    storage.setItem(
-      RESOURCE_KEY,
-      resources,
-      60 * 24
-      // 24 hours
-    );
     return {
       resources,
       resourceMap,
@@ -434,21 +426,17 @@ var Permission = class {
   /**
    * Query and process organization tree
    */
-  async queryOrgs() {
+  async queryUserOrgs() {
     try {
-      const data = await getUserOrgTree(this.baseUrl, {
-        systemId: this.systemId,
-        name: "COS"
-      });
-      const { obj, success, msg, code } = data;
+      const res = await getUserOrgTree(this.baseUrl);
+      const { data, success, msg, code } = res;
       if (!success) {
         return Promise.reject({
           code,
           msg
         });
       }
-      const orgTree = obj;
-      const newTree = iterateNestedArray([orgTree], (item) => {
+      const newTree = iterateNestedArray(data, (item) => {
         return {
           label: item.orgShortName,
           value: item.orgCode,
@@ -460,7 +448,7 @@ var Permission = class {
           orgType: item.orgType,
           orgId: item.orgId
         };
-      })?.[0];
+      });
       this._orgTree = newTree;
       return newTree;
     } catch (error) {
@@ -520,9 +508,10 @@ var Permission = class {
   get companyOptions() {
     const orgTree = this._orgTree;
     if (!orgTree) return [];
-    const list = (orgTree.children || []).map(
-      ({ children, ...others }) => ({ ...others, disabled: false })
-    );
+    const list = orgTree.map(({ children, ...others }) => ({
+      ...others,
+      disabled: false
+    }));
     if (this.hasRootAuth) {
       list.unshift({ ...orgTree, label: "\u5168\u516C\u53F8", children: [] });
     }
@@ -534,7 +523,7 @@ var Permission = class {
   get unitOptions() {
     const orgTree = this._orgTree;
     if (!orgTree) return [];
-    return DataHandler.getUnitOptions(orgTree);
+    return orgTree;
   }
   get allUnitOptions() {
     const orgTree = this._orgTree;
@@ -547,7 +536,7 @@ var Permission = class {
     }
     const orgTree = this._orgTree;
     if (!orgTree) return "";
-    return findFirstEnableCode([orgTree]) ?? "";
+    return findFirstEnableCode(orgTree) ?? "";
   }
   get topLevelUnitOrgCodes() {
     const orgTree = this._orgTree;

package/dist/index.d.mts

@@ -99,11 +99,10 @@ interface PermissionOptions {
  * 组织树处理工具
  */
 declare const DataHandler: {
-    iterateOrgTree(orgTree: OrgRecord$1): OrgTreeItem;
-    getUnitOptions(orgTree: OrgTreeItem): Option[];
-    getAllUnitOptions(orgTree: OrgTreeItem): Option[];
-    getCompaniesOptions(orgTree: OrgTreeItem, hasRootAuth: boolean): Option[];
-    topLevelUnitOrgCodes(orgTree: OrgTreeItem): string[];
+    iterateOrgTree(orgTree: OrgRecord$1[]): OrgTreeItem[];
+    getAllUnitOptions(orgTree: OrgTreeItem[]): Option[];
+    getCompaniesOptions(orgTree: OrgTreeItem[], hasRootAuth: boolean): Option[];
+    topLevelUnitOrgCodes(orgTree: OrgTreeItem[]): string[];
     getResourceData(resources: Resource[]): {
         resourceMap: {
             [path: string]: Resource;
@@ -118,7 +117,7 @@ declare const DataHandler: {
             [path: string]: MenuItem;
         };
     };
-    getFirstUnitOrgCode(orgTree: OrgTreeItem): string;
+    getFirstUnitOrgCode(orgTree: OrgTreeItem[]): string;
 };
 declare class Permission {
     private _userInfo;
@@ -152,12 +151,6 @@ declare class Permission {
      * Get resources and process to menuList, menuMap, widgetMap (matches app store logic)
      */
     getResources(): Promise<{
-        resources: Resource[];
-        menuList: MenuItem[];
-        menuMap: Record<number, MenuItem>;
-        resourceMap?: undefined;
-        widgetMap?: undefined;
-    } | {
         resources: Resource[];
         resourceMap: {
             [path: string]: Resource;
@@ -171,7 +164,7 @@ declare class Permission {
     /**
      * Query and process organization tree
      */
-    queryOrgs(): Promise<any>;
+    queryUserOrgs(): Promise<any[] | null>;
     queryCompanies(): Promise<OrgRecord$1[]>;
     isLogin(): boolean;
     getToken(): string | null;

package/dist/index.d.ts

@@ -99,11 +99,10 @@ interface PermissionOptions {
  * 组织树处理工具
  */
 declare const DataHandler: {
-    iterateOrgTree(orgTree: OrgRecord$1): OrgTreeItem;
-    getUnitOptions(orgTree: OrgTreeItem): Option[];
-    getAllUnitOptions(orgTree: OrgTreeItem): Option[];
-    getCompaniesOptions(orgTree: OrgTreeItem, hasRootAuth: boolean): Option[];
-    topLevelUnitOrgCodes(orgTree: OrgTreeItem): string[];
+    iterateOrgTree(orgTree: OrgRecord$1[]): OrgTreeItem[];
+    getAllUnitOptions(orgTree: OrgTreeItem[]): Option[];
+    getCompaniesOptions(orgTree: OrgTreeItem[], hasRootAuth: boolean): Option[];
+    topLevelUnitOrgCodes(orgTree: OrgTreeItem[]): string[];
     getResourceData(resources: Resource[]): {
         resourceMap: {
             [path: string]: Resource;
@@ -118,7 +117,7 @@ declare const DataHandler: {
             [path: string]: MenuItem;
         };
     };
-    getFirstUnitOrgCode(orgTree: OrgTreeItem): string;
+    getFirstUnitOrgCode(orgTree: OrgTreeItem[]): string;
 };
 declare class Permission {
     private _userInfo;
@@ -152,12 +151,6 @@ declare class Permission {
      * Get resources and process to menuList, menuMap, widgetMap (matches app store logic)
      */
     getResources(): Promise<{
-        resources: Resource[];
-        menuList: MenuItem[];
-        menuMap: Record<number, MenuItem>;
-        resourceMap?: undefined;
-        widgetMap?: undefined;
-    } | {
         resources: Resource[];
         resourceMap: {
             [path: string]: Resource;
@@ -171,7 +164,7 @@ declare class Permission {
     /**
      * Query and process organization tree
      */
-    queryOrgs(): Promise<any>;
+    queryUserOrgs(): Promise<any[] | null>;
     queryCompanies(): Promise<OrgRecord$1[]>;
     isLogin(): boolean;
     getToken(): string | null;

package/dist/index.mjs

@@ -206,10 +206,9 @@ async function queryResource(baseUrl, params) {
     params
   );
 }
-async function getUserOrgTree(baseUrl, params) {
+async function getUserOrgTree(baseUrl) {
   return await axiosClient.post(
-    `${baseUrl}/opmsDefaultUser/orgTree`,
-    params
+    `${baseUrl}/user/userInfo`
   );
 }
 async function queryOrgCompanies(baseUrl, params) {
@@ -222,7 +221,7 @@ async function queryOrgCompanies(baseUrl, params) {
 // src/permission.ts
 var DataHandler = {
   iterateOrgTree(orgTree) {
-    return iterateNestedArray([orgTree], (item) => {
+    return iterateNestedArray(orgTree, (item) => {
       return {
         label: item.orgShortName,
         value: item.orgCode,
@@ -234,27 +233,28 @@ var DataHandler = {
         orgType: item.orgType,
         orgId: item.orgId
       };
-    })?.[0];
+    });
   },
   // 获取单位组织
-  getUnitOptions(orgTree) {
-    if (!orgTree) return [];
-    return orgTree.disabled ? orgTree.children ?? [] : [orgTree];
-  },
+  // getUnitOptions(orgTree: OrgTreeItem[]): Option[] {
+  //   if (!orgTree) return [];
+  //   return orgTree.disabled ? (orgTree.children ?? []) : [orgTree];
+  // },
   // 获取所有单位组织
   getAllUnitOptions(orgTree) {
     if (!orgTree) return [];
     const newTree = iterateNestedArray(
-      [orgTree],
+      orgTree,
       ({ disabled, ...other }) => ({ ...other })
     )?.[0];
     return newTree ? newTree.children ?? [] : [];
   },
   getCompaniesOptions(orgTree, hasRootAuth) {
     if (!orgTree) return [];
-    const list = (orgTree.children || []).map(
-      ({ children, ...others }) => ({ ...others, disabled: false })
-    );
+    const list = (orgTree || []).map(({ children, ...others }) => ({
+      ...others,
+      disabled: false
+    }));
     if (hasRootAuth) {
       list.unshift({ ...orgTree, label: "\u5168\u516C\u53F8", children: [] });
     }
@@ -263,9 +263,7 @@ var DataHandler = {
   // 获取所有顶级单位组织代码
   topLevelUnitOrgCodes(orgTree) {
     if (!orgTree) return [];
-    return findAllEnableTopLevelCodes(
-      Array.isArray(orgTree) ? orgTree : [orgTree]
-    );
+    return findAllEnableTopLevelCodes(orgTree);
   },
   // 获取资源数据, 包含资源map和组件map
   getResourceData(resources) {
@@ -276,7 +274,7 @@ var DataHandler = {
     return createMenuList(resources);
   },
   getFirstUnitOrgCode(orgTree) {
-    return findFirstEnableCode([orgTree]) ?? "";
+    return findFirstEnableCode(orgTree) ?? "";
   }
 };
 var Permission = class {
@@ -353,24 +351,24 @@ var Permission = class {
    */
   async getResources() {
     let resources = storage.getItem(RESOURCE_KEY) || null;
-    if (resources) {
-      const { menuList: menuList2, menuMap: menuMap2 } = createMenuList(resources);
-      return {
-        resources,
-        menuList: menuList2,
-        menuMap: menuMap2
-      };
-    }
-    const { obj, success, msg, code } = await queryResource(this.baseUrl, {
-      systemId: this.systemId
-    });
-    if (!success) {
-      return Promise.reject({
-        code,
-        msg
+    if (!resources) {
+      const { obj, success, msg, code } = await queryResource(this.baseUrl, {
+        systemId: this.systemId
       });
+      if (!success) {
+        return Promise.reject({
+          code,
+          msg
+        });
+      }
+      resources = obj;
+      storage.setItem(
+        RESOURCE_KEY,
+        resources,
+        60 * 24
+        // 24 hours
+      );
     }
-    resources = obj;
     const { resourceMap, widgetMap } = createResourceMap(resources);
     const { menuList, menuMap } = createMenuList(resources);
     this.resources = resources;
@@ -378,12 +376,6 @@ var Permission = class {
     this.widgetMap = widgetMap;
     this.menuList = menuList;
     this.menuMap = menuMap;
-    storage.setItem(
-      RESOURCE_KEY,
-      resources,
-      60 * 24
-      // 24 hours
-    );
     return {
       resources,
       resourceMap,
@@ -395,21 +387,17 @@ var Permission = class {
   /**
    * Query and process organization tree
    */
-  async queryOrgs() {
+  async queryUserOrgs() {
     try {
-      const data = await getUserOrgTree(this.baseUrl, {
-        systemId: this.systemId,
-        name: "COS"
-      });
-      const { obj, success, msg, code } = data;
+      const res = await getUserOrgTree(this.baseUrl);
+      const { data, success, msg, code } = res;
       if (!success) {
         return Promise.reject({
           code,
           msg
         });
       }
-      const orgTree = obj;
-      const newTree = iterateNestedArray([orgTree], (item) => {
+      const newTree = iterateNestedArray(data, (item) => {
         return {
           label: item.orgShortName,
           value: item.orgCode,
@@ -421,7 +409,7 @@ var Permission = class {
           orgType: item.orgType,
           orgId: item.orgId
         };
-      })?.[0];
+      });
       this._orgTree = newTree;
       return newTree;
     } catch (error) {
@@ -481,9 +469,10 @@ var Permission = class {
   get companyOptions() {
     const orgTree = this._orgTree;
     if (!orgTree) return [];
-    const list = (orgTree.children || []).map(
-      ({ children, ...others }) => ({ ...others, disabled: false })
-    );
+    const list = orgTree.map(({ children, ...others }) => ({
+      ...others,
+      disabled: false
+    }));
     if (this.hasRootAuth) {
       list.unshift({ ...orgTree, label: "\u5168\u516C\u53F8", children: [] });
     }
@@ -495,7 +484,7 @@ var Permission = class {
   get unitOptions() {
     const orgTree = this._orgTree;
     if (!orgTree) return [];
-    return DataHandler.getUnitOptions(orgTree);
+    return orgTree;
   }
   get allUnitOptions() {
     const orgTree = this._orgTree;
@@ -508,7 +497,7 @@ var Permission = class {
     }
     const orgTree = this._orgTree;
     if (!orgTree) return "";
-    return findFirstEnableCode([orgTree]) ?? "";
+    return findFirstEnableCode(orgTree) ?? "";
   }
   get topLevelUnitOrgCodes() {
     const orgTree = this._orgTree;

package/package.json

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