@das-fed/utils 6.4.0-test.5.1 → 6.4.0-test.6

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,8 +13,14 @@ 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 菜单编码

package/common-info/index.js

@@ -1,19 +1,19 @@
-import { getConfig as p } from "@das-fed/utils/config";
+import { getConfig as u } 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 { 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 = () => {
+  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 = () => {
+}, A = () => {
   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 ?? "",
@@ -22,7 +22,7 @@ const S = m, J = () => {
     email: e.email ?? "",
     headPicture: e.headPicture ?? ""
   };
-}, P = () => {
+}, J = () => {
   let e = JSON.parse(sessionStorage.getItem("tenantInfo") || "{}");
   return {
     userId: e.id ?? "",
@@ -33,9 +33,9 @@ const S = m, J = () => {
     flag: e.flag ?? null,
     tenant: e.tenant ?? {}
   };
-}, 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 +49,32 @@ const S = m, J = () => {
     leaf: (e == null ? void 0 : e.leaf) ?? !1,
     optional: (e == null ? void 0 : e.leaf) ?? !0
   };
-}, T = () => {
+}, O = () => {
+  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) ?? {}
+  };
+}, M = () => {
   const e = JSON.parse(sessionStorage.getItem("home-config") || "{}");
   return {
     applicationCode: (e == null ? void 0 : e.applicationCode) ?? "",
@@ -59,14 +84,20 @@ const S = m, J = () => {
     routeUrl: (e == null ? void 0 : e.routeUrl) ?? "",
     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) ?? ""
+  };
+}, N = (e, t) => {
+  const r = "permission-btn", o = m(), a = g(location.href, "app") || "", n = t || a || o.currentSubAppCode;
+  if (!n) return;
+  const s = g(location.href, "menu") || "", l = e || s || o.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 = c[n][l];
+  return p && p.length ? p : c[n]["origin-auth"] ? c[n]["origin-auth"][l] ?? [] : [];
+}, v = (e, t) => N(e, t) ?? [], m = () => {
   const e = JSON.parse(sessionStorage.getItem("subApps") || "{}");
   return {
     appcategorys: e.appcategorys ?? [],
@@ -75,20 +106,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 o, a;
+  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 ? ((o = r == null ? void 0 : r.find((n) => n.code === e)) == null ? void 0 : o.originalMenus) ?? [] : ((a = r == null ? void 0 : r.find((n) => n.code === e)) == null ? void 0 : a.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 n = {};
+    return t ? r == null || r.forEach((s) => {
+      n[s.code] = s.originalMenus ?? [];
+    }) : r == null || r.forEach((s) => {
+      n[s.code] = s.menus ?? [];
+    }), n;
   }
-}, v = () => {
+}, U = () => {
   const e = JSON.parse(sessionStorage.getItem("tabs") || "{}");
   return {
     currentCode: e.currentCode ?? "",
@@ -96,28 +127,30 @@ const S = m, J = () => {
     tabMap: e.tabMap ?? {},
     preTab: e.preTab ?? {}
   };
-}, U = () => {
-  const e = p(), t = sessionStorage.getItem("minioAddress");
+}, k = () => {
+  const e = u(), t = sessionStorage.getItem("minioAddress");
   return t || (e.baseURL ? e.baseURL : location.origin);
-}, k = () => ({
+}, E = () => ({
   instanceInfo: JSON.parse(sessionStorage.getItem("instance") || "{}").instanceInfo ?? {}
-}), E = () => localStorage.getItem("fav-icon") || "./logo.svg";
-S() || f();
-var i;
-(i = b()) != null && i.id || d();
+}), z = () => localStorage.getItem("fav-icon") || "./logo.svg";
+y() || I();
+var d;
+(d = C()) != null && d.id || S();
 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
+  z as getFavIcon,
+  M as getHomeInfo,
+  E as getInstanceInfo,
+  D as getMenus,
+  k as getMinioAddress,
+  N as getPageAuth,
+  v as getPageAuthBtn,
+  f as getPersonalConfig,
+  A as getPersonalInfo,
+  C as getProjectInfo,
+  O as getProjectMessage,
+  m as getSubApps,
+  U as getTabInfo,
+  J as getTenantInfo,
+  y as getToken,
+  T as getUserInfo
 };

package/common-info/type.d.ts

@@ -46,14 +46,24 @@ export interface TenantInfo {
 }
 
 export interface HomeInfo {
+  /** 应用code */
   applicationCode: string
+  /** 应用path */
   applicationPath: string
+  /** 是否启用 */
   enable: boolean
   originalCode: string
   routeUrl: string
   type: number | null
 }
 
+export interface PersonalConfigInfo {
+  /** 侧边栏菜单风格（1:弹出式；2:内嵌式 ）*/
+  style: 1 | 2
+  /** 皮肤风格 （default:默认皮肤；kjl:科技蓝；cjb:纯净白；ssl:深邃蓝）*/
+  skinStyle: 'default' | 'kjl' | 'cjb' | 'ssl'
+}
+
 export interface ProjectInfo {
   /** 项目id */
   id: string
@@ -61,13 +71,13 @@ export interface ProjectInfo {
   code: string
   /** 项目名称 */
   name: string
-  /** 项目类型： 1: 集团、 2:公司、3: 区域、4: 分公司、 5: 子公司、6: 管理中心、 7: 项目、8: 部门、 9: 组 */
+  /** 项目类型: 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: 组  */
+  /** 父级项目类型:1: 集团、 2:公司、3: 区域、4: 分公司、 5: 子公司、6: 管理中心、 7: 项目、8: 部门、 9: 组  */
   parentType?: number
   /** 租户id */
   tenantId?: string
@@ -79,6 +89,51 @@ export interface ProjectInfo {
   optional?: boolean
 }
 
+export interface ProjectMessage {
+  /** 主键id */
+  id: number | string
+  /** 项目名称 */
+  projectName: string
+  /** 省级（省份、直辖市、自治区）编码 */
+  provinceCode: string
+  /** 地级（城市）编码 */
+  cityCode: string
+  /** 县级（区县）编码 */
+  areaCode: string
+  /** 详细位置 */
+  address: string
+  /** 项目简介 */
+  projectDesc: string
+  /** 项目图片路径 */
+  logoPath: string
+  /** 项目类型 */
+  projectType: string
+  /** 项目类型code */
+  projectTypeCode: string
+  /** 经度 */
+  longitude: string
+  /** 纬度 */
+  latitude: string
+  /** 项目开始时间 */
+  projectStartDate: string
+  /** 项目有效期 */
+  projectExpiryDate: string
+  /** 项目编码 */
+  projectCode: string
+  /** 地图配置是否开启 */
+  mapConfiguration: boolean
+  /** 地级（城市）名称 */
+  cityName: string
+  /** 地级（城市）名称拼音 */
+  cityNamePinyin: string
+  /** 时区ID */
+  timezone: string
+  /** 是否自动设定时区 */
+  autoTimezone: boolean
+  /** 货币信息(currencyCode:ISO 4217货币编码（例：CNY）;currencyUnit:货币单位，例：元（中文），CNY（英文）;currencySymbol:货币符号，例：¥) */
+  currency: Record<'currencyCode' | 'currencyUnit' | 'currencySymbol', string>
+}
+
 export interface SubAppsInfo {
   /** 所有应用信息 */
   appcategorys?: any[]

package/dom-check-in/index.js

@@ -1,7 +1,7 @@
 const d = (e) => {
   const t = window.event;
-  let i = Number(t.clientX), n = Number(t.clientY), l = Number(e.getBoundingClientRect().left), u = Number(l + e.clientWidth), r = Number(e.getBoundingClientRect().top), c = Number(r + e.clientHeight);
-  return i > l && i < u && n > r && n < c;
+  let i = Number(t.clientX), n = Number(t.clientY), l = Number(e.getBoundingClientRect().left), r = Number(l + e.clientWidth), c = Number(e.getBoundingClientRect().top), u = Number(c + e.clientHeight);
+  return i > l && i < r && n > c && n < u;
 };
 export {
   d as domCheckIn

package/esm-map.json

@@ -136,5 +136,7 @@
   "useKonva": "/dimple-canvas/use-dimple-canvas/core/konva/index",
   "setShowWatermark": "/common-tools/platform-tools/index",
   "extractFilename": "/common-tools/extract-file-name/index",
-  "setBrowseTitle": "/common-tools/update-browser-title/index"
+  "setBrowseTitle": "/common-tools/update-browser-title/index",
+  "getPersonalConfig": "/common-info/index",
+  "getProjectMessage": "/common-info/index"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "6.4.0-test.5.1",
+  "version": "6.4.0-test.6",
   "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.5.1",
+    "@das-fed/utils": "6.4.0-test.6",
     "@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.5.1",
-    "@das-fed/web": "6.4.0-test.5.1",
+    "@das-fed/cli": "6.4.0-test.6",
+    "@das-fed/web": "6.4.0-test.6",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",
     "@types/qs": "^6.9.15",