@das-fed/utils 6.4.0-hot.28 → 6.4.0-hot.29

package/api-services/modules/tool/index.js

@@ -3087,9 +3087,11 @@ const Ut = Ar(), hn = Ut.sso ?? !0, Ns = Ut.i18n ?? !0, mn = Ut.noRedireLogin ??
           }
         };
       })), i.code) {
-        if (n = i.code, Ns) {
-          const g = (i == null ? void 0 : i.status) ?? "";
-          r = !(i != null && i.data) || !i.data.length ? W(g) : W(g, ...i.data);
+        n = i.code;
+        const g = (e == null ? void 0 : e.i18n) ?? !0;
+        if (Ns && g) {
+          const y = (i == null ? void 0 : i.status) ?? "";
+          r = !(i != null && i.data) || !i.data.length ? W(y) : W(y, ...i.data);
         } else
           r = (i == null ? void 0 : i.msg) ?? "";
         o = i;
@@ -3122,7 +3124,7 @@ const Ut = Ar(), hn = Ut.sso ?? !0, Ns = Ut.i18n ?? !0, mn = Ut.noRedireLogin ??
       const { instanceInfo: l } = Cn();
       l != null && l.instanceId && (s.instance = l.instanceId);
     }
-    return r.params = s, r.headers.Timezone = Ot.tz.guess(), r;
+    return r.params = s, r.headers.Timezone = Ot.tz.guess(), r.headers["X-Origin"] = location.origin, r;
   });
 }, $s = "v2", Ws = Is(`/api/tool/${$s}`);
 export {

package/api-services/src/create-service/index.js

@@ -3087,9 +3087,11 @@ const Ut = Ar(), hn = Ut.sso ?? !0, Ns = Ut.i18n ?? !0, mn = Ut.noRedireLogin ??
           }
         };
       })), i.code) {
-        if (n = i.code, Ns) {
-          const g = (i == null ? void 0 : i.status) ?? "";
-          r = !(i != null && i.data) || !i.data.length ? W(g) : W(g, ...i.data);
+        n = i.code;
+        const g = (e == null ? void 0 : e.i18n) ?? !0;
+        if (Ns && g) {
+          const y = (i == null ? void 0 : i.status) ?? "";
+          r = !(i != null && i.data) || !i.data.length ? W(y) : W(y, ...i.data);
         } else
           r = (i == null ? void 0 : i.msg) ?? "";
         o = i;
@@ -3122,7 +3124,7 @@ const Ut = Ar(), hn = Ut.sso ?? !0, Ns = Ut.i18n ?? !0, mn = Ut.noRedireLogin ??
       const { instanceInfo: l } = Fn();
       l != null && l.instanceId && (s.instance = l.instanceId);
     }
-    return r.params = s, r.headers.Timezone = Ot.tz.guess(), (e == null ? void 0 : e(r)) || r;
+    return r.params = s, r.headers.Timezone = Ot.tz.guess(), r.headers["X-Origin"] = location.origin, (e == null ? void 0 : e(r)) || r;
   });
 };
 export {

package/common-info/index.d.ts

@@ -1,4 +1,4 @@
-import { UserInfo, PersonalInfo, TenantInfo, HomeInfo, ProjectInfo, SubAppsInfo, TabInfo, permissionBtnInfo } from './type';
+import { UserInfo, PersonalInfo, TenantInfo, HomeInfo, PersonalConfigInfo, ProjectInfo, ProjectMessage, SubAppsInfo, TabInfo, permissionBtnInfo } from './type';
 
 /** 获取token */
 export declare const getToken: any;
@@ -13,15 +13,21 @@ export declare const getTenantInfo: () => TenantInfo;
  * @returns 项目信息
  */
 export declare const getProjectInfo: () => ProjectInfo;
+/**
+ * 获取项目信息
+ * @returns 项目信息
+ */
+export declare const getProjectMessage: () => ProjectMessage;
 /** 获取首页信息 */
 export declare const getHomeInfo: () => HomeInfo;
+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,41 +1,52 @@
-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;
+import { getConfig as u } from "@das-fed/utils/config";
+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 {
     id: e.id ?? "",
     name: e.userName ?? "",
     flag: e.flag ?? null,
-    tenantId: ((n = e == null ? void 0 : e.tenant) == null ? void 0 : n.id) ?? ""
+    tenantId: ((r = e == null ? void 0 : e.tenant) == null ? void 0 : r.id) ?? ""
   };
-}, O = () => {
+}, J = () => {
   let e = JSON.parse(sessionStorage.getItem("userInfo") || "{}");
-  const t = p();
+  const t = u();
   return JSON.stringify(e) === "{}" && t.personalInfo && (e = t.personalInfo), {
     id: e.id ?? "",
     name: e.name ?? "",
-    phone: e.phone ?? "",
     userName: e.userName ?? "",
+    phone: e.phone ?? "",
     email: e.email ?? "",
     headPicture: e.headPicture ?? ""
   };
-}, P = () => {
+}, O = () => {
   let e = JSON.parse(sessionStorage.getItem("tenantInfo") || "{}");
   return {
     userId: e.id ?? "",
     userName: e.userName ?? "",
     name: e.name ?? "",
     areaCode: e.areaCode ?? "",
+    region: e.region ?? "",
     phone: e.phone ?? "",
+    email: e.email ?? "",
     flag: e.flag ?? null,
-    tenant: e.tenant ?? {}
+    tenant: e.tenant ?? {},
+    headPicture: e.headPicture ?? "",
+    nickName: e.nickName ?? "",
+    gender: e.gender ?? null,
+    status: e.status ?? null,
+    statusName: e.statusName ?? null,
+    tags: e.tags ?? [],
+    type: e.type ?? null,
+    address: e.address ?? "",
+    description: e.description ?? ""
   };
-}, b = () => {
+}, C = () => {
   let e = JSON.parse(sessionStorage.getItem("projectInfo") || "{}");
-  const t = p();
+  const t = u();
   return JSON.stringify(e) === "{}" && t.projectInfo && (e = t.projectInfo), {
     id: (e == null ? void 0 : e.id) ?? 0,
     code: (e == null ? void 0 : e.code) ?? 0,
@@ -49,7 +60,32 @@ const S = m, J = () => {
     leaf: (e == null ? void 0 : e.leaf) ?? !1,
     optional: (e == null ? void 0 : e.leaf) ?? !0
   };
-}, T = () => {
+}, M = () => {
+  let e = JSON.parse(sessionStorage.getItem("project-message") || "{}");
+  return {
+    id: (e == null ? void 0 : e.id) ?? 0,
+    projectName: (e == null ? void 0 : e.projectName) ?? "",
+    provinceCode: (e == null ? void 0 : e.provinceCode) ?? "",
+    cityCode: (e == null ? void 0 : e.cityCode) ?? "",
+    areaCode: (e == null ? void 0 : e.areaCode) ?? "",
+    address: (e == null ? void 0 : e.address) ?? "",
+    projectDesc: (e == null ? void 0 : e.projectDesc) ?? "",
+    logoPath: (e == null ? void 0 : e.logoPath) ?? "",
+    projectType: (e == null ? void 0 : e.projectType) ?? "",
+    projectTypeCode: (e == null ? void 0 : e.projectTypeCode) ?? "",
+    longitude: (e == null ? void 0 : e.longitude) ?? "",
+    latitude: (e == null ? void 0 : e.latitude) ?? "",
+    projectStartDate: (e == null ? void 0 : e.projectStartDate) ?? "",
+    projectExpiryDate: (e == null ? void 0 : e.projectExpiryDate) ?? "",
+    projectCode: (e == null ? void 0 : e.projectCode) ?? "",
+    mapConfiguration: (e == null ? void 0 : e.mapConfiguration) ?? !1,
+    cityName: (e == null ? void 0 : e.cityName) ?? "",
+    cityNamePinyin: (e == null ? void 0 : e.cityNamePinyin) ?? "",
+    timezone: (e == null ? void 0 : e.timezone) ?? "",
+    autoTimezone: (e == null ? void 0 : e.autoTimezone) ?? !1,
+    currency: (e == null ? void 0 : e.currency) ?? {}
+  };
+}, v = () => {
   const e = JSON.parse(sessionStorage.getItem("home-config") || "{}");
   return {
     applicationCode: (e == null ? void 0 : e.applicationCode) ?? "",
@@ -57,16 +93,25 @@ const S = m, J = () => {
     enable: (e == null ? void 0 : e.enable) ?? !1,
     originalCode: (e == null ? void 0 : e.originalCode) ?? "",
     routeUrl: (e == null ? void 0 : e.routeUrl) ?? "",
+    displayPosition: (e == null ? void 0 : e.displayPosition) ?? 1,
     type: (e == null ? void 0 : e.type) ?? null
   };
-}, h = (e, t) => {
-  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) || "{}");
+}, f = () => {
+  const e = JSON.parse(sessionStorage.getItem("personal-config") || "{}");
+  return {
+    style: (e == null ? void 0 : e.style) ?? "",
+    skinStyle: (e == null ? void 0 : e.skinStyle) ?? ""
+  };
+}, 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 = d(location.href, "menu") || "", l = e || n || a.currentSubApp.currentMenuCode, c = JSON.parse(sessionStorage.getItem(r) || "{}");
   if (!c || JSON.stringify(c) === "{}") return;
-  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 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 ?? [],
@@ -75,20 +120,20 @@ const S = m, J = () => {
     subAppList: e.subAppList ?? [],
     menuCollapses: e.menuCollapses ?? []
   };
-}, j = (e, t = !1) => {
-  var s, a;
-  const n = I().subAppList;
+}, D = (e, t = !1) => {
+  var a, o;
+  const r = m().subAppList;
   if (e)
-    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) ?? [];
+    return t ? ((a = r == null ? void 0 : r.find((s) => s.code === e)) == null ? void 0 : a.originalMenus) ?? [] : ((o = r == null ? void 0 : r.find((s) => s.code === e)) == null ? void 0 : o.menus) ?? [];
   {
-    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;
+    let s = {};
+    return t ? r == null || r.forEach((n) => {
+      s[n.code] = n.originalMenus ?? [];
+    }) : r == null || r.forEach((n) => {
+      s[n.code] = n.menus ?? [];
+    }), s;
   }
-}, v = () => {
+}, U = () => {
   const e = JSON.parse(sessionStorage.getItem("tabs") || "{}");
   return {
     currentCode: e.currentCode ?? "",
@@ -96,28 +141,30 @@ const S = m, J = () => {
     tabMap: e.tabMap ?? {},
     preTab: e.preTab ?? {}
   };
-}, U = () => {
-  const e = p(), t = sessionStorage.getItem("minioAddress");
+}, E = () => {
+  const e = u(), t = sessionStorage.getItem("minioAddress");
   return t || (e.baseURL ? e.baseURL : location.origin);
-}, k = () => ({
+}, z = () => ({
   instanceInfo: JSON.parse(sessionStorage.getItem("instance") || "{}").instanceInfo ?? {}
-}), E = () => localStorage.getItem("fav-icon") || "./logo.svg";
-S() || f();
+}), x = () => localStorage.getItem("fav-icon") || "./logo.svg";
+N() || S();
 var i;
-(i = b()) != null && i.id || d();
+(i = C()) != null && i.id || y();
 export {
-  E as getFavIcon,
-  T as getHomeInfo,
-  k as getInstanceInfo,
-  j as getMenus,
-  U as getMinioAddress,
-  h as getPageAuth,
-  M as getPageAuthBtn,
-  O as getPersonalInfo,
-  b as getProjectInfo,
-  I as getSubApps,
-  v as getTabInfo,
-  P as getTenantInfo,
-  S as getToken,
-  J as getUserInfo
+  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,
+  U as getTabInfo,
+  O as getTenantInfo,
+  N as getToken,
+  A as getUserInfo
 };

package/common-info/set-personal-info/index.js

@@ -1697,20 +1697,24 @@ E.getAdapter = Ge.getAdapter;
 E.HttpStatusCode = ae;
 E.default = E;
 const Ln = async (e) => {
-  var r;
+  var n;
   const t = {
     personalInfo: "/api/personal-center/personal-server/v1/info"
-  }, n = await E.create().get(t.personalInfo, {
-    baseURL: Ye().baseURL,
-    params: {
-      project: (r = Ze()) == null ? void 0 : r.id,
-      timestamp: (/* @__PURE__ */ new Date()).getTime()
-    },
-    headers: {
-      Authorization: `Bearer ${e}`
-    }
-  });
-  n != null && n.data && sessionStorage.setItem("userInfo", JSON.stringify(n.data));
+  };
+  try {
+    const r = await E.create().get(t.personalInfo, {
+      baseURL: Ye().baseURL,
+      params: {
+        project: (n = Ze()) == null ? void 0 : n.id,
+        timestamp: (/* @__PURE__ */ new Date()).getTime()
+      },
+      headers: {
+        Authorization: `Bearer ${e}`
+      }
+    });
+    r != null && r.data && sessionStorage.setItem("userInfo", JSON.stringify(r.data));
+  } catch {
+  }
 };
 export {
   Ln as setPersonalInfo