@das-fed/utils 6.4.0-dev.70 → 6.4.0-dev.72

package/common-info/index.d.ts

@@ -25,9 +25,9 @@ export declare const getPersonalConfig: () => PersonalConfigInfo;
  * 可用于判断菜单或者按钮权限
  * @param menuCode 菜单编码
  * @param applicationCode 应用编码
- * @returns undefined（无菜单权限）；空数组（无按钮权限）
+ * @returns 无菜单权限返回undefined,有菜单权限但是没有任何按钮权限返回空数组
  */
-export declare const getPageAuth: (menuCode?: string, applicationCode?: string) => any;
+export declare const getPageAuth: (menuCode?: string, applicationCode?: string) => undefined | any[];
 /**
  * 获取指定菜单的按钮权限数据
  * @param menuCode 菜单编码

package/common-info/index.js

@@ -1,8 +1,8 @@
 import { getConfig as u } from "@das-fed/utils/config";
-import { getUrlParams as g } from "@das-fed/utils/common-tools";
-import { getAccessToken as i } from "@das-fed/utils/token-tools";
-import { getTokenFromQuery as I, getProjectInfoFromQuery as S } from "@das-fed/utils/common-info/getInfoFromUrl";
-const y = i, T = () => {
+import { getUrlParams as d } from "@das-fed/utils/common-tools";
+import { getAccessToken as I } from "@das-fed/utils/token-tools";
+import { getTokenFromQuery as S, getProjectInfoFromQuery as y } from "@das-fed/utils/common-info/getInfoFromUrl";
+const N = I, A = () => {
   var r;
   let e = JSON.parse(sessionStorage.getItem("tenantInfo") || "{}");
   return {
@@ -11,7 +11,7 @@ const y = i, T = () => {
     flag: e.flag ?? null,
     tenantId: ((r = e == null ? void 0 : e.tenant) == null ? void 0 : r.id) ?? ""
   };
-}, A = () => {
+}, J = () => {
   let e = JSON.parse(sessionStorage.getItem("userInfo") || "{}");
   const t = u();
   return JSON.stringify(e) === "{}" && t.personalInfo && (e = t.personalInfo), {
@@ -22,7 +22,7 @@ const y = i, T = () => {
     email: e.email ?? "",
     headPicture: e.headPicture ?? ""
   };
-}, J = () => {
+}, O = () => {
   let e = JSON.parse(sessionStorage.getItem("tenantInfo") || "{}");
   return {
     userId: e.id ?? "",
@@ -44,7 +44,7 @@ const y = i, T = () => {
     address: e.address ?? "",
     description: e.description ?? ""
   };
-}, N = () => {
+}, C = () => {
   let e = JSON.parse(sessionStorage.getItem("projectInfo") || "{}");
   const t = u();
   return JSON.stringify(e) === "{}" && t.projectInfo && (e = t.projectInfo), {
@@ -60,7 +60,7 @@ const y = i, T = () => {
     leaf: (e == null ? void 0 : e.leaf) ?? !1,
     optional: (e == null ? void 0 : e.leaf) ?? !0
   };
-}, O = () => {
+}, M = () => {
   let e = JSON.parse(sessionStorage.getItem("project-message") || "{}");
   return {
     id: (e == null ? void 0 : e.id) ?? 0,
@@ -85,7 +85,7 @@ const y = i, T = () => {
     autoTimezone: (e == null ? void 0 : e.autoTimezone) ?? !1,
     currency: (e == null ? void 0 : e.currency) ?? {}
   };
-}, M = () => {
+}, v = () => {
   const e = JSON.parse(sessionStorage.getItem("home-config") || "{}");
   return {
     applicationCode: (e == null ? void 0 : e.applicationCode) ?? "",
@@ -96,20 +96,22 @@ const y = i, T = () => {
     displayPosition: (e == null ? void 0 : e.displayPosition) ?? 1,
     type: (e == null ? void 0 : e.type) ?? null
   };
-}, v = () => {
+}, f = () => {
   const e = JSON.parse(sessionStorage.getItem("personal-config") || "{}");
   return {
     style: (e == null ? void 0 : e.style) ?? "",
     skinStyle: (e == null ? void 0 : e.skinStyle) ?? ""
   };
-}, C = (e, t) => {
-  const r = "permission-btn", a = m(), o = g(location.href, "app") || "", s = t || o || a.currentSubAppCode;
+}, j = (e, t) => {
+  var g;
+  const r = "permission-btn", a = m(), o = d(location.href, "app") || "", s = t || o || a.currentSubAppCode;
   if (!s) return;
-  const n = g(location.href, "menu") || "", l = e || n || a.currentSubApp.currentMenuCode, c = JSON.parse(sessionStorage.getItem(r) || "{}");
+  const n = d(location.href, "menu") || "", l = e || n || a.currentSubApp.currentMenuCode, c = JSON.parse(sessionStorage.getItem(r) || "{}");
   if (!c || JSON.stringify(c) === "{}") return;
-  const p = c[s][l];
-  return p && p.length ? p : c[s]["origin-auth"] ? c[s]["origin-auth"][l] ?? [] : [];
-}, f = (e, t) => C(e, t) ?? [], m = () => {
+  const p = (g = c[s]) == null ? void 0 : g[l];
+  if (p)
+    return p.length ? p : c[s]["origin-auth"] ? c[s]["origin-auth"][l] ?? [] : [];
+}, k = (e, t) => j(e, t) ?? [], m = () => {
   const e = JSON.parse(sessionStorage.getItem("subApps") || "{}");
   return {
     appcategorys: e.appcategorys ?? [],
@@ -118,7 +120,7 @@ const y = i, T = () => {
     subAppList: e.subAppList ?? [],
     menuCollapses: e.menuCollapses ?? []
   };
-}, k = (e, t = !1) => {
+}, D = (e, t = !1) => {
   var a, o;
   const r = m().subAppList;
   if (e)
@@ -131,7 +133,7 @@ const y = i, T = () => {
       s[n.code] = n.menus ?? [];
     }), s;
   }
-}, D = () => {
+}, U = () => {
   const e = JSON.parse(sessionStorage.getItem("tabs") || "{}");
   return {
     currentCode: e.currentCode ?? "",
@@ -139,30 +141,30 @@ const y = i, T = () => {
     tabMap: e.tabMap ?? {},
     preTab: e.preTab ?? {}
   };
-}, U = () => {
+}, E = () => {
   const e = u(), t = sessionStorage.getItem("minioAddress");
   return t || (e.baseURL ? e.baseURL : location.origin);
-}, E = () => ({
+}, z = () => ({
   instanceInfo: JSON.parse(sessionStorage.getItem("instance") || "{}").instanceInfo ?? {}
-}), z = () => localStorage.getItem("fav-icon") || "./logo.svg";
-y() || I();
-var d;
-(d = N()) != null && d.id || S();
+}), x = () => localStorage.getItem("fav-icon") || "./logo.svg";
+N() || S();
+var i;
+(i = C()) != null && i.id || y();
 export {
-  z as getFavIcon,
-  M as getHomeInfo,
-  E as getInstanceInfo,
-  k as getMenus,
-  U as getMinioAddress,
-  C as getPageAuth,
-  f as getPageAuthBtn,
-  v as getPersonalConfig,
-  A as getPersonalInfo,
-  N as getProjectInfo,
-  O as getProjectMessage,
+  x as getFavIcon,
+  v as getHomeInfo,
+  z as getInstanceInfo,
+  D as getMenus,
+  E as getMinioAddress,
+  j as getPageAuth,
+  k as getPageAuthBtn,
+  f as getPersonalConfig,
+  J as getPersonalInfo,
+  C as getProjectInfo,
+  M as getProjectMessage,
   m as getSubApps,
-  D as getTabInfo,
-  J as getTenantInfo,
-  y as getToken,
-  T as getUserInfo
+  U as getTabInfo,
+  O as getTenantInfo,
+  N as getToken,
+  A as getUserInfo
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "6.4.0-dev.70",
+  "version": "6.4.0-dev.72",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "6.4.0-dev.70",
+    "@das-fed/utils": "6.4.0-dev.72",
     "@vue/shared": "^3.4.21",
     "@vueuse/core": "^9.6.0",
     "axios": "^1.6.7",
@@ -21,8 +21,8 @@
     "vue": "^3.4.21"
   },
   "devDependencies": {
-    "@das-fed/cli": "6.4.0-dev.70",
-    "@das-fed/web": "6.4.0-dev.70",
+    "@das-fed/cli": "6.4.0-dev.72",
+    "@das-fed/web": "6.4.0-dev.72",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",