@das-fed/web 6.4.0-test.2 → 6.4.0-test.3

package/{packages/main-app-framework/index-Xn4wzM8V.js → index-CfwRXu_Z.js}

@@ -1,15 +1,16 @@
 import { defineComponent as _, computed as l, withDirectives as k, openBlock as v, createBlock as A, unref as p, withCtx as U, createVNode as C, vShow as S } from "vue";
-import { DasAppContainer as I } from "@das-fed/ui/packages/business-components/app-container/index";
-import { DasSpin as j } from "@das-fed/ui/packages/components/spin/index";
-import { layoutData as D } from "@das-fed/web/packages/layout/index";
-import { getTabInfo as $ } from "@das-fed/utils/common-info";
-import { setShowLayout as x } from "@das-fed/utils/common-tools";
-import { createService as T } from "@das-fed/utils/create-api-service";
-import { u as b, a as c, c as f, b as E, l as L, d as q } from "./index-Bo4ASgsm.js";
-const B = "v1", P = T(`/api/justauth/client/${B}`), K = P.get("/visitor/kingdee/auth/user/auth_code"), R = /* @__PURE__ */ _({
+import { layoutData as I } from "@das-fed/web/packages/layout/index";
+import { t as j } from "@das-fed/web/packages/i18n/index";
+import { DasAppContainer as D } from "@das-fed/ui/packages/business-components/app-container/index";
+import { DasSpin as $ } from "@das-fed/ui/packages/components/spin/index";
+import { getTabInfo as x } from "@das-fed/utils/common-info";
+import { setShowLayout as T } from "@das-fed/utils/common-tools";
+import { createService as b } from "@das-fed/utils/create-api-service";
+import { u as E, a as c, c as f, b as L, l as q, d as B } from "./index-CQaVm8TE.js";
+const P = "v1", K = b(`/api/justauth/client/${P}`), N = K.get("/visitor/kingdee/auth/user/auth_code"), X = /* @__PURE__ */ _({
   __name: "index",
-  setup(N) {
-    const { beforeEntryApp: d, entryApp: g } = b(), h = l(() => !!D.menu.items.length), m = l(() => {
+  setup(O) {
+    const { beforeEntryApp: d, entryApp: m } = E(), g = l(() => !!I.menu.items.length), h = l(() => {
       if (!c.value || !c.value.length) return [];
       const o = f(c.value);
       return Array.isArray(o) ? o.length ? (o.forEach((n) => n.apps = w(n.apps, 4)), o) : [] : [];
@@ -21,11 +22,11 @@ const B = "v1", P = T(`/api/justauth/client/${B}`), K = P.get("/visitor/kingdee/
     }, y = async (o) => {
       if (!o) return;
       if (!sessionStorage.getItem("projectInfo")) {
-        window.confirm("系统资源更新，请刷新系统") && (window.__isAutoCloseApp = !1, window.location.reload());
+        window.confirm(j("系统资源更新，请刷新系统")) && (window.__isAutoCloseApp = !1, window.location.reload());
         return;
       }
       const t = f(o);
-      if (L.innerSet = !0, t.routeUrl) {
+      if (q.innerSet = !0, t.routeUrl) {
         if (o.code === "Ioc") {
           window.open(t.routeUrl, "_blank");
           return;
@@ -33,7 +34,7 @@ const B = "v1", P = T(`/api/justauth/client/${B}`), K = P.get("/visitor/kingdee/
         if (o.code === "wojiacloud") {
           const e = sessionStorage.getItem("kingdee_token") || "";
           if (e) {
-            const [i, a] = await K().run({ accessToken: e });
+            const [i, a] = await N().run({ accessToken: e });
             if (a) {
               const s = (a == null ? void 0 : a.auth_code) ?? "";
               t.routeUrl = t.routeUrl.includes("?") ? `${t.routeUrl}&code=${s}` : `${t.routeUrl}?code=${s}`;
@@ -44,31 +45,31 @@ const B = "v1", P = T(`/api/justauth/client/${B}`), K = P.get("/visitor/kingdee/
       const r = (o == null ? void 0 : o.openType) ?? 1, u = (o == null ? void 0 : o.type) ?? 1;
       if (r === 1) {
         if (!await d(o)) return;
-        const i = $().preTab[o.code], a = (i == null ? void 0 : i.code) ?? "", s = { ...(i == null ? void 0 : i.query) ?? {} };
-        g({ microApp: t, menuCode: a, route: { query: s } });
+        const i = x().preTab[o.code], a = (i == null ? void 0 : i.code) ?? "", s = { ...(i == null ? void 0 : i.query) ?? {} };
+        m({ microApp: t, menuCode: a, route: { query: s } });
       }
       if (r === 2 && t.routeUrl) {
         let e = "";
-        u === 1 ? (e = t != null && t.applicationPath ? location.origin + "/" + t.applicationPath + t.routeUrl : location.origin + t.routeUrl, e = x(e)) : u === 2 && (e = q(t.routeUrl)), window.open(e, "_blank");
+        u === 1 ? (e = t != null && t.applicationPath ? location.origin + "/" + t.applicationPath + t.routeUrl : location.origin + t.routeUrl, e = T(e)) : u === 2 && (e = B(t.routeUrl)), window.open(e, "_blank");
       }
     };
-    return (o, n) => k((v(), A(p(j), {
+    return (o, n) => k((v(), A(p($), {
       full: "",
-      spinning: p(E)
+      spinning: p(L)
     }, {
       default: U(() => [
-        C(p(I), {
-          appCategorys: m.value,
+        C(p(D), {
+          appCategorys: h.value,
           onOpenApp: y
         }, null, 8, ["appCategorys"])
       ]),
       _: 1
       /* STABLE */
     }, 8, ["spinning"])), [
-      [S, !h.value]
+      [S, !g.value]
     ]);
   }
 });
 export {
-  R as default
+  X as default
 };

package/index.js

@@ -1,30 +1,31 @@
-import { F as s, w as t, y as n, x as i, z as r, e as p, k as u, p as o, g as m, j as g, o as D, r as l, v as b, f as h, i as A, C as T, D as c, m as y, A as L, B as W, G as M, E as R, s as F, h as I, n as V, q as f, t as k } from "./index-DEYJwN2T.js";
+import { G as s, x as t, z as n, y as i, A as r, e as u, k as p, q as o, g, j as m, p as l, v as D, w as b, f as h, i as A, D as L, E as T, n as c, B as y, C as R, H as W, F as M, s as F, h as I, m as V, o as f, r as k, t as v } from "./index-CQaVm8TE.js";
 export {
   s as DasMainAppLayout,
   t as DasWebLayout,
   n as DasWebMenu,
   i as DasWebNav,
   r as DasWebTabs,
-  p as createDasWebApp,
-  u as currentLang,
+  u as createDasWebApp,
+  p as currentLang,
   o as currentTheme,
-  m as getI18nRule,
-  g as getLang,
-  D as getThemeRule,
-  l as getVar,
+  g as getI18nRule,
+  m as getLang,
+  l as getThemeRule,
+  D as getVar,
   b as getVarValue,
   h as i18n,
   A as initI18n,
-  T as initMainApp,
-  c as initMicroApp,
-  y as initTheme,
-  L as layout,
-  W as layoutData,
-  M as mainAppFramework,
-  R as microFrontend,
+  L as initMainApp,
+  T as initMicroApp,
+  c as initTheme,
+  y as layout,
+  R as layoutData,
+  W as mainAppFramework,
+  M as microFrontend,
   F as setI18nRule,
   I as setLang,
-  V as setTheme,
-  f as setThemeRule,
-  k as t
+  V as setLangRule,
+  f as setTheme,
+  k as setThemeRule,
+  v as t
 };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@das-fed/web",
-  "version": "6.4.0-test.2",
+  "version": "6.4.0-test.3",
   "type": "module",
   "main": "./index.js",
   "dependencies": {
-    "@das-fed/ui": "6.4.0-test.2",
-    "@das-fed/utils": "6.4.0-test.2",
-    "@das-fed/web": "6.4.0-test.2",
-    "@das-fed/web-components": "6.4.0-test.2",
+    "@das-fed/ui": "6.4.0-test.3",
+    "@das-fed/utils": "6.4.0-test.3",
+    "@das-fed/web": "6.4.0-test.3",
+    "@das-fed/web-components": "6.4.0-test.3",
     "@microsoft/signalr": "^8.0.7",
     "@vueuse/core": "^9.13.0",
     "animate.css": "^4.1.1",
@@ -18,7 +18,7 @@
     "vue-router": "^4.4.0"
   },
   "devDependencies": {
-    "@das-fed/cli": "6.4.0-test.2",
+    "@das-fed/cli": "6.4.0-test.3",
     "@types/lodash": "^4.14.194",
     "@types/lodash-es": "^4.17.12",
     "@vitejs/plugin-vue": "^5.1.0",

package/packages/i18n/index.js

@@ -1,34 +1,40 @@
-import { reactive as r, ref as b, computed as f } from "vue";
-const g = r({}), u = r({}), l = b("zh-CN"), m = "dasI18n", i = (n, s) => {
-  const t = s === "global", a = !t;
+import { reactive as u, ref as f, computed as b } from "vue";
+const a = u({}), i = u({}), c = f("zh-CN"), m = "dasI18n", g = (n, l) => {
+  const t = l === "global", s = !t;
+  for (const o in n)
+    t && (i[o] = n[o]), s && (a[o] = n[o]);
+}, z = (n, l, t) => {
+  const s = t === "global", o = !s;
   for (const e in n)
-    t && (u[e] = n[e]), a && (g[e] = n[e]);
-}, z = async (n) => {
-  var a, e;
-  const s = window[m];
-  s && i(s, "global");
-  let t = Object.assign(((a = n == null ? void 0 : n.i18n) == null ? void 0 : a.glob) || {});
-  (e = n == null ? void 0 : n.microApps) == null || e.map((c) => {
-    var o;
-    t = Object.assign(t, ((o = c.i18n) == null ? void 0 : o.glob) || {});
-  }), Object.values(t).filter((c) => !!c).flat().map((c) => i(c));
-}, I = (n, ...s) => f(() => {
-  const t = u[n] || g[n] || n;
+    s && (i[e][l] = n[e]), o && (a[e][l] = n[e]);
+}, C = async (n) => {
+  var s, o;
+  const l = window[m];
+  l && g(l, "global");
+  let t = Object.assign(((s = n == null ? void 0 : n.i18n) == null ? void 0 : s.glob) || {});
+  (o = n == null ? void 0 : n.microApps) == null || o.map((e) => {
+    var r;
+    t = Object.assign(t, ((r = e.i18n) == null ? void 0 : r.glob) || {});
+  }), Object.values(t).filter((e) => !!e).flat().map((e) => g(e));
+}, I = (n, ...l) => b(() => {
+  let t = i[n] || a[n] || n;
   if (t === n) return n;
-  let a = t[l.value];
-  return l.value === "zh-CN" && t["zh-cn"] && !t["zh-CN"] && (a = t["zh-cn"]), s.map((e, c) => {
-    a = a.replace(`$${c}`, e);
-  }), a;
-}), v = I, D = (n, ...s) => v(n, ...s).value, L = (n) => {
-  l.value = n;
-}, C = () => l;
+  typeof t == "string" && (t = { "zh-CN": t });
+  let s = t[c.value];
+  return c.value === "zh-CN" && t["zh-cn"] && !t["zh-CN"] && (s = t["zh-cn"]), l.map((o, e) => {
+    s = s.replace(`$${e}`, o);
+  }), s;
+}), h = I, L = (n, ...l) => h(n, ...l).value, D = (n) => {
+  c.value = n;
+}, N = () => c;
 export {
-  l as currentLang,
+  c as currentLang,
   I as getI18nRule,
-  C as getLang,
-  v as i18n,
-  z as initI18n,
-  i as setI18nRule,
-  L as setLang,
-  D as t
+  N as getLang,
+  h as i18n,
+  C as initI18n,
+  g as setI18nRule,
+  D as setLang,
+  z as setLangRule,
+  L as t
 };