@das-fed/utils 6.4.0-test.3.1 → 6.4.0-test.3.2

package/common-info/index.js

@@ -1,8 +1,8 @@
-import { getConfig as i } from "@das-fed/utils/config";
-import { getUrlParams as p } from "@das-fed/utils/common-tools";
-import { getAccessToken as I } from "@das-fed/utils/token-tools";
-import { getTokenFromQuery as m, getProjectInfoFromQuery as d } from "@das-fed/utils/common-info/getInfoFromUrl";
-const S = I, O = () => {
+import { getConfig as p } from "@das-fed/utils/config";
+import { getUrlParams as g } from "@das-fed/utils/common-tools";
+import { getAccessToken as m } from "@das-fed/utils/token-tools";
+import { getTokenFromQuery as f, getProjectInfoFromQuery as d } from "@das-fed/utils/common-info/getInfoFromUrl";
+const S = m, J = () => {
   var n;
   let e = JSON.parse(sessionStorage.getItem("tenantInfo") || "{}");
   return {
@@ -11,9 +11,9 @@ const S = I, O = () => {
     flag: e.flag ?? null,
     tenantId: ((n = e == null ? void 0 : e.tenant) == null ? void 0 : n.id) ?? ""
   };
-}, P = () => {
+}, O = () => {
   let e = JSON.parse(sessionStorage.getItem("userInfo") || "{}");
-  const t = i();
+  const t = p();
   return JSON.stringify(e) === "{}" && t.personalInfo && (e = t.personalInfo), {
     id: e.id ?? "",
     name: e.name ?? "",
@@ -22,7 +22,7 @@ const S = I, O = () => {
     email: e.email ?? "",
     headPicture: e.headPicture ?? ""
   };
-}, y = () => {
+}, P = () => {
   let e = JSON.parse(sessionStorage.getItem("tenantInfo") || "{}");
   return {
     userId: e.id ?? "",
@@ -35,14 +35,21 @@ const S = I, O = () => {
   };
 }, b = () => {
   let e = JSON.parse(sessionStorage.getItem("projectInfo") || "{}");
-  const t = i();
+  const t = p();
   return JSON.stringify(e) === "{}" && t.projectInfo && (e = t.projectInfo), {
     id: (e == null ? void 0 : e.id) ?? 0,
-    parentId: (e == null ? void 0 : e.parentId) ?? "",
+    code: (e == null ? void 0 : e.code) ?? 0,
     name: (e == null ? void 0 : e.name) ?? "",
-    tenantId: (e == null ? void 0 : e.tenant) ?? ""
+    type: (e == null ? void 0 : e.type) ?? null,
+    parentId: (e == null ? void 0 : e.parentId) ?? "",
+    parentName: (e == null ? void 0 : e.parentName) ?? "",
+    parentType: (e == null ? void 0 : e.parentType) ?? null,
+    tenantId: (e == null ? void 0 : e.tenant) ?? "",
+    isParent: (e == null ? void 0 : e.isParent) ?? !1,
+    leaf: (e == null ? void 0 : e.leaf) ?? !1,
+    optional: (e == null ? void 0 : e.leaf) ?? !0
   };
-}, M = () => {
+}, T = () => {
   const e = JSON.parse(sessionStorage.getItem("home-config") || "{}");
   return {
     applicationCode: (e == null ? void 0 : e.applicationCode) ?? "",
@@ -53,13 +60,13 @@ const S = I, O = () => {
     type: (e == null ? void 0 : e.type) ?? null
   };
 }, h = (e, t) => {
-  const n = "permission-btn", s = f(), a = p(location.href, "app") || "", o = t || a || s.currentSubAppCode;
-  if (!o) return;
-  const r = p(location.href, "menu") || "", g = e || r || s.currentSubApp.currentMenuCode, c = JSON.parse(sessionStorage.getItem(n) || "{}");
+  const n = "permission-btn", s = I(), a = g(location.href, "app") || "", r = t || a || s.currentSubAppCode;
+  if (!r) return;
+  const o = g(location.href, "menu") || "", l = e || o || s.currentSubApp.currentMenuCode, c = JSON.parse(sessionStorage.getItem(n) || "{}");
   if (!c || JSON.stringify(c) === "{}") return;
-  const u = c[o][g];
-  return u && u.length ? u : c[o]["origin-auth"] ? c[o]["origin-auth"][g] ?? [] : [];
-}, T = (e, t) => h(e, t) ?? [], f = () => {
+  const u = c[r][l];
+  return u && u.length ? u : c[r]["origin-auth"] ? c[r]["origin-auth"][l] ?? [] : [];
+}, M = (e, t) => h(e, t) ?? [], I = () => {
   const e = JSON.parse(sessionStorage.getItem("subApps") || "{}");
   return {
     appcategorys: e.appcategorys ?? [],
@@ -70,16 +77,16 @@ const S = I, O = () => {
   };
 }, j = (e, t = !1) => {
   var s, a;
-  const n = f().subAppList;
+  const n = I().subAppList;
   if (e)
-    return t ? ((s = n == null ? void 0 : n.find((o) => o.code === e)) == null ? void 0 : s.originalMenus) ?? [] : ((a = n == null ? void 0 : n.find((o) => o.code === e)) == null ? void 0 : a.menus) ?? [];
+    return t ? ((s = n == null ? void 0 : n.find((r) => r.code === e)) == null ? void 0 : s.originalMenus) ?? [] : ((a = n == null ? void 0 : n.find((r) => r.code === e)) == null ? void 0 : a.menus) ?? [];
   {
-    let o = {};
-    return t ? n == null || n.forEach((r) => {
-      o[r.code] = r.originalMenus ?? [];
-    }) : n == null || n.forEach((r) => {
-      o[r.code] = r.menus ?? [];
-    }), o;
+    let r = {};
+    return t ? n == null || n.forEach((o) => {
+      r[o.code] = o.originalMenus ?? [];
+    }) : n == null || n.forEach((o) => {
+      r[o.code] = o.menus ?? [];
+    }), r;
   }
 }, v = () => {
   const e = JSON.parse(sessionStorage.getItem("tabs") || "{}");
@@ -90,27 +97,27 @@ const S = I, O = () => {
     preTab: e.preTab ?? {}
   };
 }, U = () => {
-  const e = i(), t = sessionStorage.getItem("minioAddress");
+  const e = p(), t = sessionStorage.getItem("minioAddress");
   return t || (e.baseURL ? e.baseURL : location.origin);
 }, k = () => ({
   instanceInfo: JSON.parse(sessionStorage.getItem("instance") || "{}").instanceInfo ?? {}
 }), E = () => localStorage.getItem("fav-icon") || "./logo.svg";
-S() || m();
-var l;
-(l = b()) != null && l.id || d();
+S() || f();
+var i;
+(i = b()) != null && i.id || d();
 export {
   E as getFavIcon,
-  M as getHomeInfo,
+  T as getHomeInfo,
   k as getInstanceInfo,
   j as getMenus,
   U as getMinioAddress,
   h as getPageAuth,
-  T as getPageAuthBtn,
-  P as getPersonalInfo,
+  M as getPageAuthBtn,
+  O as getPersonalInfo,
   b as getProjectInfo,
-  f as getSubApps,
+  I as getSubApps,
   v as getTabInfo,
-  y as getTenantInfo,
+  P as getTenantInfo,
   S as getToken,
-  O as getUserInfo
+  J as getUserInfo
 };

package/common-info/type.d.ts

@@ -56,13 +56,27 @@ export interface HomeInfo {
 
 export interface ProjectInfo {
   /** 项目id */
-  id: string | number
-  /** 父级id */
-  parentId?: string
+  id: string
+  /** 项目编码 */
+  code: string
   /** 项目名称 */
   name: string
+  /** 项目类型： 1: 集团、 2:公司、3: 区域、4: 分公司、 5: 子公司、6: 管理中心、 7: 项目、8: 部门、 9: 组 */
+  type: string
+  /** 父级id */
+  parentId?: string
+  /** 父级名称 */
+  parentName?: string
+  /** 父级项目类型：1: 集团、 2:公司、3: 区域、4: 分公司、 5: 子公司、6: 管理中心、 7: 项目、8: 部门、 9: 组  */
+  parentType?: number
   /** 租户id */
   tenantId?: string
+  /** 是否父级节点 */
+  isParent?: boolean
+  /** 是否叶子节点 */
+  leaf?: boolean
+  /** 是否可用 */
+  optional?: boolean
 }
 
 export interface SubAppsInfo {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "6.4.0-test.3.1",
+  "version": "6.4.0-test.3.2",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/utils": "6.4.0-test.3.1",
+    "@das-fed/utils": "6.4.0-test.3.2",
     "@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-test.3.1",
-    "@das-fed/web": "6.4.0-test.3.1",
+    "@das-fed/cli": "6.4.0-test.3.2",
+    "@das-fed/web": "6.4.0-test.3.2",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",