@das-fed/upf-web 6.4.0-dev.231 → 6.4.0-dev.233

package/index.js

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

package/package.json

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

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

@@ -25,51 +25,51 @@ var vue = require('vue');
 var index = require('@das-fed/upf-web/packages/theme/index/es5');
 var index$1 = require('@das-fed/upf-web/packages/layout/index/es5');
 var pinia = require('pinia');
-var D = require('pinia-plugin-persistedstate');
+var M = require('pinia-plugin-persistedstate');
 var vueRouter = require('vue-router');
 var index$2 = require('@das-fed/upf-web/packages/i18n/index/es5');
-var I = {
+var U = {
     install: function install(e, u) {
       var l;
-      var f = (l = u == null ? undefined : u.plugins) == null ? undefined : l.glob;
-      f && Object.values(f).sort(function (t, c) {
-        var _t$index, _c$index;
-        return ((_t$index = t.index) !== null && _t$index !== void 0 ? _t$index : 0) - ((_c$index = c.index) !== null && _c$index !== void 0 ? _c$index : 0);
-      }).filter(function (t) {
-        return t ? !!(t["default"] && t["default"].install || t.install) : false;
-      }).forEach(function (t) {
-        t["default"] && t["default"].install && e.use(t["default"], u), t.install && e.use(t, u);
+      var s = (l = u == null ? undefined : u.plugins) == null ? undefined : l.glob;
+      s && Object.values(s).sort(function (a, c) {
+        var _a$index, _c$index;
+        return ((_a$index = a.index) !== null && _a$index !== void 0 ? _a$index : 0) - ((_c$index = c.index) !== null && _c$index !== void 0 ? _c$index : 0);
+      }).filter(function (a) {
+        return a ? !!(a["default"] && a["default"].install || a.install) : false;
+      }).forEach(function (a) {
+        a["default"] && a["default"].install && e.use(a["default"], u), a.install && e.use(a, u);
       });
     }
   },
-  b = pinia.createPinia();
-b.use(D);
+  A = pinia.createPinia();
+A.use(M);
 var q = function q(e) {
     var _ref;
-    var y, R, v, k, x;
+    var y, R, v, k, $;
     var u = (_ref = (y = e == null ? undefined : e.router) == null ? undefined : y.routerBase) !== null && _ref !== void 0 ? _ref : "/",
-      f = ((R = e == null ? undefined : e.router) == null ? undefined : R.options) || {};
+      s = ((R = e == null ? undefined : e.router) == null ? undefined : R.options) || {};
     var l = Object.assign(((v = e == null ? undefined : e.router) == null ? undefined : v.glob) || {});
-    var t = Object.values(l).filter(function (n) {
+    var a = Object.values(l).filter(function (n) {
         return !!n;
-      }).flat().sort(function (n, a) {
-        var _n$index, _a$index;
-        return ((_n$index = n.index) !== null && _n$index !== void 0 ? _n$index : 0) - ((_a$index = a.index) !== null && _a$index !== void 0 ? _a$index : 0);
+      }).flat().sort(function (n, t) {
+        var _n$index, _t$index;
+        return ((_n$index = n.index) !== null && _n$index !== void 0 ? _n$index : 0) - ((_t$index = t.index) !== null && _t$index !== void 0 ? _t$index : 0);
       }),
       c = [];
     (k = e == null ? undefined : e.microApps) == null || k.map(function (n) {
       var g;
-      var a = Object.values(((g = n.router) == null ? undefined : g.glob) || {}).filter(function (r) {
+      var t = Object.values(((g = n.router) == null ? undefined : g.glob) || {}).filter(function (r) {
         return !!r;
       }).flat().sort(function (r, p) {
         var _r$index, _p$index;
         return ((_r$index = r.index) !== null && _r$index !== void 0 ? _r$index : 0) - ((_p$index = p.index) !== null && _p$index !== void 0 ? _p$index : 0);
       });
-      c.push.apply(c, _toConsumableArray(a.map(function (r) {
+      c.push.apply(c, _toConsumableArray(t.map(function (r) {
         return _objectSpread(_objectSpread({}, r), {}, {
           path: "/".concat(n.microAppName).concat(r.path)
         });
-      }))), c.push.apply(c, _toConsumableArray(a.filter(function (r) {
+      }))), c.push.apply(c, _toConsumableArray(t.filter(function (r) {
         return !!r.path;
       }).filter(function (r) {
         return r.path !== "";
@@ -87,12 +87,12 @@ var q = function q(e) {
         };
       })));
     });
-    var i = ((x = e == null ? undefined : e.router) == null ? undefined : x.routers) || [],
-      d = [].concat(_toConsumableArray(A(t, e)), _toConsumableArray(A(i, e)), _toConsumableArray(A(c, e))),
+    var o = (($ = e == null ? undefined : e.router) == null ? undefined : $.routers) || [],
+      d = [].concat(_toConsumableArray(b(a, e)), _toConsumableArray(b(o, e)), _toConsumableArray(b(c, e))),
       w = vueRouter.createRouter(_objectSpread({
         history: vueRouter.createWebHistory(u),
         routes: d
-      }, f)),
+      }, s)),
       h = index$2.microI18nStore;
     if (Array.isArray(e == null ? undefined : e.microApps) && e.microApps.length && h) {
       var n = /* @__PURE__ */new Map();
@@ -100,8 +100,8 @@ var q = function q(e) {
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var a = _step.value;
-          a != null && a.microAppName && a != null && a.i18n && n.set(a.microAppName, a.i18n);
+          var t = _step.value;
+          t != null && t.microAppName && t != null && t.i18n && n.set(t.microAppName, t.i18n);
         }
       } catch (err) {
         _iterator.e(err);
@@ -109,13 +109,13 @@ var q = function q(e) {
         _iterator.f();
       }
       w.beforeEach(/*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(a, g, r) {
-          var p, m, $, _iterator2, _step2, _step2$value, o, s, L, _t, _t2, _t3;
+        var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(t, g, r) {
+          var p, m, L, _iterator2, _step2, _step2$value, i, f, N, x, _t, _t2, _t3;
           return _regenerator().w(function (_context) {
             while (1) switch (_context.p = _context.n) {
               case 0:
                 _context.p = 0;
-                m = ((p = a.query) == null ? void 0 : p.lang) || window.localStorage.getItem(index$2.languageKey) || window.navigator.language || "zh-CN", $ = a.path || "";
+                m = ((p = t.query) == null ? void 0 : p.lang) || window.localStorage.getItem(index$2.languageKey) || window.navigator.language || "zh-CN", L = t.path || "";
                 _iterator2 = _createForOfIteratorHelper(n.entries());
                 _context.p = 1;
                 _iterator2.s();
@@ -124,31 +124,32 @@ var q = function q(e) {
                   _context.n = 10;
                   break;
                 }
-                _step2$value = _slicedToArray(_step2.value, 2), o = _step2$value[0], s = _step2$value[1];
-                if (!(!o || !$.toLowerCase().startsWith("/".concat(o.toLowerCase())))) {
+                _step2$value = _slicedToArray(_step2.value, 2), i = _step2$value[0], f = _step2$value[1];
+                if (!(!i || !L.toLowerCase().startsWith("/".concat(i.toLowerCase())))) {
                   _context.n = 3;
                   break;
                 }
                 return _context.a(3, 9);
               case 3:
-                if (!(h.isLoaded(m, o) || !s || !(s != null && s.length))) {
+                if (!(h.isLoaded(m, i) || !f || !(f != null && f.length))) {
                   _context.n = 4;
                   break;
                 }
                 return _context.a(3, 10);
               case 4:
-                L = typeof s == "string" ? [s] : s;
-                h.markLoaded(m, o);
+                N = typeof f == "string" ? [f] : f;
+                h.markLoaded(m, i);
                 _context.p = 5;
+                x = "/web/".concat(i, "/");
                 _context.n = 6;
-                return index$2.registerMicroI18nData(L, m);
+                return index$2.registerMicroI18nData(N, m, x);
               case 6:
                 _context.n = 8;
                 break;
               case 7:
                 _context.p = 7;
                 _t = _context.v;
-                h.markUnloaded(m, o);
+                h.markUnloaded(m, i);
               case 8:
                 return _context.a(3, 10);
               case 9:
@@ -189,11 +190,11 @@ var q = function q(e) {
       router: w
     };
   },
-  A = function A(e, u) {
-    return e.map(function (f) {
+  b = function b(e, u) {
+    return e.map(function (s) {
       var _ref3, _l$keepAlive;
-      var l = f.meta || {};
-      return l.keepAlive = (_ref3 = (_l$keepAlive = l.keepAlive) !== null && _l$keepAlive !== void 0 ? _l$keepAlive : u == null ? undefined : u.keepAlive) !== null && _ref3 !== void 0 ? _ref3 : true, _objectSpread(_objectSpread({}, f), {}, {
+      var l = s.meta || {};
+      return l.keepAlive = (_ref3 = (_l$keepAlive = l.keepAlive) !== null && _l$keepAlive !== void 0 ? _l$keepAlive : u == null ? undefined : u.keepAlive) !== null && _ref3 !== void 0 ? _ref3 : true, _objectSpread(_objectSpread({}, s), {}, {
         meta: l
       });
     });
@@ -206,18 +207,18 @@ var q = function q(e) {
       u.value = false;
     });
     var _ref4 = (e == null ? undefined : e.root) || {},
-      f = _ref4.container,
+      s = _ref4.container,
       l = _ref4.component,
-      t = _ref4.props,
-      c = vue.createApp(l || index$1.DasWebLayout, t);
-    c.use(I, e), c.use(b);
+      a = _ref4.props,
+      c = vue.createApp(l || index$1.DasWebLayout, a);
+    c.use(U, e), c.use(A);
     var _q = q(e),
-      i = _q.router;
-    return c.use(i), c.mount(f || "#app"), (d = window.top) != null && d.vueRouter || window.top && (window.top.vueRouter = i), {
+      o = _q.router;
+    return c.use(o), c.mount(s || "#app"), (d = window.top) != null && d.vueRouter || window.top && (window.top.vueRouter = o), {
       app: c,
-      router: i,
+      router: o,
       loading: u,
-      store: b
+      store: A
     };
   };
 exports.createDasWebApp = Q;

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

@@ -1,60 +1,61 @@
-import { ref as N, createApp as W } from "vue";
-import { initTheme as O } from "@das-fed/upf-web/packages/theme/index";
-import { DasWebLayout as P } from "@das-fed/upf-web/packages/layout/index";
-import { createPinia as j } from "pinia";
-import D from "pinia-plugin-persistedstate";
-import { createRouter as M, createWebHistory as C } from "vue-router";
-import { languageKey as S, registerMicroI18nData as B, microI18nStore as E } from "@das-fed/upf-web/packages/i18n/index";
-const I = {
+import { ref as W, createApp as O } from "vue";
+import { initTheme as P } from "@das-fed/upf-web/packages/theme/index";
+import { DasWebLayout as j } from "@das-fed/upf-web/packages/layout/index";
+import { createPinia as D } from "pinia";
+import M from "pinia-plugin-persistedstate";
+import { createRouter as B, createWebHistory as C } from "vue-router";
+import { languageKey as S, registerMicroI18nData as E, microI18nStore as I } from "@das-fed/upf-web/packages/i18n/index";
+const U = {
   install: (e, u) => {
     var l;
-    const f = (l = u == null ? void 0 : u.plugins) == null ? void 0 : l.glob;
-    f && Object.values(f).sort((t, c) => (t.index ?? 0) - (c.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);
+    const s = (l = u == null ? void 0 : u.plugins) == null ? void 0 : l.glob;
+    s && Object.values(s).sort((a, c) => (a.index ?? 0) - (c.index ?? 0)).filter((a) => a ? !!(a.default && a.default.install || a.install) : !1).forEach((a) => {
+      a.default && a.default.install && e.use(a.default, u), a.install && e.use(a, u);
     });
   }
-}, b = j();
-b.use(D);
+}, A = D();
+A.use(M);
 const q = (e) => {
-  var y, R, v, k, x;
-  const u = ((y = e == null ? void 0 : e.router) == null ? void 0 : y.routerBase) ?? "/", f = ((R = e == null ? void 0 : e.router) == null ? void 0 : R.options) || {};
+  var y, R, v, k, $;
+  const u = ((y = e == null ? void 0 : e.router) == null ? void 0 : y.routerBase) ?? "/", s = ((R = e == null ? void 0 : e.router) == null ? void 0 : R.options) || {};
   let l = Object.assign(((v = e == null ? void 0 : e.router) == null ? void 0 : v.glob) || {});
-  const t = Object.values(l).filter((n) => !!n).flat().sort((n, a) => (n.index ?? 0) - (a.index ?? 0)), c = [];
+  const a = Object.values(l).filter((n) => !!n).flat().sort((n, t) => (n.index ?? 0) - (t.index ?? 0)), c = [];
   (k = e == null ? void 0 : e.microApps) == null || k.map((n) => {
     var g;
-    const a = Object.values(((g = n.router) == null ? void 0 : g.glob) || {}).filter((r) => !!r).flat().sort((r, p) => (r.index ?? 0) - (p.index ?? 0));
+    const t = Object.values(((g = n.router) == null ? void 0 : g.glob) || {}).filter((r) => !!r).flat().sort((r, p) => (r.index ?? 0) - (p.index ?? 0));
     c.push(
-      ...a.map((r) => ({ ...r, path: `/${n.microAppName}${r.path}` }))
+      ...t.map((r) => ({ ...r, path: `/${n.microAppName}${r.path}` }))
     ), c.push(
-      ...a.filter((r) => !!r.path).filter((r) => r.path !== "").filter((r) => r.path !== "/").filter((r) => !r.path.startsWith(`/${r.microAppName}`)).map((r) => ({
+      ...t.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: `/${n.microAppName}${r.path}`,
         meta: { ...r.meta || {}, isMicroAppRouteRedirect: !0 }
       }))
     );
   });
-  const i = ((x = e == null ? void 0 : e.router) == null ? void 0 : x.routers) || [], d = [
-    ...A(t, e),
-    ...A(i, e),
-    ...A(c, e)
-  ], w = M({ history: C(u), routes: d, ...f }), h = E;
+  const o = (($ = e == null ? void 0 : e.router) == null ? void 0 : $.routers) || [], d = [
+    ...b(a, e),
+    ...b(o, e),
+    ...b(c, e)
+  ], w = B({ history: C(u), routes: d, ...s }), h = I;
   if (Array.isArray(e == null ? void 0 : e.microApps) && e.microApps.length && h) {
     const n = /* @__PURE__ */ new Map();
-    for (const a of e.microApps)
-      a != null && a.microAppName && (a != null && a.i18n) && n.set(a.microAppName, a.i18n);
-    w.beforeEach(async (a, g, r) => {
+    for (const t of e.microApps)
+      t != null && t.microAppName && (t != null && t.i18n) && n.set(t.microAppName, t.i18n);
+    w.beforeEach(async (t, g, r) => {
       var p;
       try {
-        const m = ((p = a.query) == null ? void 0 : p.lang) || window.localStorage.getItem(S) || window.navigator.language || "zh-CN", $ = a.path || "";
-        for (const [o, s] of n.entries()) {
-          if (!o || !$.toLowerCase().startsWith(`/${o.toLowerCase()}`)) continue;
-          if (h.isLoaded(m, o) || !s || !(s != null && s.length)) break;
-          const L = typeof s == "string" ? [s] : s;
-          h.markLoaded(m, o);
+        const m = ((p = t.query) == null ? void 0 : p.lang) || window.localStorage.getItem(S) || window.navigator.language || "zh-CN", L = t.path || "";
+        for (const [i, f] of n.entries()) {
+          if (!i || !L.toLowerCase().startsWith(`/${i.toLowerCase()}`)) continue;
+          if (h.isLoaded(m, i) || !f || !(f != null && f.length)) break;
+          const N = typeof f == "string" ? [f] : f;
+          h.markLoaded(m, i);
           try {
-            await B(L, m);
+            const x = `/web/${i}/`;
+            await E(N, m, x);
           } catch {
-            h.markUnloaded(m, o);
+            h.markUnloaded(m, i);
           }
           break;
         }
@@ -65,20 +66,20 @@ const q = (e) => {
     });
   }
   return { router: w };
-}, A = (e, u) => e.map((f) => {
-  const l = f.meta || {};
-  return l.keepAlive = l.keepAlive ?? (u == null ? void 0 : u.keepAlive) ?? !0, { ...f, meta: l };
+}, b = (e, u) => e.map((s) => {
+  const l = s.meta || {};
+  return l.keepAlive = l.keepAlive ?? (u == null ? void 0 : u.keepAlive) ?? !0, { ...s, meta: l };
 }), Q = (e) => {
   var d;
   e || (e = {});
-  const u = N(!0);
-  Promise.all([O(e)]).then(() => {
+  const u = W(!0);
+  Promise.all([P(e)]).then(() => {
     u.value = !1;
   });
-  const { container: f, component: l, props: t } = (e == null ? void 0 : e.root) || {}, c = W(l || P, t);
-  c.use(I, e), c.use(b);
-  const { router: i } = q(e);
-  return c.use(i), c.mount(f || "#app"), (d = window.top) != null && d.vueRouter || window.top && (window.top.vueRouter = i), { app: c, router: i, loading: u, store: b };
+  const { container: s, component: l, props: a } = (e == null ? void 0 : e.root) || {}, c = O(l || j, a);
+  c.use(U, e), c.use(A);
+  const { router: o } = q(e);
+  return c.use(o), c.mount(s || "#app"), (d = window.top) != null && d.vueRouter || window.top && (window.top.vueRouter = o), { app: c, router: o, loading: u, store: A };
 };
 export {
   Q as createDasWebApp