@das-fed/upf-web 6.4.0-dev.203 → 6.4.0-dev.204

package/index.js

@@ -1,4 +1,4 @@
-import { M as s, D as t, F as n, E as r, G as i, e as o, o as u, z as g, r as m, f as l, j as p, n as D, y as L, B as c, C as b, k as h, i as y, J as A, K as T, w as M, h as R, H as W, I as F, v as I, N as V, L as d, s as f, m as k, q as v, x as w, A as x, t as K } from "./index-DBJqJe-a.js";
+import { M as s, D as t, F as n, E as r, G as i, e as o, o as u, z as g, r as m, f as l, j as p, n as D, y as L, B as c, C as b, k as h, i as y, J as A, K as T, w as M, h as R, H as W, I as F, v as I, N as V, L as d, s as f, m as k, q as v, x as w, A as x, t as K } from "./index-BTfDckHk.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.203",
+  "version": "6.4.0-dev.204",
   "type": "module",
   "main": "./index.js",
   "dependencies": {
-    "@das-fed/upf-ui": "6.4.0-dev.203",
-    "@das-fed/upf-utils": "6.4.0-dev.203",
-    "@das-fed/upf-web": "6.4.0-dev.203",
-    "@das-fed/upf-web-components": "6.4.0-dev.203",
+    "@das-fed/upf-ui": "6.4.0-dev.204",
+    "@das-fed/upf-utils": "6.4.0-dev.204",
+    "@das-fed/upf-web": "6.4.0-dev.204",
+    "@das-fed/upf-web-components": "6.4.0-dev.204",
     "@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.203",
+    "@das-fed/upf-cli": "6.4.0-dev.204",
     "@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,89 +25,89 @@ 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 W = require('pinia-plugin-persistedstate');
+var C = require('pinia-plugin-persistedstate');
 var vueRouter = require('vue-router');
 var commonTools = require('@das-fed/upf-utils/common-tools');
 var config = require('@das-fed/upf-utils/config');
-var H = {
-    install: function install(e, n) {
-      var a;
-      var r = (a = n == null ? undefined : n.plugins) == null ? undefined : a.glob;
-      r && Object.values(r).sort(function (t, s) {
-        var _t$index, _s$index;
-        return ((_t$index = t.index) !== null && _t$index !== void 0 ? _t$index : 0) - ((_s$index = s.index) !== null && _s$index !== void 0 ? _s$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"], n), t.install && e.use(t, n);
+var q = {
+    install: function install(e, t) {
+      var s;
+      var r = (s = t == null ? undefined : t.plugins) == null ? undefined : s.glob;
+      r && Object.values(r).sort(function (a, o) {
+        var _a$index, _o$index;
+        return ((_a$index = a.index) !== null && _a$index !== void 0 ? _a$index : 0) - ((_o$index = o.index) !== null && _o$index !== void 0 ? _o$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"], t), a.install && e.use(a, t);
       });
     }
   },
-  E = pinia.createPinia();
-E.use(W);
-var P = "language",
-  A = vue.reactive({});
+  v = pinia.createPinia();
+v.use(C);
+var N = "language",
+  k = vue.reactive({});
 vue.reactive({});
 vue.reactive({});
-var K = commonTools.getUrlParams(location.href, "uiCulture") || "",
-  F = K || window.localStorage.getItem(P) || window.navigator.language || "zh-CN",
-  $ = vue.ref(F),
-  G = function G() {
+var F = commonTools.getUrlParams(location.href, "uiCulture") || "",
+  G = F || window.localStorage.getItem(N) || window.navigator.language || "zh-CN",
+  P = vue.ref(G),
+  T = function T() {
     var e = document.documentElement;
-    e && e.setAttribute("lang", $.value);
+    e && e.setAttribute("lang", P.value);
   },
-  R = function R() {
+  L = function L() {
     var e = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var n = arguments.length > 1 ? arguments[1] : undefined;
+    var t = arguments.length > 1 ? arguments[1] : undefined;
     var r = {};
-    for (var a in e) for (var t in e[a]) {
-      var _e$a$t;
-      r[t] || (r[t] = {}), r[t][a] = (_e$a$t = e[a][t]) !== null && _e$a$t !== void 0 ? _e$a$t : "", A[t] || (A[t] = {}), A[t][a] = r[t][a];
+    for (var s in e) for (var a in e[s]) {
+      var _e$s$a;
+      r[a] || (r[a] = {}), r[a][s] = (_e$s$a = e[s][a]) !== null && _e$s$a !== void 0 ? _e$s$a : "", k[a] || (k[a] = {}), k[a][s] = r[a][s];
     }
   },
-  T = function T(e) {
-    $.value = e, G();
+  J = function J(e) {
+    P.value = e, T();
   },
-  q = {
+  Q = {
     loaded: {},
-    isLoaded: function isLoaded(e) {
-      return !!this.loaded[e];
+    isLoaded: function isLoaded(e, t) {
+      return !!(this.loaded[e] && this.loaded[e][t]);
     },
-    markLoaded: function markLoaded(e) {
-      this.loaded[e] = true;
+    markLoaded: function markLoaded(e, t) {
+      this.loaded[e] || (this.loaded[e] = {}), this.loaded[e][t] = true;
     },
-    markUnloaded: function markUnloaded(e) {
-      delete this.loaded[e];
+    markUnloaded: function markUnloaded(e, t) {
+      this.loaded[e] && (delete this.loaded[e][t], Object.keys(this.loaded[e]).length === 0 && delete this.loaded[e]);
     }
   },
-  J = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(e, n) {
+  V = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(e, t) {
       var _ref2, _ref3, _ref4;
-      var d, g, l, r, a, t, s, i, f, _t;
+      var f, h, d, r, s, a, o, i, u, _t;
       return _regenerator().w(function (_context) {
         while (1) switch (_context.p = _context.n) {
           case 0:
-            r = config.getConfig() || {}, a = (_ref2 = (d = r.i18n) == null ? undefined : d.fromOss) !== null && _ref2 !== void 0 ? _ref2 : true, t = (_ref3 = (g = r.i18n) == null ? undefined : g.isPullBack) !== null && _ref3 !== void 0 ? _ref3 : false, s = (_ref4 = (l = r.i18n) == null ? undefined : l.isDasUI) !== null && _ref4 !== void 0 ? _ref4 : true;
+            r = config.getConfig() || {}, s = (_ref2 = (f = r.i18n) == null ? undefined : f.fromOss) !== null && _ref2 !== void 0 ? _ref2 : true, a = (_ref3 = (h = r.i18n) == null ? undefined : h.isPullBack) !== null && _ref3 !== void 0 ? _ref3 : false, o = (_ref4 = (d = r.i18n) == null ? undefined : d.isDasUI) !== null && _ref4 !== void 0 ? _ref4 : true;
             i = "/oss/resource/";
             _context.p = 1;
             _context.n = 2;
             return commonTools.handleI18nData({
-              baseUrl: a ? i : "/",
-              currentLang: n,
+              baseUrl: s ? i : "/",
+              currentLang: t,
               appName: e,
-              isPullBack: t,
+              isPullBack: a,
               fallbackBaseUrl: "/",
-              isDasUI: s
+              isDasUI: o
             });
           case 2:
-            f = _context.v;
-            if (!(!f || !(f != null && f.frontEnd))) {
+            u = _context.v;
+            if (!(!u || !(u != null && u.frontEnd))) {
               _context.n = 3;
               break;
             }
             throw new Error("Failed to fetch i18n data");
           case 3:
-            return _context.a(2, f);
+            return _context.a(2, u);
           case 4:
             _context.p = 4;
             _t = _context.v;
@@ -117,14 +117,14 @@ var K = commonTools.getUrlParams(location.href, "uiCulture") || "",
         }
       }, _callee, null, [[1, 4]]);
     }));
-    return function J(_x, _x2) {
+    return function V(_x, _x2) {
       return _ref.apply(this, arguments);
     };
   }(),
-  Q = /*#__PURE__*/function () {
+  X = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
       var e,
-        n,
+        t,
         r,
         _args2 = arguments,
         _t2;
@@ -132,15 +132,15 @@ var K = commonTools.getUrlParams(location.href, "uiCulture") || "",
         while (1) switch (_context2.p = _context2.n) {
           case 0:
             e = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : [];
-            n = commonTools.getUrlParams(location.href, "uiCulture") || window.localStorage.getItem(P) || window.navigator.language || "zh-CN";
+            t = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : "zh-CN";
             _context2.p = 1;
             _context2.n = 2;
-            return J(e, n);
+            return V(e, t);
           case 2:
             r = _context2.v;
-            r != null && r.frontEnd && _typeof(r.frontEnd) == "object" && Object.keys(r.frontEnd).length && e.forEach(function (a) {
-              r.frontEnd[a] && _typeof(r.frontEnd[a]) == "object" && Object.keys(r.frontEnd[a]).length && R(_defineProperty({}, n, r.frontEnd[a]));
-            }), r != null && r.dasUiEnd && _typeof(r.dasUiEnd) == "object" && Object.keys(r.dasUiEnd).length && R(_defineProperty({}, n, r.dasUiEnd)), T(n);
+            r != null && r.frontEnd && _typeof(r.frontEnd) == "object" && Object.keys(r.frontEnd).length && e.forEach(function (s) {
+              r.frontEnd[s] && _typeof(r.frontEnd[s]) == "object" && Object.keys(r.frontEnd[s]).length && L(_defineProperty({}, t, r.frontEnd[s]));
+            }), r != null && r.dasUiEnd && _typeof(r.dasUiEnd) == "object" && Object.keys(r.dasUiEnd).length && L(_defineProperty({}, t, r.dasUiEnd)), J(t);
             _context2.n = 4;
             break;
           case 3:
@@ -151,36 +151,36 @@ var K = commonTools.getUrlParams(location.href, "uiCulture") || "",
         }
       }, _callee2, null, [[1, 3]]);
     }));
-    return function Q() {
+    return function X() {
       return _ref5.apply(this, arguments);
     };
   }(),
-  V = function V(e) {
+  Y = function Y(e) {
     var _ref6;
-    var h, p, f, U, v;
-    var n = (_ref6 = (h = e == null ? undefined : e.router) == null ? undefined : h.routerBase) !== null && _ref6 !== void 0 ? _ref6 : "/",
+    var g, p, u, R, j;
+    var t = (_ref6 = (g = e == null ? undefined : e.router) == null ? undefined : g.routerBase) !== null && _ref6 !== void 0 ? _ref6 : "/",
       r = ((p = e == null ? undefined : e.router) == null ? undefined : p.options) || {};
-    var a = Object.assign(((f = e == null ? undefined : e.router) == null ? undefined : f.glob) || {});
-    var t = Object.values(a).filter(function (u) {
-        return !!u;
-      }).flat().sort(function (u, o) {
-        var _u$index, _o$index;
-        return ((_u$index = u.index) !== null && _u$index !== void 0 ? _u$index : 0) - ((_o$index = o.index) !== null && _o$index !== void 0 ? _o$index : 0);
+    var s = Object.assign(((u = e == null ? undefined : e.router) == null ? undefined : u.glob) || {});
+    var a = Object.values(s).filter(function (l) {
+        return !!l;
+      }).flat().sort(function (l, n) {
+        var _l$index, _n$index;
+        return ((_l$index = l.index) !== null && _l$index !== void 0 ? _l$index : 0) - ((_n$index = n.index) !== null && _n$index !== void 0 ? _n$index : 0);
       }),
-      s = [];
-    (U = e == null ? undefined : e.microApps) == null || U.map(function (u) {
-      var w;
-      var o = Object.values(((w = u.router) == null ? undefined : w.glob) || {}).filter(function (c) {
+      o = [];
+    (R = e == null ? undefined : e.microApps) == null || R.map(function (l) {
+      var A;
+      var n = Object.values(((A = l.router) == null ? undefined : A.glob) || {}).filter(function (c) {
         return !!c;
-      }).flat().sort(function (c, y) {
-        var _c$index, _y$index;
-        return ((_c$index = c.index) !== null && _c$index !== void 0 ? _c$index : 0) - ((_y$index = y.index) !== null && _y$index !== void 0 ? _y$index : 0);
+      }).flat().sort(function (c, w) {
+        var _c$index, _w$index;
+        return ((_c$index = c.index) !== null && _c$index !== void 0 ? _c$index : 0) - ((_w$index = w.index) !== null && _w$index !== void 0 ? _w$index : 0);
       });
-      s.push.apply(s, _toConsumableArray(o.map(function (c) {
+      o.push.apply(o, _toConsumableArray(n.map(function (c) {
         return _objectSpread(_objectSpread({}, c), {}, {
-          path: "/".concat(u.microAppName).concat(c.path)
+          path: "/".concat(l.microAppName).concat(c.path)
         });
-      }))), s.push.apply(s, _toConsumableArray(o.filter(function (c) {
+      }))), o.push.apply(o, _toConsumableArray(n.filter(function (c) {
         return !!c.path;
       }).filter(function (c) {
         return c.path !== "";
@@ -191,43 +191,43 @@ var K = commonTools.getUrlParams(location.href, "uiCulture") || "",
       }).map(function (c) {
         return {
           path: c.path,
-          redirect: "/".concat(u.microAppName).concat(c.path),
+          redirect: "/".concat(l.microAppName).concat(c.path),
           meta: _objectSpread(_objectSpread({}, c.meta || {}), {}, {
             isMicroAppRouteRedirect: true
           })
         };
       })));
     });
-    var i = ((v = e == null ? undefined : e.router) == null ? undefined : v.routers) || [],
-      d = [].concat(_toConsumableArray(k(t, e)), _toConsumableArray(k(i, e)), _toConsumableArray(k(s, e))),
-      g = vueRouter.createRouter(_objectSpread({
-        history: vueRouter.createWebHistory(n),
-        routes: d
+    var i = ((j = e == null ? undefined : e.router) == null ? undefined : j.routers) || [],
+      f = [].concat(_toConsumableArray(E(a, e)), _toConsumableArray(E(i, e)), _toConsumableArray(E(o, e))),
+      h = vueRouter.createRouter(_objectSpread({
+        history: vueRouter.createWebHistory(t),
+        routes: f
       }, r)),
-      l = q;
-    if (Array.isArray(e == null ? undefined : e.microApps) && e.microApps.length && l) {
-      var u = /* @__PURE__ */new Map();
+      d = Q;
+    if (Array.isArray(e == null ? undefined : e.microApps) && e.microApps.length && d) {
+      var l = /* @__PURE__ */new Map();
       var _iterator = _createForOfIteratorHelper(e.microApps),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var o = _step.value;
-          o != null && o.microAppName && o != null && o.i18n && u.set(o.microAppName, o.i18n);
+          var n = _step.value;
+          n != null && n.microAppName && n != null && n.i18n && l.set(n.microAppName, n.i18n);
         }
       } catch (err) {
         _iterator.e(err);
       } finally {
         _iterator.f();
       }
-      g.beforeEach(/*#__PURE__*/function () {
-        var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(o, w, c) {
-          var y, _iterator2, _step2, _step2$value, b, m, x, _t3, _t4, _t5;
+      h.beforeEach(/*#__PURE__*/function () {
+        var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(n, A, c) {
+          var w, b, $, _iterator2, _step2, _step2$value, y, m, x, _t3, _t4, _t5;
           return _regenerator().w(function (_context3) {
             while (1) switch (_context3.p = _context3.n) {
               case 0:
                 _context3.p = 0;
-                y = o.path || "";
-                _iterator2 = _createForOfIteratorHelper(u.entries());
+                b = ((w = n.query) == null ? void 0 : w.uiCulture) || window.localStorage.getItem(N) || window.navigator.language || "zh-CN", $ = n.path || "";
+                _iterator2 = _createForOfIteratorHelper(l.entries());
                 _context3.p = 1;
                 _iterator2.s();
               case 2:
@@ -235,31 +235,31 @@ var K = commonTools.getUrlParams(location.href, "uiCulture") || "",
                   _context3.n = 10;
                   break;
                 }
-                _step2$value = _slicedToArray(_step2.value, 2), b = _step2$value[0], m = _step2$value[1];
-                if (!(!b || !y.toLowerCase().startsWith("/".concat(b.toLowerCase())))) {
+                _step2$value = _slicedToArray(_step2.value, 2), y = _step2$value[0], m = _step2$value[1];
+                if (!(!y || !$.toLowerCase().startsWith("/".concat(y.toLowerCase())))) {
                   _context3.n = 3;
                   break;
                 }
                 return _context3.a(3, 9);
               case 3:
-                if (!(typeof l.isLoaded == "function" && l.isLoaded(b) || !m || !(m != null && m.length))) {
+                if (!(d.isLoaded(b, y) || !m || !(m != null && m.length))) {
                   _context3.n = 4;
                   break;
                 }
                 return _context3.a(3, 10);
               case 4:
                 x = typeof m == "string" ? [m] : m;
-                typeof l.markLoaded == "function" && l.markLoaded(b);
+                d.markLoaded(b, y);
                 _context3.p = 5;
                 _context3.n = 6;
-                return Q(x);
+                return X(x, b);
               case 6:
                 _context3.n = 8;
                 break;
               case 7:
                 _context3.p = 7;
                 _t3 = _context3.v;
-                typeof l.markUnloaded == "function" && l.markUnloaded(b);
+                d.markUnloaded(b, y);
               case 8:
                 return _context3.a(3, 10);
               case 9:
@@ -297,38 +297,38 @@ var K = commonTools.getUrlParams(location.href, "uiCulture") || "",
       }());
     }
     return {
-      router: g
+      router: h
     };
   },
-  k = function k(e, n) {
+  E = function E(e, t) {
     return e.map(function (r) {
-      var _ref8, _a$keepAlive;
-      var a = r.meta || {};
-      return a.keepAlive = (_ref8 = (_a$keepAlive = a.keepAlive) !== null && _a$keepAlive !== void 0 ? _a$keepAlive : n == null ? undefined : n.keepAlive) !== null && _ref8 !== void 0 ? _ref8 : true, _objectSpread(_objectSpread({}, r), {}, {
-        meta: a
+      var _ref8, _s$keepAlive;
+      var s = r.meta || {};
+      return s.keepAlive = (_ref8 = (_s$keepAlive = s.keepAlive) !== null && _s$keepAlive !== void 0 ? _s$keepAlive : t == null ? undefined : t.keepAlive) !== null && _ref8 !== void 0 ? _ref8 : true, _objectSpread(_objectSpread({}, r), {}, {
+        meta: s
       });
     });
   },
-  ce = function ce(e) {
-    var d;
+  oe = function oe(e) {
+    var f;
     e || (e = {});
-    var n = vue.ref(true);
+    var t = vue.ref(true);
     Promise.all([index.initTheme(e)]).then(function () {
-      n.value = false;
+      t.value = false;
     });
     var _ref9 = (e == null ? undefined : e.root) || {},
       r = _ref9.container,
-      a = _ref9.component,
-      t = _ref9.props,
-      s = vue.createApp(a || index$1.DasWebLayout, t);
-    s.use(H, e), s.use(E);
-    var _V = V(e),
-      i = _V.router;
-    return s.use(i), s.mount(r || "#app"), (d = window.top) != null && d.vueRouter || window.top && (window.top.vueRouter = i), {
-      app: s,
+      s = _ref9.component,
+      a = _ref9.props,
+      o = vue.createApp(s || index$1.DasWebLayout, a);
+    o.use(q, e), o.use(v);
+    var _Y = Y(e),
+      i = _Y.router;
+    return o.use(i), o.mount(r || "#app"), (f = window.top) != null && f.vueRouter || window.top && (window.top.vueRouter = i), {
+      app: o,
       router: i,
-      loading: n,
-      store: E
+      loading: t,
+      store: v
     };
   };
-exports.createDasWebApp = ce;
+exports.createDasWebApp = oe;