@mu-cabin/opms-permission 0.8.7 → 0.8.9

package/dist/index.cjs

@@ -258,6 +258,47 @@ async function queryOrgCompanies(baseUrl, params) {
 }
 
 // src/permission.ts
+var DataHandler = {
+  // 获取单位组织
+  getUnitOptions(orgTree) {
+    if (!orgTree) return [];
+    return orgTree.disabled ? orgTree.children ?? [] : [orgTree];
+  },
+  // 获取所有单位组织
+  getAllUnitOptions(orgTree) {
+    if (!orgTree) return [];
+    const newTree = iterateNestedArray(
+      [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 })
+    );
+    if (hasRootAuth) {
+      list.unshift({ ...orgTree, label: "\u5168\u516C\u53F8", children: [] });
+    }
+    return list;
+  },
+  // 获取所有顶级单位组织代码
+  topLevelUnitOrgCodes(orgTree) {
+    if (!orgTree) return [];
+    return findAllEnableTopLevelCodes(
+      Array.isArray(orgTree) ? orgTree : [orgTree]
+    );
+  },
+  // 获取资源数据, 包含资源map和组件map
+  getResourceData(resources) {
+    return createResourceMap(resources);
+  },
+  // 获取菜单数据, 包含菜单列表和菜单map
+  getMenuData(resources) {
+    return createMenuList(resources);
+  }
+};
 var Permission = class {
   constructor(options) {
     this._userInfo = null;
@@ -331,13 +372,11 @@ var Permission = class {
    * Get resources and process to menuList, menuMap, widgetMap (matches app store logic)
    */
   async getResources() {
-    const resourcesObj = storage.getItem(RESOURCE_KEY) || null;
-    if (resourcesObj) {
-      const { menuList: menuList2, menuMap: menuMap2 } = createMenuList(resourcesObj.resources);
+    let resources = storage.getItem(RESOURCE_KEY) || null;
+    if (resources) {
+      const { menuList: menuList2, menuMap: menuMap2 } = createMenuList(resources);
       return {
-        resources: resourcesObj.resources,
-        resourceMap: resourcesObj.resourceMap,
-        widgetMap: resourcesObj.widgetMap,
+        resources,
         menuList: menuList2,
         menuMap: menuMap2
       };
@@ -351,7 +390,7 @@ var Permission = class {
         msg
       });
     }
-    const resources = obj;
+    resources = obj;
     const { resourceMap, widgetMap } = createResourceMap(resources);
     const { menuList, menuMap } = createMenuList(resources);
     this.resources = resources;
@@ -361,11 +400,7 @@ var Permission = class {
     this.menuMap = menuMap;
     storage.setItem(
       RESOURCE_KEY,
-      {
-        resources,
-        resourceMap,
-        widgetMap
-      },
+      resources,
       60 * 24
       // 24 hours
     );
@@ -403,7 +438,8 @@ var Permission = class {
           nodeLevel: item.nodeLevel,
           children: item.children,
           disabled: !item.hasPermission,
-          orgType: item.orgType
+          orgType: item.orgType,
+          orgId: item.orgId
         };
       })?.[0];
       this._orgTree = newTree;
@@ -414,19 +450,16 @@ var Permission = class {
     }
   }
   async queryCompanies() {
-    try {
-      let orgCompanyList = storage.getItem(ORG_COMPANY_KEY);
-      if (!orgCompanyList) {
-        const { obj } = await queryOrgCompanies(this.baseUrl, {
-          queryAllBranches: true
-        });
-        orgCompanyList = obj;
-        storage.setItem(ORG_COMPANY_KEY, orgCompanyList);
-      }
-      this._orgCompany = orgCompanyList;
-    } catch (error) {
-      console.log(error);
+    let orgCompanyList = storage.getItem(ORG_COMPANY_KEY);
+    if (!orgCompanyList) {
+      const { obj } = await queryOrgCompanies(this.baseUrl, {
+        queryAllBranches: true
+      });
+      orgCompanyList = obj;
+      storage.setItem(ORG_COMPANY_KEY, orgCompanyList);
     }
+    this._orgCompany = orgCompanyList;
+    return orgCompanyList;
   }
   isLogin() {
     return !!storage.getItem(TOKEN_KEY);
@@ -482,16 +515,12 @@ var Permission = class {
   get unitOptions() {
     const orgTree = this._orgTree;
     if (!orgTree) return [];
-    return orgTree.disabled ? orgTree.children ?? [] : [orgTree];
+    return DataHandler.getUnitOptions(orgTree);
   }
   get allUnitOptions() {
     const orgTree = this._orgTree;
     if (!orgTree) return [];
-    const newTree = iterateNestedArray(
-      [orgTree],
-      ({ disabled, ...other }) => ({ ...other })
-    )?.[0];
-    return newTree ? newTree.children ?? [] : [];
+    return DataHandler.getAllUnitOptions(orgTree);
   }
   get firstUnitOrgCode() {
     if (this.hasRootAuth) {
@@ -504,9 +533,7 @@ var Permission = class {
   get topLevelUnitOrgCodes() {
     const orgTree = this._orgTree;
     if (!orgTree) return [];
-    return findAllEnableTopLevelCodes(
-      Array.isArray(orgTree) ? orgTree : [orgTree]
-    );
+    return DataHandler.topLevelUnitOrgCodes(orgTree);
   }
 };
 

package/dist/index.d.mts

@@ -1,3 +1,13 @@
+interface OrgRecord {
+    orgId: number;
+    orgName: string;
+    orgShortName: string;
+    orgCode: string;
+    nodeLevel: number;
+    hasPermission: boolean;
+    children?: OrgRecord[];
+}
+
 interface Resource {
     resourceId: number;
     resourceCode: string;
@@ -35,6 +45,10 @@ interface UserOrganization {
     orgShortName: string;
     orgType: string;
 }
+interface Option {
+    label: string;
+    value: string;
+}
 
 interface PermissionOptions {
     systemId: string;
@@ -72,6 +86,12 @@ 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;
@@ -86,18 +106,18 @@ declare class Permission {
      * Query and process organization tree
      */
     queryOrgs(): Promise<any>;
-    queryCompanies(): Promise<void>;
+    queryCompanies(): Promise<OrgRecord[]>;
     isLogin(): boolean;
     getToken(): string | null;
     setToken(token: string): void;
     get userInfo(): UserInfo | null;
     get hasRootAuth(): boolean;
     get userOrganizations(): UserOrganization[];
-    get allCompanyOptions(): any;
-    get companyOptions(): any;
+    get allCompanyOptions(): Option[];
+    get companyOptions(): Option[];
     get firstCompanyOrgCode(): string;
-    get unitOptions(): any;
-    get allUnitOptions(): any;
+    get unitOptions(): Option[];
+    get allUnitOptions(): Option[];
     get firstUnitOrgCode(): string;
     get topLevelUnitOrgCodes(): string[];
 }
@@ -124,4 +144,4 @@ declare function jumpToSSOLogout({ baseUrl, redirectToUrl, clientId, }: {
     clientId?: string;
 }): void;
 
-export { type MenuItem, Permission as OpmsPermission, type Resource, type UserInfo, type UserOrganization, jumpToSSOLogin, jumpToSSOLogout };
+export { type MenuItem, Permission as OpmsPermission, type Option, type Resource, type UserInfo, type UserOrganization, jumpToSSOLogin, jumpToSSOLogout };

package/dist/index.d.ts

@@ -1,3 +1,13 @@
+interface OrgRecord {
+    orgId: number;
+    orgName: string;
+    orgShortName: string;
+    orgCode: string;
+    nodeLevel: number;
+    hasPermission: boolean;
+    children?: OrgRecord[];
+}
+
 interface Resource {
     resourceId: number;
     resourceCode: string;
@@ -35,6 +45,10 @@ interface UserOrganization {
     orgShortName: string;
     orgType: string;
 }
+interface Option {
+    label: string;
+    value: string;
+}
 
 interface PermissionOptions {
     systemId: string;
@@ -72,6 +86,12 @@ 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;
@@ -86,18 +106,18 @@ declare class Permission {
      * Query and process organization tree
      */
     queryOrgs(): Promise<any>;
-    queryCompanies(): Promise<void>;
+    queryCompanies(): Promise<OrgRecord[]>;
     isLogin(): boolean;
     getToken(): string | null;
     setToken(token: string): void;
     get userInfo(): UserInfo | null;
     get hasRootAuth(): boolean;
     get userOrganizations(): UserOrganization[];
-    get allCompanyOptions(): any;
-    get companyOptions(): any;
+    get allCompanyOptions(): Option[];
+    get companyOptions(): Option[];
     get firstCompanyOrgCode(): string;
-    get unitOptions(): any;
-    get allUnitOptions(): any;
+    get unitOptions(): Option[];
+    get allUnitOptions(): Option[];
     get firstUnitOrgCode(): string;
     get topLevelUnitOrgCodes(): string[];
 }
@@ -124,4 +144,4 @@ declare function jumpToSSOLogout({ baseUrl, redirectToUrl, clientId, }: {
     clientId?: string;
 }): void;
 
-export { type MenuItem, Permission as OpmsPermission, type Resource, type UserInfo, type UserOrganization, jumpToSSOLogin, jumpToSSOLogout };
+export { type MenuItem, Permission as OpmsPermission, type Option, type Resource, type UserInfo, type UserOrganization, jumpToSSOLogin, jumpToSSOLogout };

package/dist/index.mjs

@@ -220,6 +220,47 @@ async function queryOrgCompanies(baseUrl, params) {
 }
 
 // src/permission.ts
+var DataHandler = {
+  // 获取单位组织
+  getUnitOptions(orgTree) {
+    if (!orgTree) return [];
+    return orgTree.disabled ? orgTree.children ?? [] : [orgTree];
+  },
+  // 获取所有单位组织
+  getAllUnitOptions(orgTree) {
+    if (!orgTree) return [];
+    const newTree = iterateNestedArray(
+      [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 })
+    );
+    if (hasRootAuth) {
+      list.unshift({ ...orgTree, label: "\u5168\u516C\u53F8", children: [] });
+    }
+    return list;
+  },
+  // 获取所有顶级单位组织代码
+  topLevelUnitOrgCodes(orgTree) {
+    if (!orgTree) return [];
+    return findAllEnableTopLevelCodes(
+      Array.isArray(orgTree) ? orgTree : [orgTree]
+    );
+  },
+  // 获取资源数据, 包含资源map和组件map
+  getResourceData(resources) {
+    return createResourceMap(resources);
+  },
+  // 获取菜单数据, 包含菜单列表和菜单map
+  getMenuData(resources) {
+    return createMenuList(resources);
+  }
+};
 var Permission = class {
   constructor(options) {
     this._userInfo = null;
@@ -293,13 +334,11 @@ var Permission = class {
    * Get resources and process to menuList, menuMap, widgetMap (matches app store logic)
    */
   async getResources() {
-    const resourcesObj = storage.getItem(RESOURCE_KEY) || null;
-    if (resourcesObj) {
-      const { menuList: menuList2, menuMap: menuMap2 } = createMenuList(resourcesObj.resources);
+    let resources = storage.getItem(RESOURCE_KEY) || null;
+    if (resources) {
+      const { menuList: menuList2, menuMap: menuMap2 } = createMenuList(resources);
       return {
-        resources: resourcesObj.resources,
-        resourceMap: resourcesObj.resourceMap,
-        widgetMap: resourcesObj.widgetMap,
+        resources,
         menuList: menuList2,
         menuMap: menuMap2
       };
@@ -313,7 +352,7 @@ var Permission = class {
         msg
       });
     }
-    const resources = obj;
+    resources = obj;
     const { resourceMap, widgetMap } = createResourceMap(resources);
     const { menuList, menuMap } = createMenuList(resources);
     this.resources = resources;
@@ -323,11 +362,7 @@ var Permission = class {
     this.menuMap = menuMap;
     storage.setItem(
       RESOURCE_KEY,
-      {
-        resources,
-        resourceMap,
-        widgetMap
-      },
+      resources,
       60 * 24
       // 24 hours
     );
@@ -365,7 +400,8 @@ var Permission = class {
           nodeLevel: item.nodeLevel,
           children: item.children,
           disabled: !item.hasPermission,
-          orgType: item.orgType
+          orgType: item.orgType,
+          orgId: item.orgId
         };
       })?.[0];
       this._orgTree = newTree;
@@ -376,19 +412,16 @@ var Permission = class {
     }
   }
   async queryCompanies() {
-    try {
-      let orgCompanyList = storage.getItem(ORG_COMPANY_KEY);
-      if (!orgCompanyList) {
-        const { obj } = await queryOrgCompanies(this.baseUrl, {
-          queryAllBranches: true
-        });
-        orgCompanyList = obj;
-        storage.setItem(ORG_COMPANY_KEY, orgCompanyList);
-      }
-      this._orgCompany = orgCompanyList;
-    } catch (error) {
-      console.log(error);
+    let orgCompanyList = storage.getItem(ORG_COMPANY_KEY);
+    if (!orgCompanyList) {
+      const { obj } = await queryOrgCompanies(this.baseUrl, {
+        queryAllBranches: true
+      });
+      orgCompanyList = obj;
+      storage.setItem(ORG_COMPANY_KEY, orgCompanyList);
     }
+    this._orgCompany = orgCompanyList;
+    return orgCompanyList;
   }
   isLogin() {
     return !!storage.getItem(TOKEN_KEY);
@@ -444,16 +477,12 @@ var Permission = class {
   get unitOptions() {
     const orgTree = this._orgTree;
     if (!orgTree) return [];
-    return orgTree.disabled ? orgTree.children ?? [] : [orgTree];
+    return DataHandler.getUnitOptions(orgTree);
   }
   get allUnitOptions() {
     const orgTree = this._orgTree;
     if (!orgTree) return [];
-    const newTree = iterateNestedArray(
-      [orgTree],
-      ({ disabled, ...other }) => ({ ...other })
-    )?.[0];
-    return newTree ? newTree.children ?? [] : [];
+    return DataHandler.getAllUnitOptions(orgTree);
   }
   get firstUnitOrgCode() {
     if (this.hasRootAuth) {
@@ -466,9 +495,7 @@ var Permission = class {
   get topLevelUnitOrgCodes() {
     const orgTree = this._orgTree;
     if (!orgTree) return [];
-    return findAllEnableTopLevelCodes(
-      Array.isArray(orgTree) ? orgTree : [orgTree]
-    );
+    return DataHandler.topLevelUnitOrgCodes(orgTree);
   }
 };
 

package/package.json

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