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

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

@@ -32,13 +32,13 @@ var U = {
     install: function install(e, u) {
       var l;
       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);
+      s && Object.values(s).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);
       });
     }
   },
@@ -50,26 +50,26 @@ var q = function q(e) {
     var u = (_ref = (y = e == null ? undefined : e.router) == null ? undefined : y.routerBase) !== null && _ref !== void 0 ? _ref : "/",
       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 a = Object.values(l).filter(function (n) {
+    var t = Object.values(l).filter(function (n) {
         return !!n;
-      }).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);
+      }).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);
       }),
       c = [];
     (k = e == null ? undefined : e.microApps) == null || k.map(function (n) {
       var g;
-      var t = Object.values(((g = n.router) == null ? undefined : g.glob) || {}).filter(function (r) {
+      var a = 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(t.map(function (r) {
+      c.push.apply(c, _toConsumableArray(a.map(function (r) {
         return _objectSpread(_objectSpread({}, r), {}, {
           path: "/".concat(n.microAppName).concat(r.path)
         });
-      }))), c.push.apply(c, _toConsumableArray(t.filter(function (r) {
+      }))), c.push.apply(c, _toConsumableArray(a.filter(function (r) {
         return !!r.path;
       }).filter(function (r) {
         return r.path !== "";
@@ -88,7 +88,7 @@ var q = function q(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))),
+      d = [].concat(_toConsumableArray(b(t, e)), _toConsumableArray(b(o, e)), _toConsumableArray(b(c, e))),
       w = vueRouter.createRouter(_objectSpread({
         history: vueRouter.createWebHistory(u),
         routes: d
@@ -100,8 +100,8 @@ var q = function q(e) {
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var t = _step.value;
-          t != null && t.microAppName && t != null && t.i18n && n.set(t.microAppName, t.i18n);
+          var a = _step.value;
+          a != null && a.microAppName && a != null && a.i18n && n.set(a.microAppName, a.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(t, g, r) {
+        var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(a, 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 = t.query) == null ? void 0 : p.lang) || window.localStorage.getItem(index$2.languageKey) || window.navigator.language || "zh-CN", L = t.path || "";
+                m = ((p = a.query) == null ? void 0 : p.lang) || window.localStorage.getItem(index$2.languageKey) || window.navigator.language || "zh-CN", L = a.path || "";
                 _iterator2 = _createForOfIteratorHelper(n.entries());
                 _context.p = 1;
                 _iterator2.s();
@@ -140,7 +140,7 @@ var q = function q(e) {
                 N = typeof f == "string" ? [f] : f;
                 h.markLoaded(m, i);
                 _context.p = 5;
-                x = "/web/".concat(i, "/");
+                x = "/web/".concat(i.split("/")[1], "/");
                 _context.n = 6;
                 return index$2.registerMicroI18nData(N, m, x);
               case 6:
@@ -209,8 +209,8 @@ var q = function q(e) {
     var _ref4 = (e == null ? undefined : e.root) || {},
       s = _ref4.container,
       l = _ref4.component,
-      a = _ref4.props,
-      c = vue.createApp(l || index$1.DasWebLayout, a);
+      t = _ref4.props,
+      c = vue.createApp(l || index$1.DasWebLayout, t);
     c.use(U, e), c.use(A);
     var _q = q(e),
       o = _q.router;

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

@@ -9,8 +9,8 @@ const U = {
   install: (e, u) => {
     var l;
     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);
+    s && Object.values(s).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);
     });
   }
 }, A = D();
@@ -19,14 +19,14 @@ const q = (e) => {
   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 a = Object.values(l).filter((n) => !!n).flat().sort((n, t) => (n.index ?? 0) - (t.index ?? 0)), c = [];
+  const t = Object.values(l).filter((n) => !!n).flat().sort((n, a) => (n.index ?? 0) - (a.index ?? 0)), c = [];
   (k = e == null ? void 0 : e.microApps) == null || k.map((n) => {
     var g;
-    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));
+    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));
     c.push(
-      ...t.map((r) => ({ ...r, path: `/${n.microAppName}${r.path}` }))
+      ...a.map((r) => ({ ...r, path: `/${n.microAppName}${r.path}` }))
     ), c.push(
-      ...t.filter((r) => !!r.path).filter((r) => r.path !== "").filter((r) => r.path !== "/").filter((r) => !r.path.startsWith(`/${r.microAppName}`)).map((r) => ({
+      ...a.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 }
@@ -34,25 +34,25 @@ const q = (e) => {
     );
   });
   const o = (($ = e == null ? void 0 : e.router) == null ? void 0 : $.routers) || [], d = [
-    ...b(a, e),
+    ...b(t, 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 t of e.microApps)
-      t != null && t.microAppName && (t != null && t.i18n) && n.set(t.microAppName, t.i18n);
-    w.beforeEach(async (t, g, r) => {
+    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) => {
       var p;
       try {
-        const m = ((p = t.query) == null ? void 0 : p.lang) || window.localStorage.getItem(S) || window.navigator.language || "zh-CN", L = t.path || "";
+        const m = ((p = a.query) == null ? void 0 : p.lang) || window.localStorage.getItem(S) || window.navigator.language || "zh-CN", L = a.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 {
-            const x = `/web/${i}/`;
+            const x = `/web/${i.split("/")[1]}/`;
             await E(N, m, x);
           } catch {
             h.markUnloaded(m, i);
@@ -76,7 +76,7 @@ const q = (e) => {
   Promise.all([P(e)]).then(() => {
     u.value = !1;
   });
-  const { container: s, component: l, props: a } = (e == null ? void 0 : e.root) || {}, c = O(l || j, a);
+  const { container: s, component: l, props: t } = (e == null ? void 0 : e.root) || {}, c = O(l || j, t);
   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 };