@das-fed/web 7.1.0-dev.33 → 7.1.0-dev.36

package/{index-Co-HORmb.js → index-BWn-Pl08.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as e, openBlock as r } from "vue";
-import { _ as c } from "./index-DII2s5jN.js";
+import { _ as c } from "./index-DWQBmiPa.js";
 const o = {};
 function t(n, _) {
   return r(), e("div");

package/{index-DM0W6wXZ.js → index-CqoyDk2A.js}

@@ -6,7 +6,7 @@ import { DasSpin as T } from "@das-fed/ui/packages/components/spin/index";
 import { getTabInfo as b } from "@das-fed/utils/common-info";
 import { setShowLayout as E } from "@das-fed/utils/common-tools";
 import { createService as L } from "@das-fed/utils/create-api-service";
-import { u as P, p as q, a as u, c as d, b as B, l as K, g as M, d as N } from "./index-DII2s5jN.js";
+import { u as P, p as q, a as u, c as d, b as B, l as K, g as M, d as N } from "./index-DWQBmiPa.js";
 const O = "v1", V = L(`/api/justauth/client/${O}`), F = V.get("/visitor/kingdee/auth/user/auth_code"), ee = /* @__PURE__ */ v({
   __name: "index",
   setup(G) {

package/{index-DII2s5jN.js → index-DWQBmiPa.js}

@@ -245,16 +245,14 @@ const S0 = sessionStorage.getItem("currentLang") ? sessionStorage.getItem("curre
       z && (A7[z] || (A7[z] = {}), A7[z][P] = n[P]), i3[P] || (i3[P] = n[P]);
     }
 }, kZ = async (n) => {
-  var u, P;
+  var u;
   const v = document.documentElement;
   v && v.setAttribute("lang", v7.value);
   const e = window[K0];
-  e && Pr(e, "global"), Pr(Y0);
-  let t = Object.assign(((u = n == null ? void 0 : n.i18n) == null ? void 0 : u.glob) || {});
-  (P = n == null ? void 0 : n.microApps) == null || P.map((z) => {
-    var b;
-    t = Object.assign(t, ((b = z.i18n) == null ? void 0 : b.glob) || {});
-  }), Object.values(t).filter((z) => !!z).flat().map((z) => Pr(z));
+  e && Pr(e, "global"), Pr(Y0), [(u = n == null ? void 0 : n.i18n) == null ? void 0 : u.glob, ...((n == null ? void 0 : n.microApps) ?? []).map((P) => {
+    var z;
+    return (z = P.i18n) == null ? void 0 : z.glob;
+  })].flatMap((P) => Object.values(P ?? {})).filter(Boolean).flat().forEach((P) => Pr(P));
 }, h0 = (n) => {
   let v = "";
   const e = /\/([^\/]+)\/([^\/]+)\//, t = n.match(e);
@@ -18151,7 +18149,7 @@ g("@das-fed/web");
 const NN = [
   {
     path: ff,
-    component: () => import("./index-DM0W6wXZ.js"),
+    component: () => import("./index-CqoyDk2A.js"),
     meta: {
       layout: {
         minWidth: "0px"
@@ -18160,7 +18158,7 @@ const NN = [
   },
   {
     path: zd,
-    component: () => import("./index-Co-HORmb.js")
+    component: () => import("./index-BWn-Pl08.js")
   }
 ], fT = {
   routes: NN,

package/index.js

@@ -1,4 +1,4 @@
-import { J as e, A as t, C as n, B as i, D as r, e as u, m as o, w as m, o as p, f as g, k as D, v as l, y as L, z as b, h as c, i as h, G as A, H as T, q as y, E as R, F as W, K as I, I as M, s as F, j as V, n as f, r as k, x as v, t as w } from "./index-DII2s5jN.js";
+import { J as e, A as t, C as n, B as i, D as r, e as u, m as o, w as m, o as p, f as g, k as D, v as l, y as L, z as b, h as c, i as h, G as A, H as T, q as y, E as R, F as W, K as I, I as M, s as F, j as V, n as f, r as k, x as v, t as w } from "./index-DWQBmiPa.js";
 export {
   e as DasMainAppLayout,
   t as DasWebLayout,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@das-fed/web",
-  "version": "7.1.0-dev.33",
+  "version": "7.1.0-dev.36",
   "type": "module",
   "main": "./index.js",
   "dependencies": {
-    "@das-fed/ui": "7.1.0-dev.33",
-    "@das-fed/utils": "7.1.0-dev.33",
-    "@das-fed/web": "7.1.0-dev.33",
-    "@das-fed/web-components": "7.1.0-dev.33",
+    "@das-fed/ui": "7.1.0-dev.36",
+    "@das-fed/utils": "7.1.0-dev.36",
+    "@das-fed/web": "7.1.0-dev.36",
+    "@das-fed/web-components": "7.1.0-dev.36",
     "@microsoft/signalr": "^8.0.7",
     "@vueuse/core": "^9.13.0",
     "animate.css": "^4.1.1",
@@ -19,7 +19,7 @@
     "vue-router": "^4.4.0"
   },
   "devDependencies": {
-    "@das-fed/cli": "7.1.0-dev.33",
+    "@das-fed/cli": "7.1.0-dev.36",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash": "^4.14.194",
     "@types/lodash-es": "^4.17.12",

package/packages/i18n/index.js

@@ -1,4 +1,4 @@
-import { reactive as s, ref as z, computed as k } from "vue";
+import { reactive as h, ref as z, computed as k } from "vue";
 const _ = {
   // 按钮
   详情: { "zh-CN": "详情", en: "Details", _appCode: "framework" },
@@ -119,57 +119,55 @@ const _ = {
   删除失败: { "zh-CN": "删除失败", en: "Deleted Failed", _appCode: "framework" },
   操作成功: { "zh-CN": "操作成功", en: "Operated Successfully", _appCode: "framework" },
   操作失败: { "zh-CN": "操作失败", en: "Operated Failed", _appCode: "framework" }
-}, d = s({}), f = s({}), t = s({});
+}, d = h({}), f = h({}), m = h({});
 var i;
-const l = sessionStorage.getItem("currentLang") ? sessionStorage.getItem("currentLang") : (i = navigator.language) != null && i.toLowerCase().startsWith("zh") ? "zh-CN" : "en", m = z(l), c = "dasI18n", b = (e = {}, r) => {
-  const C = r === "global", n = !C, p = {};
-  for (const o in e)
-    for (const a in e[o])
-      p[a] || (p[a] = {}), p[a][o] = e[o][a] ?? "", C && (f[a] || (f[a] = {}), f[a][o] = p[a][o]), n && (d[a] || (d[a] = {}), d[a][o] = p[a][o]);
-}, h = (e = {}, r) => {
-  var p;
-  const C = r === "global", n = !C;
-  for (const o in e)
-    if (C && !f[o] && (f[o] = e[o]), n) {
-      const a = (p = e[o]) != null && p._appCode ? e[o]._appCode.toLowerCase() : "";
-      a && (t[a] || (t[a] = {}), t[a][o] = e[o]), d[o] || (d[o] = e[o]);
+const l = sessionStorage.getItem("currentLang") ? sessionStorage.getItem("currentLang") : (i = navigator.language) != null && i.toLowerCase().startsWith("zh") ? "zh-CN" : "en", t = z(l), c = "dasI18n", S = (o = {}, r) => {
+  const p = r === "global", C = !p, n = {};
+  for (const e in o)
+    for (const a in o[e])
+      n[a] || (n[a] = {}), n[a][e] = o[e][a] ?? "", p && (f[a] || (f[a] = {}), f[a][e] = n[a][e]), C && (d[a] || (d[a] = {}), d[a][e] = n[a][e]);
+}, w = (o = {}, r) => {
+  var n;
+  const p = r === "global", C = !p;
+  for (const e in o)
+    if (p && !f[e] && (f[e] = o[e]), C) {
+      const a = (n = o[e]) != null && n._appCode ? o[e]._appCode.toLowerCase() : "";
+      a && (m[a] || (m[a] = {}), m[a][e] = o[e]), d[e] || (d[e] = o[e]);
     }
-}, S = async (e) => {
-  var p, o;
+}, b = async (o) => {
+  var n;
   const r = document.documentElement;
-  r && r.setAttribute("lang", m.value);
-  const C = window[c];
-  C && h(C, "global"), h(_);
-  let n = Object.assign(((p = e == null ? void 0 : e.i18n) == null ? void 0 : p.glob) || {});
-  (o = e == null ? void 0 : e.microApps) == null || o.map((a) => {
-    var w;
-    n = Object.assign(n, ((w = a.i18n) == null ? void 0 : w.glob) || {});
-  }), Object.values(n).filter((a) => !!a).flat().map((a) => h(a));
-}, u = (e) => {
+  r && r.setAttribute("lang", t.value);
+  const p = window[c];
+  p && w(p, "global"), w(_), [(n = o == null ? void 0 : o.i18n) == null ? void 0 : n.glob, ...((o == null ? void 0 : o.microApps) ?? []).map((e) => {
+    var a;
+    return (a = e.i18n) == null ? void 0 : a.glob;
+  })].flatMap((e) => Object.values(e ?? {})).filter(Boolean).flat().forEach((e) => w(e));
+}, u = (o) => {
   let r = "";
-  const C = /\/([^\/]+)\/([^\/]+)\//, n = e.match(C);
-  return n && n.length >= 3 && (r = n[1] + "/" + n[2]), r ? r.toLowerCase() : "";
-}, g = (e, ...r) => k(() => {
-  const C = u(location.pathname);
-  let n = t.framework ?? {}, p = t[C] ?? {}, o = f[e] || n[e] || p[e] || d[e] || e;
-  if (o === e) return e;
-  typeof o == "string" && (o = { "zh-CN": o });
-  let a = o[m.value];
-  return m.value === "zh-CN" && o["zh-cn"] && !o["zh-CN"] && (a = o["zh-cn"]), r.map((w, N) => {
-    a && (a = a.replace(`$${N}`, w));
+  const p = /\/([^\/]+)\/([^\/]+)\//, C = o.match(p);
+  return C && C.length >= 3 && (r = C[1] + "/" + C[2]), r ? r.toLowerCase() : "";
+}, g = (o, ...r) => k(() => {
+  const p = u(location.pathname);
+  let C = m.framework ?? {}, n = m[p] ?? {}, e = f[o] || C[o] || n[o] || d[o] || o;
+  if (e === o) return o;
+  typeof e == "string" && (e = { "zh-CN": e });
+  let a = e[t.value];
+  return t.value === "zh-CN" && e["zh-cn"] && !e["zh-CN"] && (a = e["zh-cn"]), r.map((s, N) => {
+    a && (a = a.replace(`$${N}`, s));
   }), a;
-}), P = g, R = (e, ...r) => P(e, ...r).value, D = (e) => {
-  sessionStorage.setItem("currentLang", e), m.value = e;
-}, L = () => m;
+}), P = g, R = (o, ...r) => P(o, ...r).value, D = (o) => {
+  sessionStorage.setItem("currentLang", o), t.value = o;
+}, L = () => t;
 export {
-  m as currentLang,
+  t as currentLang,
   d as customLangeData,
   g as getI18nRule,
   L as getLang,
   P as i18n,
-  S as initI18n,
-  h as setI18nRule,
+  b as initI18n,
+  w as setI18nRule,
   D as setLang,
-  b as setLangRule,
+  S as setLangRule,
   R as t
 };

package/types/i18n/index.d.ts

@@ -2,6 +2,10 @@ declare const customLangeData: any;
 declare const currentLang: import('vue').Ref<any, any>;
 declare const setLangRule: (data?: any, type?: "global" | "custom") => void;
 declare const setI18nRule: (data?: any, type?: "global" | "custom") => void;
+/**
+ * 初始化主应用及所有微应用的国际化配置。
+ * @param opt 应用初始化配置，包含当前应用和微应用的语言模块
+ */
 declare const initI18n: (opt?: any) => any;
 /**
  * 获取国际化键名对应的文本