@das-fed/upf-web 6.4.0-dev.152 → 6.4.0-dev.154

package/{index-BqTsE-wO.js → index-cKNp7fKq.js}

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

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-C05MU1yC.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-DKVGTpe2.js";
 export {
   e as DasMainAppLayout,
   t as DasWebLayout,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@das-fed/upf-web",
-  "version": "6.4.0-dev.152",
+  "version": "6.4.0-dev.154",
   "type": "module",
   "main": "./index.js",
   "dependencies": {
-    "@das-fed/upf-ui": "6.4.0-dev.152",
-    "@das-fed/upf-utils": "6.4.0-dev.152",
-    "@das-fed/upf-web": "6.4.0-dev.152",
-    "@das-fed/upf-web-components": "6.4.0-dev.152",
+    "@das-fed/upf-ui": "6.4.0-dev.154",
+    "@das-fed/upf-utils": "6.4.0-dev.154",
+    "@das-fed/upf-web": "6.4.0-dev.154",
+    "@das-fed/upf-web-components": "6.4.0-dev.154",
     "@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/upf-cli": "6.4.0-dev.152",
+    "@das-fed/upf-cli": "6.4.0-dev.154",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash": "^4.14.194",
     "@types/lodash-es": "^4.17.12",

package/packages/create-das-web-app/index.js

@@ -1,31 +1,31 @@
-import { ref as x, createApp as O } from "vue";
-import { initTheme as P } from "@das-fed/upf-web/packages/theme/index";
-import { initI18n as W } from "@das-fed/upf-web/packages/i18n/index";
-import { DasWebLayout as $ } from "@das-fed/upf-web/packages/layout/index";
-import { createPinia as j } from "pinia";
-import k from "pinia-plugin-persistedstate";
-import { createRouter as y, createWebHistory as D } from "vue-router";
-const N = {
-  install: (e, a) => {
+import { ref as o, createApp as x } from "vue";
+import { initTheme as w } from "@das-fed/upf-web/packages/theme/index";
+import { initI18n as O } from "@das-fed/upf-web/packages/i18n/index";
+import { DasWebLayout as P } from "@das-fed/upf-web/packages/layout/index";
+import { createPinia as W } from "pinia";
+import $ from "pinia-plugin-persistedstate";
+import { createRouter as j, createWebHistory as k } from "vue-router";
+const y = {
+  install: (e, u) => {
     var l;
-    const c = (l = a == null ? void 0 : a.plugins) == null ? void 0 : l.glob;
-    c && Object.values(c).sort((t, u) => (t.index ?? 0) - (u.index ?? 0)).filter((t) => t ? !!(t.default && t.default.install || t.install) : !1).forEach((t) => {
-      t.default && t.default.install && e.use(t.default, a), t.install && e.use(t, a);
+    const c = (l = u == null ? void 0 : u.plugins) == null ? void 0 : l.glob;
+    c && Object.values(c).sort((t, a) => (t.index ?? 0) - (a.index ?? 0)).filter((t) => t ? !!(t.default && t.default.install || t.install) : !1).forEach((t) => {
+      t.default && t.default.install && e.use(t.default, u), t.install && e.use(t, u);
     });
   }
-}, d = j();
-d.use(k);
-const B = (e) => {
-  var i, h, b, A, g;
-  const a = ((i = e == null ? void 0 : e.router) == null ? void 0 : i.routerBase) ?? "/", c = ((h = e == null ? void 0 : e.router) == null ? void 0 : h.options) || {};
-  let l = Object.assign(((b = e == null ? void 0 : e.router) == null ? void 0 : b.glob) || {});
-  const t = Object.values(l).filter((f) => !!f).flat().sort((f, m) => (f.index ?? 0) - (m.index ?? 0)), u = [];
+}, d = W();
+d.use($);
+const D = (e) => {
+  var h, b, p, A, g;
+  const u = ((h = e == null ? void 0 : e.router) == null ? void 0 : h.routerBase) ?? "/", c = ((b = e == null ? void 0 : e.router) == null ? void 0 : b.options) || {};
+  let l = Object.assign(((p = e == null ? void 0 : e.router) == null ? void 0 : p.glob) || {});
+  const t = Object.values(l).filter((f) => !!f).flat().sort((f, m) => (f.index ?? 0) - (m.index ?? 0)), a = [];
   (A = e == null ? void 0 : e.microApps) == null || A.map((f) => {
-    var p;
-    const m = Object.values(((p = f.router) == null ? void 0 : p.glob) || {}).filter((r) => !!r).flat().sort((r, v) => (r.index ?? 0) - (v.index ?? 0));
-    u.push(
+    var R;
+    const m = Object.values(((R = f.router) == null ? void 0 : R.glob) || {}).filter((r) => !!r).flat().sort((r, v) => (r.index ?? 0) - (v.index ?? 0));
+    a.push(
       ...m.map((r) => ({ ...r, path: `/${f.microAppName}${r.path}` }))
-    ), u.push(
+    ), a.push(
       ...m.filter((r) => !!r.path).filter((r) => r.path !== "").filter((r) => r.path !== "/").filter((r) => !r.path.startsWith(`/${r.microAppName}`)).map((r) => ({
         path: r.path,
         redirect: `/${f.microAppName}${r.path}`,
@@ -33,26 +33,27 @@ const B = (e) => {
       }))
     );
   });
-  const s = ((g = e == null ? void 0 : e.router) == null ? void 0 : g.routers) || [], R = [
-    ...n(t, e),
-    ...n(s, e),
-    ...n(u, e)
+  const s = ((g = e == null ? void 0 : e.router) == null ? void 0 : g.routers) || [], n = [
+    ...i(t, e),
+    ...i(s, e),
+    ...i(a, e)
   ];
-  return { router: y({ history: D(a), routes: R, ...c }) };
-}, n = (e, a) => e.map((c) => {
+  return { router: j({ history: k(u), routes: n, ...c }) };
+}, i = (e, u) => e.map((c) => {
   const l = c.meta || {};
-  return l.keepAlive = l.keepAlive ?? (a == null ? void 0 : a.keepAlive) ?? !0, { ...c, meta: l };
-}), w = (e) => {
+  return l.keepAlive = l.keepAlive ?? (u == null ? void 0 : u.keepAlive) ?? !0, { ...c, meta: l };
+}), q = (e) => {
+  var n;
   e || (e = {});
-  const a = x(!0);
-  Promise.all([P(e), W(e)]).then(() => {
-    a.value = !1;
+  const u = o(!0);
+  Promise.all([w(e), O(e)]).then(() => {
+    u.value = !1;
   });
-  const { container: c, component: l, props: t } = (e == null ? void 0 : e.root) || {}, u = O(l || $, t);
-  u.use(N, e), u.use(d);
-  const { router: s } = B(e);
-  return u.use(s), u.mount(c || "#app"), { app: u, router: s, loading: a, store: d };
+  const { container: c, component: l, props: t } = (e == null ? void 0 : e.root) || {}, a = x(l || P, t);
+  a.use(y, e), a.use(d);
+  const { router: s } = D(e);
+  return a.use(s), a.mount(c || "#app"), (n = window.top) != null && n.vueRouter || window.top && (window.top.vueRouter = s), { app: a, router: s, loading: u, store: d };
 };
 export {
-  w as createDasWebApp
+  q as createDasWebApp
 };

package/packages/i18n/index.js

@@ -1,5 +1,6 @@
-import { reactive as i, ref as s, computed as k } from "vue";
-const _ = {
+import { reactive as w, ref as _, computed as s } from "vue";
+import { handleI18nData as l } from "@das-fed/upf-utils/common-tools/handle-data";
+const c = {
   // 按钮
   详情: { "zh-CN": "详情", en: "Details", _appCode: "framework" },
   下载: { "zh-CN": "下载", en: "Download", _appCode: "framework" },
@@ -119,57 +120,58 @@ const _ = {
   删除失败: { "zh-CN": "删除失败", en: "Deleted Failed", _appCode: "framework" },
   操作成功: { "zh-CN": "操作成功", en: "Operated Successfully", _appCode: "framework" },
   操作失败: { "zh-CN": "操作失败", en: "Operated Failed", _appCode: "framework" }
-}, d = i({}), f = i({}), m = i({});
+}, d = w({}), f = w({}), t = w({});
 var N;
-const l = (N = navigator.language) != null && N.toLowerCase().startsWith("zh") ? "zh-CN" : "en", t = s(l), c = "dasI18n", b = (e = {}, r) => {
-  const C = r === "global", n = !C, p = {};
+const u = (N = navigator.language) != null && N.toLowerCase().startsWith("zh") ? "zh-CN" : "en", m = _(u), g = "dasI18n", z = () => {
+  const e = document.documentElement;
+  e && e.setAttribute("lang", m.value);
+}, P = (e = {}, r) => {
+  const n = r === "global", p = !n, C = {};
   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]);
+      C[a] || (C[a] = {}), C[a][o] = e[o][a] ?? "", n && (f[a] || (f[a] = {}), f[a][o] = C[a][o]), p && (d[a] || (d[a] = {}), d[a][o] = C[a][o]);
 }, h = (e = {}, r) => {
-  var p;
-  const C = r === "global", n = !C;
+  var C;
+  const n = r === "global", p = !n;
   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 && (m[a] || (m[a] = {}), m[a][o] = e[o]), d[o] || (d[o] = e[o]);
+    if (n && !f[o] && (f[o] = e[o]), p) {
+      const a = (C = e[o]) != null && C._appCode ? e[o]._appCode.toLowerCase() : "";
+      a && (t[a] || (t[a] = {}), t[a][o] = e[o]), d[o] || (d[o] = e[o]);
     }
-}, R = async (e) => {
-  var p, o;
-  const r = document.documentElement;
-  r && r.setAttribute("lang", t.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) => {
+}, L = async (e) => {
+  z();
+  const r = window[g];
+  r && h(r, "global"), h(c);
+  {
+    let n = await l({ pathname: "front-end" });
+    P(n);
+    return;
+  }
+}, v = (e) => {
   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 = m.framework ?? {}, p = m[C] ?? {}, o = f[e] || n[e] || p[e] || d[e] || e;
+  const n = /\/([^\/]+)\/([^\/]+)\//, p = e.match(n);
+  return p && p.length >= 3 && (r = p[1] + "/" + p[2]), r ? r.toLowerCase() : "";
+}, R = (e, ...r) => s(() => {
+  const n = v(location.pathname);
+  let p = t.framework ?? {}, C = t[n] ?? {}, o = f[e] || p[e] || C[e] || d[e] || e;
   if (o === e) return e;
   typeof o == "string" && (o = { "zh-CN": o });
-  let a = o[t.value];
-  return t.value === "zh-CN" && o["zh-cn"] && !o["zh-CN"] && (a = o["zh-cn"]), r.map((w, z) => {
-    a && (a = a.replace(`$${z}`, w));
+  let a = o[m.value];
+  return m.value === "zh-CN" && o["zh-cn"] && !o["zh-CN"] && (a = o["zh-cn"]), r.map((i, k) => {
+    a && (a = a.replace(`$${k}`, i));
   }), a;
-}), P = g, S = (e, ...r) => P(e, ...r).value, D = (e) => {
-  t.value = e;
-}, L = () => t;
+}), D = R, A = (e, ...r) => D(e, ...r).value, E = (e) => {
+  m.value = e, z();
+}, I = () => m;
 export {
-  t as currentLang,
+  m as currentLang,
   d as customLangeData,
-  g as getI18nRule,
-  L as getLang,
-  P as i18n,
-  R as initI18n,
+  R as getI18nRule,
+  I as getLang,
+  D as i18n,
+  L as initI18n,
   h as setI18nRule,
-  D as setLang,
-  b as setLangRule,
-  S as t
+  E as setLang,
+  P as setLangRule,
+  A as t
 };

package/types/i18n/index.d.ts

@@ -1,3 +1,4 @@
+type langType = 'zh-CN' | 'en';
 declare const customLangeData: any;
 declare const currentLang: import('vue').Ref<any, any>;
 declare const setLangRule: (data?: any, type?: "global" | "custom") => void;
@@ -18,6 +19,6 @@ declare const i18n: (key: string, ...args: any[]) => import('vue').ComputedRef<s
  * @returns string
  */
 declare const t: (key: string, ...args: any) => string;
-declare const setLang: (lang: string) => void;
+declare const setLang: (lang: langType) => void;
 declare const getLang: () => import('vue').Ref<any, any>;
 export { initI18n, setI18nRule, getI18nRule, i18n, t, setLang, getLang, currentLang, setLangRule, customLangeData };