@mu-cabin/opms-permission 0.9.4 → 0.9.6

package/dist/index.cjs

@@ -43,6 +43,7 @@ __export(index_exports, {
   login: () => login,
   logout: () => logout,
   queryOrgCompanies: () => queryOrgCompanies,
+  queryOrgCustom: () => queryOrgCustom,
   queryResource: () => queryResource
 });
 module.exports = __toCommonJS(index_exports);
@@ -316,7 +317,9 @@ var import_axios = __toESM(require("axios"));
 // src/config.ts
 var USER_INFO_KEY = "opms_user_info";
 var RESOURCE_KEY = "opms_resources";
-var TOKEN_KEY = "omps_authorization";
+var TOKEN_KEY = "opms_authorization";
+var USER_TOTAL_COMPANY_KEY = "opms_user_total_company";
+var USER_ORG_KEY = "opms_user_orgs";
 
 // src/api.ts
 var axiosClient = import_axios.default.create();
@@ -397,6 +400,12 @@ async function queryOrgCompanies(baseUrl, params) {
     params
   );
 }
+function queryOrgCustom(params) {
+  return import_axios.default.post(
+    "/api/opmsDefaultUser/queryOrgCustom",
+    params
+  );
+}
 
 // src/utils/eventEmitter.ts
 var EventEmitter = class {
@@ -688,7 +697,10 @@ var Permission = class {
         // 12 hours
       );
     }
-    const { resourceMap, widgetMap } = createResourceMap(resources, this.hasSubApp);
+    const { resourceMap, widgetMap } = createResourceMap(
+      resources,
+      this.hasSubApp
+    );
     const { menuList, menuMap } = createMenuList(resources, this.hasSubApp);
     return {
       resources,
@@ -702,16 +714,22 @@ var Permission = class {
    * Generate cache key for user orgs query
    */
   generateUserOrgsCacheKey(params) {
-    const sortedParams = Object.keys(params).sort().reduce((acc, key) => {
-      acc[key] = params[key];
-      return acc;
-    }, {});
-    return `user_orgs_${JSON.stringify(sortedParams)}`;
+    const sortedParams = Object.keys(params).sort().reduce(
+      (acc, key) => {
+        acc[key] = params[key];
+        return acc;
+      },
+      {}
+    );
+    return `${USER_ORG_KEY}_${JSON.stringify(sortedParams)}`;
   }
   /**
    * Query and process organization tree with caching
    */
-  async queryUserOrgs(params, config = { force: false, cacheTimeout: 2 }) {
+  async queryUserOrgs(params, config = {
+    force: false,
+    cacheTimeout: 2
+  }) {
     try {
       const { force, cacheTimeout = 2 } = config;
       let orgTreeData = null;
@@ -750,18 +768,40 @@ var Permission = class {
       return null;
     }
   }
-  // async queryCompanies(): Promise<OrgRecord[]> {
-  //   let orgCompanyList: OrgRecord[] | undefined =
-  //     storage.getItem(ORG_COMPANY_KEY);
-  //   if (!orgCompanyList) {
-  //     const { obj } = await queryOrgCompanies(this.baseUrl, {
-  //       queryAllBranches: true,
-  //     });
-  //     orgCompanyList = obj;
-  //     storage.setItem(ORG_COMPANY_KEY, orgCompanyList);
-  //   }
-  //   return orgCompanyList;
-  // }
+  async queryCompanies(config = {
+    force: false,
+    cacheTimeout: 2
+  }) {
+    const { force, cacheTimeout = 2 } = config;
+    let orgCompanyList;
+    if (!force) {
+      orgCompanyList = storage.getItem(USER_TOTAL_COMPANY_KEY);
+    }
+    if (!orgCompanyList) {
+      const { obj } = await queryOrgCustom({
+        resultView: "TREE",
+        orgCodeSource: "COS",
+        direction: "FROM_SELF_TO_LEAF",
+        orgTypes: ["HEAD", "BRANCH"],
+        maxDepth: 100
+      });
+      orgCompanyList = 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_TOTAL_COMPANY_KEY, orgCompanyList, cacheTimeout);
+    }
+    return orgCompanyList;
+  }
   isLogin() {
     return !!storage.getItem(TOKEN_KEY);
   }
@@ -795,7 +835,9 @@ var Permission = class {
    */
   getStorageInfo() {
     const keys = storage.getKeys();
-    const userOrgsCacheKeys = keys.filter((key) => key.startsWith("user_orgs_"));
+    const userOrgsCacheKeys = keys.filter(
+      (key) => key.startsWith(USER_ORG_KEY)
+    );
     return {
       ...storage.getStorageInfo(),
       permissionKeys: {
@@ -836,7 +878,7 @@ var Permission = class {
     } else {
       const keys = storage.getKeys();
       keys.forEach((key) => {
-        if (key.startsWith("user_orgs_")) {
+        if (key.startsWith(USER_ORG_KEY)) {
           storage.removeItem(key);
         }
       });
@@ -893,5 +935,6 @@ function jumpToSSOLogout({
   login,
   logout,
   queryOrgCompanies,
+  queryOrgCustom,
   queryResource
 });

package/dist/index.d.mts

@@ -27,7 +27,6 @@ interface Resource {
     icon?: string;
     openIndicator: OpenIndicatorType;
     orgQueryMode: EnumOrgQueryMode;
-    orgQueryScope: EnumOrgQueryScope;
 }
 type CodeSourceType = 'FLY_NET' | 'COS' | 'CSM';
 interface OrgRecord$1 {
@@ -115,6 +114,21 @@ declare function getUserOrgTree(baseUrl: string, params: UserOrgTreeParams): Pro
 declare function queryOrgCompanies(baseUrl: string, params: {
     queryAllBranches?: boolean;
 }): Promise<ApiResponse<OrgRecord$1[]>>;
+type ResultViewType = 'LIST' | 'TREE' | 'FOREST';
+type OrgDirectionType = 'NONE' | 'FROM_SELF_TO_ROOT' | 'FROM_SELF_TO_LEAF' | 'TWO_WAY';
+type OrgType = 'HEAD' | 'BRANCH' | 'DEPARTMENT';
+interface QueryOrgCustomParams {
+    resultView?: ResultViewType;
+    orgCodeSource: CodeSourceType;
+    ids?: number[];
+    direction?: OrgDirectionType;
+    maxDepth?: number;
+    orgTypes?: OrgType[];
+}
+/**
+ * 根据查询条件自定义组织机构查询
+ */
+declare function queryOrgCustom(params: QueryOrgCustomParams): Promise<ApiResponse<OrgRecord$1[]>>;
 
 interface MenuItem {
     icon?: string;
@@ -122,7 +136,7 @@ interface MenuItem {
     name: string;
     children: MenuItem[];
     resourceId: number;
-    openIndicator: string;
+    openIndicator: OpenIndicatorType;
 }
 interface UserInfo {
     account: string;
@@ -360,6 +374,10 @@ declare class Permission {
     }): Promise<{
         orgTree: OrgTreeItem[];
     } | null>;
+    queryCompanies(config?: {
+        force?: boolean;
+        cacheTimeout?: number;
+    }): Promise<OrgRecord$1[]>;
     isLogin(): boolean;
     getToken(): string | null;
     setToken(token: string): void;
@@ -422,4 +440,4 @@ declare function jumpToSSOLogout({ baseUrl, redirectToUrl, clientId, }: {
     clientId?: string;
 }): void;
 
-export { type ApiResponse, type ChildOrganization, type CodeSourceType, DataHandler, EnumOrgQueryMode, EnumOrgQueryScope, EventEmitter, type MenuItem, type OpenIndicatorType, Permission as OpmsPermission, type Option, type OrgRecord, type OrgTreeItem, type PermissionEventListener, type PermissionEventMap, type PermissionEventType, type Resource, type ResourceType, type UserInfo, type UserOrgTreeParams, type UserOrganization, type UserRole, getOrgTree, getUserInfo, getUserOrgTree, jumpToSSOLogin, jumpToSSOLogout, login, logout, queryOrgCompanies, queryResource };
+export { type ApiResponse, type ChildOrganization, type CodeSourceType, DataHandler, EnumOrgQueryMode, EnumOrgQueryScope, EventEmitter, type MenuItem, type OpenIndicatorType, Permission as OpmsPermission, type Option, type OrgDirectionType, type OrgRecord, type OrgTreeItem, type OrgType, type PermissionEventListener, type PermissionEventMap, type PermissionEventType, type QueryOrgCustomParams, type Resource, type ResourceType, type ResultViewType, type UserInfo, type UserOrgTreeParams, type UserOrganization, type UserRole, getOrgTree, getUserInfo, getUserOrgTree, jumpToSSOLogin, jumpToSSOLogout, login, logout, queryOrgCompanies, queryOrgCustom, queryResource };

package/dist/index.d.ts

@@ -27,7 +27,6 @@ interface Resource {
     icon?: string;
     openIndicator: OpenIndicatorType;
     orgQueryMode: EnumOrgQueryMode;
-    orgQueryScope: EnumOrgQueryScope;
 }
 type CodeSourceType = 'FLY_NET' | 'COS' | 'CSM';
 interface OrgRecord$1 {
@@ -115,6 +114,21 @@ declare function getUserOrgTree(baseUrl: string, params: UserOrgTreeParams): Pro
 declare function queryOrgCompanies(baseUrl: string, params: {
     queryAllBranches?: boolean;
 }): Promise<ApiResponse<OrgRecord$1[]>>;
+type ResultViewType = 'LIST' | 'TREE' | 'FOREST';
+type OrgDirectionType = 'NONE' | 'FROM_SELF_TO_ROOT' | 'FROM_SELF_TO_LEAF' | 'TWO_WAY';
+type OrgType = 'HEAD' | 'BRANCH' | 'DEPARTMENT';
+interface QueryOrgCustomParams {
+    resultView?: ResultViewType;
+    orgCodeSource: CodeSourceType;
+    ids?: number[];
+    direction?: OrgDirectionType;
+    maxDepth?: number;
+    orgTypes?: OrgType[];
+}
+/**
+ * 根据查询条件自定义组织机构查询
+ */
+declare function queryOrgCustom(params: QueryOrgCustomParams): Promise<ApiResponse<OrgRecord$1[]>>;
 
 interface MenuItem {
     icon?: string;
@@ -122,7 +136,7 @@ interface MenuItem {
     name: string;
     children: MenuItem[];
     resourceId: number;
-    openIndicator: string;
+    openIndicator: OpenIndicatorType;
 }
 interface UserInfo {
     account: string;
@@ -360,6 +374,10 @@ declare class Permission {
     }): Promise<{
         orgTree: OrgTreeItem[];
     } | null>;
+    queryCompanies(config?: {
+        force?: boolean;
+        cacheTimeout?: number;
+    }): Promise<OrgRecord$1[]>;
     isLogin(): boolean;
     getToken(): string | null;
     setToken(token: string): void;
@@ -422,4 +440,4 @@ declare function jumpToSSOLogout({ baseUrl, redirectToUrl, clientId, }: {
     clientId?: string;
 }): void;
 
-export { type ApiResponse, type ChildOrganization, type CodeSourceType, DataHandler, EnumOrgQueryMode, EnumOrgQueryScope, EventEmitter, type MenuItem, type OpenIndicatorType, Permission as OpmsPermission, type Option, type OrgRecord, type OrgTreeItem, type PermissionEventListener, type PermissionEventMap, type PermissionEventType, type Resource, type ResourceType, type UserInfo, type UserOrgTreeParams, type UserOrganization, type UserRole, getOrgTree, getUserInfo, getUserOrgTree, jumpToSSOLogin, jumpToSSOLogout, login, logout, queryOrgCompanies, queryResource };
+export { type ApiResponse, type ChildOrganization, type CodeSourceType, DataHandler, EnumOrgQueryMode, EnumOrgQueryScope, EventEmitter, type MenuItem, type OpenIndicatorType, Permission as OpmsPermission, type Option, type OrgDirectionType, type OrgRecord, type OrgTreeItem, type OrgType, type PermissionEventListener, type PermissionEventMap, type PermissionEventType, type QueryOrgCustomParams, type Resource, type ResourceType, type ResultViewType, type UserInfo, type UserOrgTreeParams, type UserOrganization, type UserRole, getOrgTree, getUserInfo, getUserOrgTree, jumpToSSOLogin, jumpToSSOLogout, login, logout, queryOrgCompanies, queryOrgCustom, queryResource };

package/dist/index.mjs

@@ -267,7 +267,9 @@ import axios from "axios";
 // src/config.ts
 var USER_INFO_KEY = "opms_user_info";
 var RESOURCE_KEY = "opms_resources";
-var TOKEN_KEY = "omps_authorization";
+var TOKEN_KEY = "opms_authorization";
+var USER_TOTAL_COMPANY_KEY = "opms_user_total_company";
+var USER_ORG_KEY = "opms_user_orgs";
 
 // src/api.ts
 var axiosClient = axios.create();
@@ -348,6 +350,12 @@ async function queryOrgCompanies(baseUrl, params) {
     params
   );
 }
+function queryOrgCustom(params) {
+  return axios.post(
+    "/api/opmsDefaultUser/queryOrgCustom",
+    params
+  );
+}
 
 // src/utils/eventEmitter.ts
 var EventEmitter = class {
@@ -639,7 +647,10 @@ var Permission = class {
         // 12 hours
       );
     }
-    const { resourceMap, widgetMap } = createResourceMap(resources, this.hasSubApp);
+    const { resourceMap, widgetMap } = createResourceMap(
+      resources,
+      this.hasSubApp
+    );
     const { menuList, menuMap } = createMenuList(resources, this.hasSubApp);
     return {
       resources,
@@ -653,16 +664,22 @@ var Permission = class {
    * Generate cache key for user orgs query
    */
   generateUserOrgsCacheKey(params) {
-    const sortedParams = Object.keys(params).sort().reduce((acc, key) => {
-      acc[key] = params[key];
-      return acc;
-    }, {});
-    return `user_orgs_${JSON.stringify(sortedParams)}`;
+    const sortedParams = Object.keys(params).sort().reduce(
+      (acc, key) => {
+        acc[key] = params[key];
+        return acc;
+      },
+      {}
+    );
+    return `${USER_ORG_KEY}_${JSON.stringify(sortedParams)}`;
   }
   /**
    * Query and process organization tree with caching
    */
-  async queryUserOrgs(params, config = { force: false, cacheTimeout: 2 }) {
+  async queryUserOrgs(params, config = {
+    force: false,
+    cacheTimeout: 2
+  }) {
     try {
       const { force, cacheTimeout = 2 } = config;
       let orgTreeData = null;
@@ -701,18 +718,40 @@ var Permission = class {
       return null;
     }
   }
-  // async queryCompanies(): Promise<OrgRecord[]> {
-  //   let orgCompanyList: OrgRecord[] | undefined =
-  //     storage.getItem(ORG_COMPANY_KEY);
-  //   if (!orgCompanyList) {
-  //     const { obj } = await queryOrgCompanies(this.baseUrl, {
-  //       queryAllBranches: true,
-  //     });
-  //     orgCompanyList = obj;
-  //     storage.setItem(ORG_COMPANY_KEY, orgCompanyList);
-  //   }
-  //   return orgCompanyList;
-  // }
+  async queryCompanies(config = {
+    force: false,
+    cacheTimeout: 2
+  }) {
+    const { force, cacheTimeout = 2 } = config;
+    let orgCompanyList;
+    if (!force) {
+      orgCompanyList = storage.getItem(USER_TOTAL_COMPANY_KEY);
+    }
+    if (!orgCompanyList) {
+      const { obj } = await queryOrgCustom({
+        resultView: "TREE",
+        orgCodeSource: "COS",
+        direction: "FROM_SELF_TO_LEAF",
+        orgTypes: ["HEAD", "BRANCH"],
+        maxDepth: 100
+      });
+      orgCompanyList = 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_TOTAL_COMPANY_KEY, orgCompanyList, cacheTimeout);
+    }
+    return orgCompanyList;
+  }
   isLogin() {
     return !!storage.getItem(TOKEN_KEY);
   }
@@ -746,7 +785,9 @@ var Permission = class {
    */
   getStorageInfo() {
     const keys = storage.getKeys();
-    const userOrgsCacheKeys = keys.filter((key) => key.startsWith("user_orgs_"));
+    const userOrgsCacheKeys = keys.filter(
+      (key) => key.startsWith(USER_ORG_KEY)
+    );
     return {
       ...storage.getStorageInfo(),
       permissionKeys: {
@@ -787,7 +828,7 @@ var Permission = class {
     } else {
       const keys = storage.getKeys();
       keys.forEach((key) => {
-        if (key.startsWith("user_orgs_")) {
+        if (key.startsWith(USER_ORG_KEY)) {
           storage.removeItem(key);
         }
       });
@@ -843,5 +884,6 @@ export {
   login,
   logout,
   queryOrgCompanies,
+  queryOrgCustom,
   queryResource
 };

package/package.json

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