@mu-cabin/opms-permission 0.9.3 → 0.9.5

package/dist/index.cjs

@@ -162,15 +162,18 @@ var Storage = class {
 var storage = new Storage();
 
 // src/utils/dataHandler.ts
-var getCompletePath = (item) => {
+var getCompletePath = (item, hasSubApp) => {
   const menuUrl = item.openIndicator === "INNER_COMPONENT" ? item.componentPath : item.defaultUrl;
+  if (!hasSubApp) {
+    return menuUrl ?? "";
+  }
   const path = item.prefix && item.openIndicator === "INNER_COMPONENT" ? `${item.prefix}${menuUrl}` : menuUrl ?? "";
   return path;
 };
 function getMenuName(item) {
   return item.resourceType !== "FOLDER" ? item.resourceName || "" : (item.showName ?? item.resourceName) || "";
 }
-function createResourceMap(items) {
+function createResourceMap(items, hasSubApp) {
   const resourceMap = {};
   const widgetMap = {};
   function addToMap(items2) {
@@ -179,7 +182,7 @@ function createResourceMap(items) {
       if (newItem.defaultResourceType === "WIDGET") {
         if (newItem.componentPath) widgetMap[newItem.componentPath] = newItem;
       } else {
-        const path = getCompletePath(newItem);
+        const path = getCompletePath(newItem, hasSubApp);
         if (path) {
           resourceMap[path] = newItem;
         }
@@ -196,13 +199,13 @@ function isMenuItem(item) {
   const resourceType = item.resourceType ?? item.defaultResourceType;
   return resourceType !== "WIDGET";
 }
-function createMenuList(items) {
+function createMenuList(items, hasSubApp) {
   const menus = [];
   const menuMap = {};
   const filterMenus = (items2, container) => {
     items2.forEach((item) => {
       const icon = item.icon || item.defaultIcon;
-      const path = getCompletePath(item);
+      const path = getCompletePath(item, hasSubApp);
       const name = getMenuName(item);
       const newItem = {
         icon,
@@ -542,12 +545,12 @@ var DataHandler = {
     return findAllEnableTopLevelCodes(orgTree);
   },
   // 获取资源数据, 包含资源map和组件map
-  getResourceData(resources) {
-    return createResourceMap(resources);
+  getResourceData(resources, hasSubApp) {
+    return createResourceMap(resources, hasSubApp);
   },
   // 获取菜单数据, 包含菜单列表和菜单map
-  getMenuData(resources) {
-    return createMenuList(resources);
+  getMenuData(resources, hasSubApp) {
+    return createMenuList(resources, hasSubApp);
   },
   getFirstUnitOrgCode(orgTree) {
     return findFirstEnableCode(orgTree) ?? "";
@@ -557,16 +560,17 @@ var DataHandler = {
 };
 var Permission = class {
   constructor(options) {
-    this._userInfo = null;
     this.resources = [];
     this.resourceMap = {};
     this.widgetMap = {};
     this.menuList = [];
     this.menuMap = {};
+    this.hasSubApp = false;
     // Event emitter instance - only allow tokenChange event
     this.eventEmitter = new EventEmitter(["tokenChange"]);
     this.baseUrl = options.baseUrl;
     this.systemId = options.systemId;
+    this.hasSubApp = options.hasSubApp ?? false;
     storage.setSystemId(this.systemId);
     storage.setVersion("1.0.0");
   }
@@ -684,8 +688,8 @@ var Permission = class {
         // 12 hours
       );
     }
-    const { resourceMap, widgetMap } = createResourceMap(resources);
-    const { menuList, menuMap } = createMenuList(resources);
+    const { resourceMap, widgetMap } = createResourceMap(resources, this.hasSubApp);
+    const { menuList, menuMap } = createMenuList(resources, this.hasSubApp);
     return {
       resources,
       resourceMap,

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 {
@@ -122,7 +121,7 @@ interface MenuItem {
     name: string;
     children: MenuItem[];
     resourceId: number;
-    openIndicator: string;
+    openIndicator: OpenIndicatorType;
 }
 interface UserInfo {
     account: string;
@@ -253,6 +252,7 @@ declare class EventEmitter<TEventMap extends Record<string, any> = PermissionEve
 interface PermissionOptions {
     systemId: string;
     baseUrl: string;
+    hasSubApp?: boolean;
 }
 /**
  * 组织树处理工具
@@ -263,7 +263,7 @@ declare const DataHandler: {
     getAllUnitOptions(orgTree: OrgTreeItem[]): Option[];
     getCompaniesOptions(orgTree: OrgTreeItem[], hasRootAuth: boolean): Option[];
     topLevelUnitOrgCodes(orgTree: OrgTreeItem[]): string[];
-    getResourceData(resources: Resource[]): {
+    getResourceData(resources: Resource[], hasSubApp: boolean): {
         resourceMap: {
             [path: string]: Resource;
         };
@@ -271,7 +271,7 @@ declare const DataHandler: {
             [path: string]: Resource;
         };
     };
-    getMenuData(resources: Resource[]): {
+    getMenuData(resources: Resource[], hasSubApp: boolean): {
         menuList: MenuItem[];
         menuMap: {
             [path: string]: MenuItem;
@@ -282,7 +282,6 @@ declare const DataHandler: {
     handlePermissionTree: typeof handlePermissionTree;
 };
 declare class Permission {
-    private _userInfo;
     private systemId;
     private baseUrl;
     resources: Resource[];
@@ -296,6 +295,7 @@ declare class Permission {
     menuMap: {
         [path: string]: MenuItem;
     };
+    hasSubApp: boolean;
     private eventEmitter;
     constructor(options: PermissionOptions);
     /**

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 {
@@ -122,7 +121,7 @@ interface MenuItem {
     name: string;
     children: MenuItem[];
     resourceId: number;
-    openIndicator: string;
+    openIndicator: OpenIndicatorType;
 }
 interface UserInfo {
     account: string;
@@ -253,6 +252,7 @@ declare class EventEmitter<TEventMap extends Record<string, any> = PermissionEve
 interface PermissionOptions {
     systemId: string;
     baseUrl: string;
+    hasSubApp?: boolean;
 }
 /**
  * 组织树处理工具
@@ -263,7 +263,7 @@ declare const DataHandler: {
     getAllUnitOptions(orgTree: OrgTreeItem[]): Option[];
     getCompaniesOptions(orgTree: OrgTreeItem[], hasRootAuth: boolean): Option[];
     topLevelUnitOrgCodes(orgTree: OrgTreeItem[]): string[];
-    getResourceData(resources: Resource[]): {
+    getResourceData(resources: Resource[], hasSubApp: boolean): {
         resourceMap: {
             [path: string]: Resource;
         };
@@ -271,7 +271,7 @@ declare const DataHandler: {
             [path: string]: Resource;
         };
     };
-    getMenuData(resources: Resource[]): {
+    getMenuData(resources: Resource[], hasSubApp: boolean): {
         menuList: MenuItem[];
         menuMap: {
             [path: string]: MenuItem;
@@ -282,7 +282,6 @@ declare const DataHandler: {
     handlePermissionTree: typeof handlePermissionTree;
 };
 declare class Permission {
-    private _userInfo;
     private systemId;
     private baseUrl;
     resources: Resource[];
@@ -296,6 +295,7 @@ declare class Permission {
     menuMap: {
         [path: string]: MenuItem;
     };
+    hasSubApp: boolean;
     private eventEmitter;
     constructor(options: PermissionOptions);
     /**

package/dist/index.mjs

@@ -113,15 +113,18 @@ var Storage = class {
 var storage = new Storage();
 
 // src/utils/dataHandler.ts
-var getCompletePath = (item) => {
+var getCompletePath = (item, hasSubApp) => {
   const menuUrl = item.openIndicator === "INNER_COMPONENT" ? item.componentPath : item.defaultUrl;
+  if (!hasSubApp) {
+    return menuUrl ?? "";
+  }
   const path = item.prefix && item.openIndicator === "INNER_COMPONENT" ? `${item.prefix}${menuUrl}` : menuUrl ?? "";
   return path;
 };
 function getMenuName(item) {
   return item.resourceType !== "FOLDER" ? item.resourceName || "" : (item.showName ?? item.resourceName) || "";
 }
-function createResourceMap(items) {
+function createResourceMap(items, hasSubApp) {
   const resourceMap = {};
   const widgetMap = {};
   function addToMap(items2) {
@@ -130,7 +133,7 @@ function createResourceMap(items) {
       if (newItem.defaultResourceType === "WIDGET") {
         if (newItem.componentPath) widgetMap[newItem.componentPath] = newItem;
       } else {
-        const path = getCompletePath(newItem);
+        const path = getCompletePath(newItem, hasSubApp);
         if (path) {
           resourceMap[path] = newItem;
         }
@@ -147,13 +150,13 @@ function isMenuItem(item) {
   const resourceType = item.resourceType ?? item.defaultResourceType;
   return resourceType !== "WIDGET";
 }
-function createMenuList(items) {
+function createMenuList(items, hasSubApp) {
   const menus = [];
   const menuMap = {};
   const filterMenus = (items2, container) => {
     items2.forEach((item) => {
       const icon = item.icon || item.defaultIcon;
-      const path = getCompletePath(item);
+      const path = getCompletePath(item, hasSubApp);
       const name = getMenuName(item);
       const newItem = {
         icon,
@@ -493,12 +496,12 @@ var DataHandler = {
     return findAllEnableTopLevelCodes(orgTree);
   },
   // 获取资源数据, 包含资源map和组件map
-  getResourceData(resources) {
-    return createResourceMap(resources);
+  getResourceData(resources, hasSubApp) {
+    return createResourceMap(resources, hasSubApp);
   },
   // 获取菜单数据, 包含菜单列表和菜单map
-  getMenuData(resources) {
-    return createMenuList(resources);
+  getMenuData(resources, hasSubApp) {
+    return createMenuList(resources, hasSubApp);
   },
   getFirstUnitOrgCode(orgTree) {
     return findFirstEnableCode(orgTree) ?? "";
@@ -508,16 +511,17 @@ var DataHandler = {
 };
 var Permission = class {
   constructor(options) {
-    this._userInfo = null;
     this.resources = [];
     this.resourceMap = {};
     this.widgetMap = {};
     this.menuList = [];
     this.menuMap = {};
+    this.hasSubApp = false;
     // Event emitter instance - only allow tokenChange event
     this.eventEmitter = new EventEmitter(["tokenChange"]);
     this.baseUrl = options.baseUrl;
     this.systemId = options.systemId;
+    this.hasSubApp = options.hasSubApp ?? false;
     storage.setSystemId(this.systemId);
     storage.setVersion("1.0.0");
   }
@@ -635,8 +639,8 @@ var Permission = class {
         // 12 hours
       );
     }
-    const { resourceMap, widgetMap } = createResourceMap(resources);
-    const { menuList, menuMap } = createMenuList(resources);
+    const { resourceMap, widgetMap } = createResourceMap(resources, this.hasSubApp);
+    const { menuList, menuMap } = createMenuList(resources, this.hasSubApp);
     return {
       resources,
       resourceMap,

package/package.json

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