@das-fed/utils 1.0.7 → 1.0.9

package/api-services/src/sso.js

@@ -1457,13 +1457,13 @@ const Te = (e) => new URL(location.href).searchParams.get(e), ue = {
   // 重定向到登录页
   token: "/api/justauth/oauth-server/v1/visitor/oauth/token"
   // 通过code获取token
-}, x = We(!1), { baseURL: En, mainAppName: Sn, microAppName: bn } = ne(), te = Sn || window.__IN_MICRO_APP__ ? `${location.origin}/` : location.origin + location.pathname, H = {
+}, x = We(!1), { baseURL: En, mainAppName: Nn, microAppName: Sn } = ne(), te = `${location.origin}/`, H = {
   response_type: "code",
   scope: "sever",
   client_id: "sys",
   client_secret: Xe("das123"),
   state: +/* @__PURE__ */ new Date()
-}, gn = async (e, t, n, r) => {
+}, bn = async (e, t, n, r) => {
   const s = Qe(location.href, "kingdee_token") || "";
   let o = {};
   const i = {
@@ -1515,10 +1515,10 @@ const Te = (e) => new URL(location.href).searchParams.get(e), ue = {
   const t = fe(), { accessTokenExpiredAt: n, redirectUri: r } = F().getData(), s = Te("code") || "", o = !!Te("keep_login");
   x.value = !0;
   const i = JSON.parse(sessionStorage.getItem("noLogin-page")) || [];
-  if ((!t || n === 0) && bn !== "oauth" && !i.includes(location.pathname) && !s)
+  if ((!t || n === 0) && Sn !== "oauth" && !i.includes(location.pathname) && !s)
     return le({ ...H, redirect_uri: te });
   if (n > 0 && +/* @__PURE__ */ new Date() + 60 * 1e3 > n)
-    return Rn(H);
+    return gn(H);
   if (t)
     return t;
   if (!s) {
@@ -1526,7 +1526,7 @@ const Te = (e) => new URL(location.href).searchParams.get(e), ue = {
     return;
   }
   try {
-    const f = await gn(s, H, r, o);
+    const f = await bn(s, H, r, o);
     return x.value = !1, f;
   } catch {
     x.value = !1;
@@ -1536,7 +1536,7 @@ const Te = (e) => new URL(location.href).searchParams.get(e), ue = {
   e.logout = "true", n && (e.locale = "locale");
   const r = Object.keys(e).filter((o) => o !== "client_secret").map((o) => `${o}=${e[o]}`).join("&"), s = `${t}${ue.oauth}?${r}`;
   Ye(), sessionStorage.clear(), F().save({ redirectUri: e.redirect_uri }), window.__isAutoCloseApp = !1, location.replace(s);
-}, Rn = async (e) => {
+}, gn = async (e) => {
   const { baseURL: t } = ne(), { refreshToken: n, redirectUri: r } = F().getData();
   e.redirect_uri = r;
   try {
@@ -1583,7 +1583,7 @@ const Te = (e) => new URL(location.href).searchParams.get(e), ue = {
 export {
   Te as getQuery,
   Pn as getToken,
-  gn as getTokenFromCode,
+  bn as getTokenFromCode,
   H as getTokenParams,
   le as login,
   te as real_uri,

package/common-info/index.d.ts

@@ -1,4 +1,4 @@
-import type { UserInfo, PersonalInfo, TenantInfo, ProjectInfo, SubAppsInfo, TabInfo, permissionBtnInfo } from './type';
+import type { UserInfo, PersonalInfo, TenantInfo, ProjectInfo, SubAppsInfo, permissionBtnInfo } from './type';
 /** 获取token */
 export declare const getToken: () => string;
 /** 获取token详情 */
@@ -27,7 +27,7 @@ export declare const getPageAuth: (menuCode?: string, applicationCode?: string)
  */
 export declare const getPageAuthBtn: (menuCode?: string, applicationCode?: string) => permissionBtnInfo;
 /**
- * 获取应用信息（独立打开子应用不可用）
+ * 获取应用信息
  * @returns 应用信息
  */
 export declare const getSubApps: () => SubAppsInfo;
@@ -36,7 +36,7 @@ export declare const getSubApps: () => SubAppsInfo;
  * @param appCode 应用编码
  */
 export declare const getMenus: (appCode?: string) => any;
-/** 获取tabs标签页信息 */
-export declare const getTabInfo: () => TabInfo;
+/** 获取tabs标签页 */
+export declare const getTabInfo: () => any;
 /** 获取minio地址 */
 export declare const getMinioAddress: () => any;

package/common-info/index.js

@@ -1,17 +1,17 @@
 import { tokenStorage as l } from "@das-fed/utils/api-services/src/sso";
-import { getConfig as f } from "@das-fed/utils/config";
-import { getUrlParams as d } from "@das-fed/utils/common-tools";
+import { getConfig as u } from "@das-fed/utils/config";
+import { getUrlParams as I } from "@das-fed/utils/common-tools";
 import { getUrlToken as m, getProjectInfoFromQuery as S } from "@das-fed/utils/common-info/setInfoFromUrl";
 /*! js-cookie v3.0.5 | MIT */
-function g(e) {
+function f(e) {
   for (var n = 1; n < arguments.length; n++) {
-    var r = arguments[n];
-    for (var s in r)
-      e[s] = r[s];
+    var s = arguments[n];
+    for (var c in s)
+      e[c] = s[c];
   }
   return e;
 }
-var b = {
+var h = {
   read: function(e) {
     return e[0] === '"' && (e = e.slice(1, -1)), e.replace(/(%[\dA-F]{2})+/gi, decodeURIComponent);
   },
@@ -22,48 +22,48 @@ var b = {
     );
   }
 };
-function I(e, n) {
-  function r(o, a, t) {
+function d(e, n) {
+  function s(r, i, t) {
     if (!(typeof document > "u")) {
-      t = g({}, n, t), typeof t.expires == "number" && (t.expires = new Date(Date.now() + t.expires * 864e5)), t.expires && (t.expires = t.expires.toUTCString()), o = encodeURIComponent(o).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent).replace(/[()]/g, escape);
-      var i = "";
-      for (var c in t)
-        t[c] && (i += "; " + c, t[c] !== !0 && (i += "=" + t[c].split(";")[0]));
-      return document.cookie = o + "=" + e.write(a, o) + i;
+      t = f({}, n, t), typeof t.expires == "number" && (t.expires = new Date(Date.now() + t.expires * 864e5)), t.expires && (t.expires = t.expires.toUTCString()), r = encodeURIComponent(r).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent).replace(/[()]/g, escape);
+      var a = "";
+      for (var o in t)
+        t[o] && (a += "; " + o, t[o] !== !0 && (a += "=" + t[o].split(";")[0]));
+      return document.cookie = r + "=" + e.write(i, r) + a;
     }
   }
-  function s(o) {
-    if (!(typeof document > "u" || arguments.length && !o)) {
-      for (var a = document.cookie ? document.cookie.split("; ") : [], t = {}, i = 0; i < a.length; i++) {
-        var c = a[i].split("="), p = c.slice(1).join("=");
+  function c(r) {
+    if (!(typeof document > "u" || arguments.length && !r)) {
+      for (var i = document.cookie ? document.cookie.split("; ") : [], t = {}, a = 0; a < i.length; a++) {
+        var o = i[a].split("="), p = o.slice(1).join("=");
         try {
-          var u = decodeURIComponent(c[0]);
-          if (t[u] = e.read(p, u), o === u)
+          var g = decodeURIComponent(o[0]);
+          if (t[g] = e.read(p, g), r === g)
             break;
         } catch {
         }
       }
-      return o ? t[o] : t;
+      return r ? t[r] : t;
     }
   }
   return Object.create(
     {
-      set: r,
-      get: s,
-      remove: function(o, a) {
-        r(
-          o,
+      set: s,
+      get: c,
+      remove: function(r, i) {
+        s(
+          r,
           "",
-          g({}, a, {
+          f({}, i, {
             expires: -1
           })
         );
       },
-      withAttributes: function(o) {
-        return I(this.converter, g({}, this.attributes, o));
+      withAttributes: function(r) {
+        return d(this.converter, f({}, this.attributes, r));
       },
-      withConverter: function(o) {
-        return I(g({}, this.converter, o), this.attributes);
+      withConverter: function(r) {
+        return d(f({}, this.converter, r), this.attributes);
       }
     },
     {
@@ -72,20 +72,20 @@ function I(e, n) {
     }
   );
 }
-var A = I(b, { path: "/" });
-const h = () => A.get("accessToken") ?? "", w = () => {
-  var s;
-  let e = (s = l().getData()) == null ? void 0 : s.info;
-  const n = f();
+var A = d(h, { path: "/" });
+const b = () => A.get("accessToken") ?? "", y = () => {
+  var c;
+  let e = (c = l().getData()) == null ? void 0 : c.info;
+  const n = u();
   return JSON.stringify(e) === "{}" && n.userInfo && (e = n.userInfo), {
     id: e.sub ?? "",
     name: e.name ?? "",
     flag: e.flag,
     tenantId: (e == null ? void 0 : e.tenant) ?? (e == null ? void 0 : e.tenantId) ?? ""
   };
-}, J = () => {
+}, T = () => {
   let e = JSON.parse(sessionStorage.getItem("userInfo") || "{}");
-  const n = f();
+  const n = u();
   return JSON.stringify(e) === "{}" && n.personalInfo && (e = n.personalInfo), {
     id: e.id ?? "",
     name: e.name ?? "",
@@ -94,7 +94,7 @@ const h = () => A.get("accessToken") ?? "", w = () => {
     email: e.email ?? "",
     headPicture: e.headPicture ?? ""
   };
-}, j = () => {
+}, k = () => {
   let e = JSON.parse(sessionStorage.getItem("tenantInfo") || "{}");
   return {
     userId: e.id ?? "",
@@ -105,74 +105,62 @@ const h = () => A.get("accessToken") ?? "", w = () => {
     flag: e.flag ?? null,
     tenant: e.tenant ?? {}
   };
-}, R = () => {
+}, x = () => {
   let e = JSON.parse(sessionStorage.getItem("projectInfo") || "{}");
-  const n = f();
+  const n = u();
   return JSON.stringify(e) === "{}" && n.projectInfo && (e = n.projectInfo), {
     id: (e == null ? void 0 : e.id) ?? "",
     parentId: (e == null ? void 0 : e.parentId) ?? "",
     name: (e == null ? void 0 : e.name) ?? "",
     tenantId: (e == null ? void 0 : e.tenant) ?? ""
   };
-}, _ = (e, n) => {
-  const r = "permission-btn", s = f(), o = v(), a = d(location.href, "app") || "", t = n || a || (window.__IN_MICRO_APP__ ? o.currentSubAppCode : s.title);
-  if (!t)
+}, C = (e, n) => {
+  const s = "permission-btn";
+  u();
+  const c = v(), r = I(location.href, "app") || "", i = n || r || c.currentSubAppCode;
+  if (!i)
     return;
-  const i = d(location.href, "menu") || "", c = e || i || (window.__IN_MICRO_APP__ ? o.currentSubApp.currentMenuCode : JSON.parse(sessionStorage.getItem(`${s.title}-tabs`) || "{}").currentTab.code), p = JSON.parse(sessionStorage.getItem(r) || "{}");
-  if (!p || JSON.stringify(p) === "{}")
+  const t = I(location.href, "menu") || "", a = e || t || c.currentSubApp.currentMenuCode, o = JSON.parse(sessionStorage.getItem(s) || "{}");
+  if (!o || JSON.stringify(o) === "{}")
     return;
-  const u = p[t][c];
-  return u && u.length ? u : p[t]["origin-auth"] ? p[t]["origin-auth"][c] ?? [] : [];
-}, U = (e, n) => _(e, n) ?? [], v = () => {
-  var s;
-  if (!window.__IN_MICRO_APP__)
-    return {};
-  const e = JSON.parse(sessionStorage.getItem("subApps") || "{}"), n = ((s = e.appcategorys) == null ? void 0 : s.map((o) => o.apps).flat()) ?? [];
+  const p = o[i][a];
+  return p && p.length ? p : o[i]["origin-auth"] ? o[i]["origin-auth"][a] ?? [] : [];
+}, P = (e, n) => C(e, n) ?? [], v = () => {
+  const e = JSON.parse(sessionStorage.getItem("subApps") || "{}");
   return {
     appcategorys: e.appcategorys ?? [],
     currentSubApp: e.currentSubApp ?? {},
     currentSubAppCode: e.currentSubAppCode ?? "",
-    flatSubAppList: n,
     subAppList: e.subAppList ?? []
   };
-}, M = (e) => {
+}, R = (e) => {
   const n = JSON.parse(sessionStorage.getItem("menus") || "{}");
   return e ? n[e] ?? [] : n;
-}, T = () => {
-  const e = f();
-  let n = {};
-  if (window.__IN_MICRO_APP__) {
-    const r = JSON.parse(sessionStorage.getItem("tabs") || "{}");
-    n = {
-      activeKey: r.activeKey ?? "",
-      currentTab: r.currentTab ?? {},
-      tabMap: r.tabMap ?? {}
-    };
-  } else {
-    const r = JSON.parse(sessionStorage.getItem(`${e.title}-tabs`) || "{}");
-    n = {
-      activeKey: r.activeKey ?? "",
-      currentTab: r.currentTab ?? {},
-      tabList: r.tabList ?? []
-    };
-  }
-  return n;
-}, k = () => {
-  const e = f(), n = sessionStorage.getItem("minioAddress");
+}, M = () => {
+  let e = {};
+  const n = JSON.parse(sessionStorage.getItem("tabs") || "{}");
+  return e = {
+    currentCode: n.currentCode ?? "",
+    currentTab: n.currentTab ?? {},
+    tabMap: n.tabMap ?? {},
+    preTab: n.preTab ?? {}
+  }, e;
+}, w = () => {
+  const e = u(), n = sessionStorage.getItem("minioAddress");
   return n || (e.baseURL ? e.baseURL : location.origin);
 };
-h() || m();
+b() || m();
 S();
 export {
-  M as getMenus,
-  k as getMinioAddress,
-  _ as getPageAuth,
-  U as getPageAuthBtn,
-  J as getPersonalInfo,
-  R as getProjectInfo,
+  R as getMenus,
+  w as getMinioAddress,
+  C as getPageAuth,
+  P as getPageAuthBtn,
+  T as getPersonalInfo,
+  x as getProjectInfo,
   v as getSubApps,
-  T as getTabInfo,
-  j as getTenantInfo,
-  h as getToken,
-  w as getUserInfo
+  M as getTabInfo,
+  k as getTenantInfo,
+  b as getToken,
+  y as getUserInfo
 };

package/common-info/set-common-info.d.ts

@@ -0,0 +1,45 @@
+/** 存储当前租户详情 */
+export declare const setTenantInfo: (data?: {}) => void;
+/** 存储首页信息 */
+export declare const setHomeInfo: (data?: {}) => void;
+/** 存储项目信息 */
+export declare const setProjectInfo: (data?: {
+    id: string;
+}) => void;
+/** 存储标签页信息 */
+export declare const setTabs: (options: any) => void;
+/**
+ * 存储应用数据
+ * @param options
+ */
+export declare const setSubApps: (options: any) => void;
+/** 设置应用当前选中菜单 */
+export declare const setSubAppsCurrentMenuCode: (value: string) => void;
+/**
+ * 存储菜单数据
+ * @param data 菜单list
+ * @param code 当前子应用code
+ * @returns
+ */
+export declare const setMenus: (data: any[], code: string) => any;
+/**
+ * 存储权限按钮数据
+ * @param data 菜单list
+ * @param code 当前子应用code
+ * @returns
+ */
+export declare const setPermissionBtns: (data: any[], code: string) => any;
+/**
+ * 存储面包屑显示、隐藏数据
+ * @param flatMenuList 拍平的菜单list
+ * @param code 当前子应用code
+ * @returns
+ */
+export declare const setBreadcrumb: (flatMenuList: any[], code: string) => any;
+/**
+ * 存储页签风格数据
+ * @param flatMenuList 拍平的菜单list
+ * @param code 当前子应用code
+ * @returns
+ */
+export declare const setTabStyle: (flatMenuList: any[], code: string) => any;

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

@@ -0,0 +1,103 @@
+import { flatTree as y } from "@das-fed/utils/common-tools";
+import { getTabInfo as A, getSubApps as h } from "@das-fed/utils/common-info";
+const v = (n = {}) => {
+  sessionStorage.setItem("tenantInfo", JSON.stringify(n));
+}, I = (n = {}) => {
+  sessionStorage.setItem("home-config", JSON.stringify(n));
+}, M = (n = { id: "" }) => {
+  sessionStorage.setItem("projectInfo", JSON.stringify(n)), sessionStorage.setItem("project", n.id);
+}, J = (n) => {
+  let s = A();
+  Array.isArray(n) ? n.forEach((e) => {
+    var t;
+    if (e.key.startsWith("tabMap")) {
+      const o = e.key.split(":")[1];
+      if (Array.isArray(e.value))
+        s.tabMap[o] = e.value;
+      else if ((t = s.tabMap[o]) != null && t.length) {
+        const i = s.tabMap[o].findIndex((f) => f.code === e.value.code);
+        i !== -1 ? s.tabMap[o].splice(i, 1, e.value) : s.tabMap[o].push(e.value);
+      } else
+        s.tabMap[o] = [e.value];
+    } else if (e.key.startsWith("preTab")) {
+      const o = e.key.split(":")[1];
+      s.preTab || (s.preTab = {}), s.preTab[o] = e.value;
+    } else
+      Object.assign(s, { [e.key]: e.value });
+  }) : Object.assign(s, { [n.key]: n.value }), sessionStorage.setItem("tabs", JSON.stringify(s));
+}, N = (n) => {
+  let s = h();
+  Array.isArray(n) ? n.forEach((e) => {
+    if (e.key === "subAppList" && !Array.isArray(e.value)) {
+      const t = s.subAppList.findIndex((o) => o.code === e.value.code);
+      t !== -1 ? s.subAppList.splice(t, 1, e.value) : s.subAppList.push(e.value);
+    } else
+      Object.assign(s, { [e.key]: e.value });
+  }) : Object.assign(s, { [n.key]: n.value }), sessionStorage.setItem("subApps", JSON.stringify(s));
+}, k = (n) => {
+  let s = h();
+  s.currentSubApp.currentMenuCode = n;
+  for (const e in s.subAppList)
+    s.subAppList[e].code === s.currentSubAppCode && (s.subAppList[e].currentMenuCode = n);
+  sessionStorage.setItem("subApps", JSON.stringify(s));
+}, E = (n, s) => {
+  const e = "menus", t = JSON.parse(sessionStorage.getItem(e) || "{}") || {};
+  return t[s] = n, sessionStorage.setItem(e, JSON.stringify(t)), t;
+}, L = (n, s) => {
+  const e = "permission-btn", t = JSON.parse(sessionStorage.getItem(e) || "{}") || {}, o = n != null && n.length ? n.filter((r) => r.routeUrl) : [], i = n != null && n.length ? n.filter((r) => !r.routeUrl && r.children).map((r) => r.children).flat() : [], f = [...o, ...i], c = {};
+  return f.forEach((r) => {
+    var S;
+    const p = r.code, u = (r == null ? void 0 : r.originalCode) ?? "";
+    c[p] || (c[p] = []);
+    let g = [];
+    r != null && r.children && ((S = r == null ? void 0 : r.children) != null && S.length) && (r.children.forEach((a) => {
+      var l;
+      !(a != null && a.children) || !((l = a.children) != null && l.length) ? g.push({
+        code: a.code,
+        originalCode: a.originalCode,
+        name: a.name
+      }) : y([a]).forEach((b) => {
+        g.push({
+          code: b.code,
+          originalCode: b.originalCode,
+          name: b.name
+        });
+      });
+    }), g.forEach((a) => {
+      let l = a.originalCode ? a.originalCode : a.code ? a.code : "";
+      l.includes(p + ".") && (l = l.replace(p + ".", "").replaceAll(".", "-")), l.includes(u + ".") && (l = l.replace(u + ".", "").replaceAll(".", "-"));
+      const d = {
+        code: l,
+        name: a.name
+      };
+      c[p].push(d), u && p !== u && (c["origin-auth"] || (c["origin-auth"] = {}), c["origin-auth"][u] || (c["origin-auth"][u] = []), c["origin-auth"][u].push(d));
+    }));
+  }), t[s] = c, sessionStorage.setItem(e, JSON.stringify(t)), t;
+}, T = (n, s) => {
+  const e = "breadcrumb", t = n.filter((i) => i.routeUrl), o = JSON.parse(sessionStorage.getItem(e) || "{}") || {};
+  return t.forEach((i) => {
+    const c = ((i == null ? void 0 : i.style) ?? 1) === 1, r = i.code;
+    o[s] || (o[s] = {}), o[s][r] = c;
+  }), sessionStorage.setItem(e, JSON.stringify(o)), o;
+}, j = (n, s) => {
+  const e = "tabStyle", t = n.filter((i) => i.routeUrl), o = JSON.parse(sessionStorage.getItem(e) || "{}") || {};
+  return t.forEach((i) => {
+    const f = i.code, c = {
+      fontColor: i.fontColor,
+      backgroundColor: i.backgroundColor
+    };
+    o[s] || (o[s] = {}), o[s][f] = c;
+  }), sessionStorage.setItem(e, JSON.stringify(o)), o;
+};
+export {
+  T as setBreadcrumb,
+  I as setHomeInfo,
+  E as setMenus,
+  L as setPermissionBtns,
+  M as setProjectInfo,
+  N as setSubApps,
+  k as setSubAppsCurrentMenuCode,
+  j as setTabStyle,
+  J as setTabs,
+  v as setTenantInfo
+};

package/common-tools/index.d.ts

@@ -5,3 +5,4 @@ export * from '@das-fed/utils/common-tools/obj-tools';
 export * from '@das-fed/utils/common-tools/arr-tools';
 export * from '@das-fed/utils/common-tools/handle-data';
 export * from '@das-fed/utils/common-tools/setHtmlMinWH';
+export * from '@das-fed/utils/common-tools/queue-promise';

package/common-tools/index.js

@@ -5,3 +5,4 @@ export * from "@das-fed/utils/common-tools/obj-tools";
 export * from "@das-fed/utils/common-tools/arr-tools";
 export * from "@das-fed/utils/common-tools/handle-data";
 export * from "@das-fed/utils/common-tools/setHtmlMinWH";
+export * from "@das-fed/utils/common-tools/queue-promise";

package/common-tools/queue-promise.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 串行执行promise
+ * @param promiseFuncArr promise数组
+ * @returns promise
+ */
+export declare function runPromiseByQueue(promiseFuncArr: any[]): Promise<unknown>;

package/common-tools/queue-promise.js

@@ -0,0 +1,9 @@
+function c(r) {
+  const e = [];
+  return new Promise((n, u) => {
+    r.reduce((t, o) => t.then(o).then((s) => e.push(s)), Promise.resolve()).then(() => n(e));
+  });
+}
+export {
+  c as runPromiseByQueue
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,8 +9,8 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/ui": "1.1.3",
-    "@das-fed/utils": "1.0.7",
+    "@das-fed/ui": "1.1.4",
+    "@das-fed/utils": "1.0.9",
     "@vue/shared": "^3.4.21",
     "axios": "^1.6.7",
     "dayjs": "^1.11.10",
@@ -22,6 +22,7 @@
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.0.4",
     "consola": "^3.2.3",
+    "ant-design-vue": "3.2.20",
     "element-plus": "2.4.2",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",