@das-fed/upf-web 6.4.0-hot.4 → 6.4.0-hot.5

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-DTDqZtIi.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-DigREEzd.js";
 export {
   s as DasMainAppLayout,
   t as DasWebLayout,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@das-fed/upf-web",
-  "version": "6.4.0-hot.4",
+  "version": "6.4.0-hot.5",
   "type": "module",
   "main": "./index.js",
   "dependencies": {
-    "@das-fed/upf-ui": "6.4.0-hot.4",
-    "@das-fed/upf-utils": "6.4.0-hot.4",
-    "@das-fed/upf-web": "6.4.0-hot.4",
-    "@das-fed/upf-web-components": "6.4.0-hot.4",
+    "@das-fed/upf-ui": "6.4.0-hot.5",
+    "@das-fed/upf-utils": "6.4.0-hot.5",
+    "@das-fed/upf-web": "6.4.0-hot.5",
+    "@das-fed/upf-web-components": "6.4.0-hot.5",
     "@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-hot.4",
+    "@das-fed/upf-cli": "6.4.0-hot.5",
     "@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

@@ -5,14 +5,14 @@ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructur
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -25,17 +25,17 @@ 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 S = require('pinia-plugin-persistedstate');
+var W = 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 F = {
+var q = {
     install: function install(e, t) {
       var o;
       var r = (o = t == null ? undefined : t.plugins) == null ? undefined : o.glob;
-      r && Object.values(r).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);
+      r && Object.values(r).sort(function (a, l) {
+        var _a$index, _l$index;
+        return ((_a$index = a.index) !== null && _a$index !== void 0 ? _a$index : 0) - ((_l$index = l.index) !== null && _l$index !== void 0 ? _l$index : 0);
       }).filter(function (a) {
         return a ? !!(a["default"] && a["default"].install || a.install) : false;
       }).forEach(function (a) {
@@ -43,32 +43,32 @@ var F = {
       });
     }
   },
-  v = pinia.createPinia();
-v.use(S);
-var $ = "language",
-  y = vue.reactive({}),
-  G = vue.reactive({});
+  R = pinia.createPinia();
+R.use(W);
+var L = "language",
+  w = vue.reactive({}),
+  F = vue.reactive({});
 vue.reactive({});
-var T = commonTools.getUrlParams(location.href, "uiCulture") || "",
-  J = T || window.localStorage.getItem($) || window.navigator.language || "zh-CN",
-  R = vue.ref(J),
-  Q = function Q() {
+var G = commonTools.getUrlParams(location.href, "uiCulture") || "",
+  T = G || window.localStorage.getItem(L) || window.navigator.language || "zh-CN",
+  v = vue.ref(T),
+  J = function J() {
     var e = document.documentElement;
-    e && e.setAttribute("lang", R.value);
+    e && e.setAttribute("lang", v.value);
   },
-  j = function j() {
+  Q = function Q() {
     var e = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var t = arguments.length > 1 ? arguments[1] : undefined;
     console.log("setLangRule===", e, t);
     var r = {};
     for (var o in e) for (var a in e[o]) {
       var _e$o$a;
-      r[a] || (r[a] = {}), r[a][o] = (_e$o$a = e[o][a]) !== null && _e$o$a !== void 0 ? _e$o$a : "", y[a] || (y[a] = {}), y[a][o] = r[a][o];
+      r[a] || (r[a] = {}), r[a][o] = (_e$o$a = e[o][a]) !== null && _e$o$a !== void 0 ? _e$o$a : "", w[a] || (w[a] = {}, console.log("".concat(w[a], "\u4E3A\u7A7A\uFF0C\u91CD\u65B0\u8BBE\u7F6E\u4E3A{}"))), w[a][o] = r[a][o];
     }
-    console.log("customLangeData===", y), console.log("globalLangeData===", G);
+    console.log("customLangeData===", w), console.log("globalLangeData===", F);
   },
   V = function V(e) {
-    R.value = e, console.log("currentLang.value===", R.value), Q();
+    v.value = e, console.log("currentLang.value===", v.value), J();
   },
   X = {
     loaded: {},
@@ -85,31 +85,31 @@ var T = commonTools.getUrlParams(location.href, "uiCulture") || "",
   Y = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(e, t) {
       var _ref2, _ref3, _ref4;
-      var f, b, d, r, o, a, c, i, u, _t;
+      var f, b, d, r, o, a, l, u, i, _t;
       return _regenerator().w(function (_context) {
         while (1) switch (_context.p = _context.n) {
           case 0:
-            r = config.getConfig() || {}, o = (_ref2 = (f = r.i18n) == null ? undefined : f.fromOss) !== null && _ref2 !== void 0 ? _ref2 : true, a = (_ref3 = (b = r.i18n) == null ? undefined : b.isPullBack) !== null && _ref3 !== void 0 ? _ref3 : false, c = (_ref4 = (d = r.i18n) == null ? undefined : d.isDasUI) !== null && _ref4 !== void 0 ? _ref4 : true;
-            i = "/oss/resource/";
+            r = config.getConfig() || {}, o = (_ref2 = (f = r.i18n) == null ? undefined : f.fromOss) !== null && _ref2 !== void 0 ? _ref2 : true, a = (_ref3 = (b = r.i18n) == null ? undefined : b.isPullBack) !== null && _ref3 !== void 0 ? _ref3 : false, l = (_ref4 = (d = r.i18n) == null ? undefined : d.isDasUI) !== null && _ref4 !== void 0 ? _ref4 : true;
+            u = "/oss/resource/";
             _context.p = 1;
             _context.n = 2;
             return commonTools.handleI18nData({
-              baseUrl: o ? i : "/",
+              baseUrl: o ? u : "/",
               currentLang: t,
               appName: e,
               isPullBack: a,
               fallbackBaseUrl: "/",
-              isDasUI: c
+              isDasUI: l
             });
           case 2:
-            u = _context.v;
-            if (!(!u || !(u != null && u.frontEnd))) {
+            i = _context.v;
+            if (!(!i || !(i != null && i.frontEnd))) {
               _context.n = 3;
               break;
             }
             throw new Error("Failed to fetch i18n data");
           case 3:
-            return _context.a(2, u);
+            return _context.a(2, i);
           case 4:
             _context.p = 4;
             _t = _context.v;
@@ -128,6 +128,7 @@ var T = commonTools.getUrlParams(location.href, "uiCulture") || "",
       var e,
         t,
         r,
+        o,
         _args2 = arguments,
         _t2;
       return _regenerator().w(function (_context2) {
@@ -137,14 +138,15 @@ var T = commonTools.getUrlParams(location.href, "uiCulture") || "",
             t = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : "zh-CN";
             console.log("registerMicroI18nData===", e, t);
             _context2.p = 1;
-            V(t);
             _context2.n = 2;
             return Y(e, t);
           case 2:
             r = _context2.v;
-            console.log("i18nData===", r), r != null && r.frontEnd && _typeof(r.frontEnd) == "object" && Object.keys(r.frontEnd).length && e.forEach(function (o) {
-              r.frontEnd[o] && _typeof(r.frontEnd[o]) == "object" && Object.keys(r.frontEnd[o]).length ? j(_defineProperty({}, t, r.frontEnd[o])) : console.warn("No front-end i18n data found for app: ".concat(o));
-            }), r != null && r.dasUiEnd && _typeof(r.dasUiEnd) == "object" && Object.keys(r.dasUiEnd).length && j(_defineProperty({}, t, r.dasUiEnd));
+            console.log("i18nData===", r);
+            o = {};
+            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 ? o[t] = _objectSpread(_objectSpread({}, o[t] || {}), r.frontEnd[a]) : console.warn("No front-end i18n data found for app: ".concat(a));
+            }), r != null && r.dasUiEnd && _typeof(r.dasUiEnd) == "object" && Object.keys(r.dasUiEnd).length && (o[t] = _objectSpread(_objectSpread({}, o[t] || {}), r.dasUiEnd)), o[t] && Object.keys(o[t]).length && Q(o), V(t);
             _context2.n = 4;
             break;
           case 3:
@@ -162,62 +164,62 @@ var T = commonTools.getUrlParams(location.href, "uiCulture") || "",
   }(),
   _ = function _(e) {
     var _ref6;
-    var p, A, u, U, D;
+    var p, A, i, j, D;
     var t = (_ref6 = (p = e == null ? undefined : e.router) == null ? undefined : p.routerBase) !== null && _ref6 !== void 0 ? _ref6 : "/",
       r = ((A = e == null ? undefined : e.router) == null ? undefined : A.options) || {};
-    var o = Object.assign(((u = e == null ? undefined : e.router) == null ? undefined : u.glob) || {});
-    var a = Object.values(o).filter(function (l) {
-        return !!l;
-      }).flat().sort(function (l, s) {
-        var _l$index, _s$index;
-        return ((_l$index = l.index) !== null && _l$index !== void 0 ? _l$index : 0) - ((_s$index = s.index) !== null && _s$index !== void 0 ? _s$index : 0);
+    var o = Object.assign(((i = e == null ? undefined : e.router) == null ? undefined : i.glob) || {});
+    var a = Object.values(o).filter(function (c) {
+        return !!c;
+      }).flat().sort(function (c, n) {
+        var _c$index, _n$index;
+        return ((_c$index = c.index) !== null && _c$index !== void 0 ? _c$index : 0) - ((_n$index = n.index) !== null && _n$index !== void 0 ? _n$index : 0);
       }),
-      c = [];
-    (U = e == null ? undefined : e.microApps) == null || U.map(function (l) {
-      var E;
-      var s = Object.values(((E = l.router) == null ? undefined : E.glob) || {}).filter(function (n) {
-        return !!n;
-      }).flat().sort(function (n, w) {
-        var _n$index, _w$index;
-        return ((_n$index = n.index) !== null && _n$index !== void 0 ? _n$index : 0) - ((_w$index = w.index) !== null && _w$index !== void 0 ? _w$index : 0);
+      l = [];
+    (j = e == null ? undefined : e.microApps) == null || j.map(function (c) {
+      var k;
+      var n = Object.values(((k = c.router) == null ? undefined : k.glob) || {}).filter(function (s) {
+        return !!s;
+      }).flat().sort(function (s, y) {
+        var _s$index, _y$index;
+        return ((_s$index = s.index) !== null && _s$index !== void 0 ? _s$index : 0) - ((_y$index = y.index) !== null && _y$index !== void 0 ? _y$index : 0);
       });
-      c.push.apply(c, _toConsumableArray(s.map(function (n) {
-        return _objectSpread(_objectSpread({}, n), {}, {
-          path: "/".concat(l.microAppName).concat(n.path)
+      l.push.apply(l, _toConsumableArray(n.map(function (s) {
+        return _objectSpread(_objectSpread({}, s), {}, {
+          path: "/".concat(c.microAppName).concat(s.path)
         });
-      }))), c.push.apply(c, _toConsumableArray(s.filter(function (n) {
-        return !!n.path;
-      }).filter(function (n) {
-        return n.path !== "";
-      }).filter(function (n) {
-        return n.path !== "/";
-      }).filter(function (n) {
-        return !n.path.startsWith("/".concat(n.microAppName));
-      }).map(function (n) {
+      }))), l.push.apply(l, _toConsumableArray(n.filter(function (s) {
+        return !!s.path;
+      }).filter(function (s) {
+        return s.path !== "";
+      }).filter(function (s) {
+        return s.path !== "/";
+      }).filter(function (s) {
+        return !s.path.startsWith("/".concat(s.microAppName));
+      }).map(function (s) {
         return {
-          path: n.path,
-          redirect: "/".concat(l.microAppName).concat(n.path),
-          meta: _objectSpread(_objectSpread({}, n.meta || {}), {}, {
+          path: s.path,
+          redirect: "/".concat(c.microAppName).concat(s.path),
+          meta: _objectSpread(_objectSpread({}, s.meta || {}), {}, {
             isMicroAppRouteRedirect: true
           })
         };
       })));
     });
-    var i = ((D = e == null ? undefined : e.router) == null ? undefined : D.routers) || [],
-      f = [].concat(_toConsumableArray(k(a, e)), _toConsumableArray(k(i, e)), _toConsumableArray(k(c, e))),
+    var u = ((D = e == null ? undefined : e.router) == null ? undefined : D.routers) || [],
+      f = [].concat(_toConsumableArray(E(a, e)), _toConsumableArray(E(u, e)), _toConsumableArray(E(l, e))),
       b = vueRouter.createRouter(_objectSpread({
         history: vueRouter.createWebHistory(t),
         routes: f
       }, r)),
       d = X;
     if (Array.isArray(e == null ? undefined : e.microApps) && e.microApps.length && d) {
-      var l = /* @__PURE__ */new Map();
+      var c = /* @__PURE__ */new Map();
       var _iterator = _createForOfIteratorHelper(e.microApps),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var s = _step.value;
-          s != null && s.microAppName && s != null && s.i18n && l.set(s.microAppName, s.i18n);
+          var n = _step.value;
+          n != null && n.microAppName && n != null && n.i18n && c.set(n.microAppName, n.i18n);
         }
       } catch (err) {
         _iterator.e(err);
@@ -225,14 +227,14 @@ var T = commonTools.getUrlParams(location.href, "uiCulture") || "",
         _iterator.f();
       }
       b.beforeEach(/*#__PURE__*/function () {
-        var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(s, E, n) {
-          var w, g, I, _iterator2, _step2, _step2$value, h, m, N, _t3, _t4, _t5;
+        var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(n, k, s) {
+          var y, h, $, _iterator2, _step2, _step2$value, g, m, I, _t3, _t4, _t5;
           return _regenerator().w(function (_context3) {
             while (1) switch (_context3.p = _context3.n) {
               case 0:
                 _context3.p = 0;
-                g = ((w = s.query) == null ? void 0 : w.uiCulture) || window.localStorage.getItem($) || window.navigator.language || "zh-CN", I = s.path || "";
-                _iterator2 = _createForOfIteratorHelper(l.entries());
+                h = ((y = n.query) == null ? void 0 : y.uiCulture) || window.localStorage.getItem(L) || window.navigator.language || "zh-CN", $ = n.path || "";
+                _iterator2 = _createForOfIteratorHelper(c.entries());
                 _context3.p = 1;
                 _iterator2.s();
               case 2:
@@ -240,31 +242,31 @@ var T = commonTools.getUrlParams(location.href, "uiCulture") || "",
                   _context3.n = 10;
                   break;
                 }
-                _step2$value = _slicedToArray(_step2.value, 2), h = _step2$value[0], m = _step2$value[1];
-                if (!(!h || !I.toLowerCase().startsWith("/".concat(h.toLowerCase())))) {
+                _step2$value = _slicedToArray(_step2.value, 2), g = _step2$value[0], m = _step2$value[1];
+                if (!(!g || !$.toLowerCase().startsWith("/".concat(g.toLowerCase())))) {
                   _context3.n = 3;
                   break;
                 }
                 return _context3.a(3, 9);
               case 3:
-                if (!(d.isLoaded(g, h) || !m || !(m != null && m.length))) {
+                if (!(d.isLoaded(h, g) || !m || !(m != null && m.length))) {
                   _context3.n = 4;
                   break;
                 }
                 return _context3.a(3, 10);
               case 4:
-                N = typeof m == "string" ? [m] : m;
-                d.markLoaded(g, h);
+                I = typeof m == "string" ? [m] : m;
+                d.markLoaded(h, g);
                 _context3.p = 5;
                 _context3.n = 6;
-                return Z(N, g);
+                return Z(I, h);
               case 6:
                 _context3.n = 8;
                 break;
               case 7:
                 _context3.p = 7;
                 _t3 = _context3.v;
-                d.markUnloaded(g, h), console.error("[initRouter] load micro app i18n failed for ".concat(h, ":"), _t3);
+                d.markUnloaded(h, g), console.error("[initRouter] load micro app i18n failed for ".concat(g, ":"), _t3);
               case 8:
                 return _context3.a(3, 10);
               case 9:
@@ -290,7 +292,7 @@ var T = commonTools.getUrlParams(location.href, "uiCulture") || "",
                 console.error("[initRouter] microApps i18n beforeEach handler error:", _t5);
               case 15:
                 _context3.p = 15;
-                n();
+                s();
                 return _context3.f(15);
               case 16:
                 return _context3.a(2);
@@ -306,7 +308,7 @@ var T = commonTools.getUrlParams(location.href, "uiCulture") || "",
       router: b
     };
   },
-  k = function k(e, t) {
+  E = function E(e, t) {
     return e.map(function (r) {
       var _ref8, _o$keepAlive;
       var o = r.meta || {};
@@ -315,7 +317,7 @@ var T = commonTools.getUrlParams(location.href, "uiCulture") || "",
       });
     });
   },
-  le = function le(e) {
+  ce = function ce(e) {
     var f;
     e || (e = {});
     var t = vue.ref(true);
@@ -326,15 +328,15 @@ var T = commonTools.getUrlParams(location.href, "uiCulture") || "",
       r = _ref9.container,
       o = _ref9.component,
       a = _ref9.props,
-      c = vue.createApp(o || index$1.DasWebLayout, a);
-    c.use(F, e), c.use(v);
+      l = vue.createApp(o || index$1.DasWebLayout, a);
+    l.use(q, e), l.use(R);
     var _ref0 = _(e),
-      i = _ref0.router;
-    return c.use(i), c.mount(r || "#app"), (f = window.top) != null && f.vueRouter || window.top && (window.top.vueRouter = i), {
-      app: c,
-      router: i,
+      u = _ref0.router;
+    return l.use(u), l.mount(r || "#app"), (f = window.top) != null && f.vueRouter || window.top && (window.top.vueRouter = u), {
+      app: l,
+      router: u,
       loading: t,
-      store: v
+      store: R
     };
   };
-exports.createDasWebApp = le;
+exports.createDasWebApp = ce;

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

@@ -1,35 +1,35 @@
-import { reactive as L, ref as O, createApp as x } from "vue";
-import { initTheme as B } from "@das-fed/upf-web/packages/theme/index";
-import { DasWebLayout as M } from "@das-fed/upf-web/packages/layout/index";
-import { createPinia as W } from "pinia";
-import S from "pinia-plugin-persistedstate";
-import { createRouter as z, createWebHistory as C } from "vue-router";
-import { getUrlParams as H, handleI18nData as K } from "@das-fed/upf-utils/common-tools";
-import { getConfig as q } from "@das-fed/upf-utils/config";
-const F = {
+import { reactive as U, ref as O, createApp as P } from "vue";
+import { initTheme as x } from "@das-fed/upf-web/packages/theme/index";
+import { DasWebLayout as B } from "@das-fed/upf-web/packages/layout/index";
+import { createPinia as M } from "pinia";
+import W from "pinia-plugin-persistedstate";
+import { createRouter as S, createWebHistory as z } from "vue-router";
+import { getUrlParams as C, handleI18nData as H } from "@das-fed/upf-utils/common-tools";
+import { getConfig as K } from "@das-fed/upf-utils/config";
+const q = {
   install: (e, t) => {
     var o;
     const r = (o = t == null ? void 0 : t.plugins) == null ? void 0 : o.glob;
-    r && Object.values(r).sort((a, c) => (a.index ?? 0) - (c.index ?? 0)).filter((a) => a ? !!(a.default && a.default.install || a.install) : !1).forEach((a) => {
+    r && Object.values(r).sort((a, l) => (a.index ?? 0) - (l.index ?? 0)).filter((a) => a ? !!(a.default && a.default.install || a.install) : !1).forEach((a) => {
       a.default && a.default.install && e.use(a.default, t), a.install && e.use(a, t);
     });
   }
-}, v = W();
-v.use(S);
-const $ = "language", y = L({}), G = L({});
-L({});
-const T = H(location.href, "uiCulture") || "", J = T || window.localStorage.getItem($) || window.navigator.language || "zh-CN", R = O(J), Q = () => {
+}, R = M();
+R.use(W);
+const L = "language", w = U({}), F = U({});
+U({});
+const G = C(location.href, "uiCulture") || "", T = G || window.localStorage.getItem(L) || window.navigator.language || "zh-CN", v = O(T), J = () => {
   const e = document.documentElement;
-  e && e.setAttribute("lang", R.value);
-}, j = (e = {}, t) => {
+  e && e.setAttribute("lang", v.value);
+}, Q = (e = {}, t) => {
   console.log("setLangRule===", e, t);
   const r = {};
   for (const o in e)
     for (const a in e[o])
-      r[a] || (r[a] = {}), r[a][o] = e[o][a] ?? "", y[a] || (y[a] = {}), y[a][o] = r[a][o];
-  console.log("customLangeData===", y), console.log("globalLangeData===", G);
+      r[a] || (r[a] = {}), r[a][o] = e[o][a] ?? "", w[a] || (w[a] = {}, console.log(`${w[a]}为空，重新设置为{}`)), w[a][o] = r[a][o];
+  console.log("customLangeData===", w), console.log("globalLangeData===", F);
 }, V = (e) => {
-  R.value = e, console.log("currentLang.value===", R.value), Q();
+  v.value = e, console.log("currentLang.value===", v.value), J();
 }, X = {
   loaded: {},
   isLoaded(e, t) {
@@ -43,100 +43,107 @@ const T = H(location.href, "uiCulture") || "", J = T || window.localStorage.getI
   }
 }, Y = async (e, t) => {
   var f, b, d;
-  const r = q() || {}, o = ((f = r.i18n) == null ? void 0 : f.fromOss) ?? !0, a = ((b = r.i18n) == null ? void 0 : b.isPullBack) ?? !1, c = ((d = r.i18n) == null ? void 0 : d.isDasUI) ?? !0;
-  let i = "/oss/resource/";
+  const r = K() || {}, o = ((f = r.i18n) == null ? void 0 : f.fromOss) ?? !0, a = ((b = r.i18n) == null ? void 0 : b.isPullBack) ?? !1, l = ((d = r.i18n) == null ? void 0 : d.isDasUI) ?? !0;
+  let u = "/oss/resource/";
   try {
-    const u = await K({
-      baseUrl: o ? i : "/",
+    const i = await H({
+      baseUrl: o ? u : "/",
       currentLang: t,
       appName: e,
       isPullBack: a,
       fallbackBaseUrl: "/",
-      isDasUI: c
+      isDasUI: l
     });
-    if (!u || !(u != null && u.frontEnd))
+    if (!i || !(i != null && i.frontEnd))
       throw new Error("Failed to fetch i18n data");
-    return u;
+    return i;
   } catch (p) {
     throw new Error(`registerResources error: ${p}`);
   }
 }, Z = async (e = [], t = "zh-CN") => {
   console.log("registerMicroI18nData===", e, t);
   try {
-    V(t);
     const r = await Y(e, t);
-    console.log("i18nData===", r), r != null && r.frontEnd && typeof r.frontEnd == "object" && Object.keys(r.frontEnd).length && e.forEach((o) => {
-      r.frontEnd[o] && typeof r.frontEnd[o] == "object" && Object.keys(r.frontEnd[o]).length ? j({ [t]: r.frontEnd[o] }) : console.warn(`No front-end i18n data found for app: ${o}`);
-    }), r != null && r.dasUiEnd && typeof r.dasUiEnd == "object" && Object.keys(r.dasUiEnd).length && j({ [t]: r.dasUiEnd });
+    console.log("i18nData===", r);
+    const o = {};
+    r != null && r.frontEnd && typeof r.frontEnd == "object" && Object.keys(r.frontEnd).length && e.forEach((a) => {
+      r.frontEnd[a] && typeof r.frontEnd[a] == "object" && Object.keys(r.frontEnd[a]).length ? o[t] = {
+        ...o[t] || {},
+        ...r.frontEnd[a]
+      } : console.warn(`No front-end i18n data found for app: ${a}`);
+    }), r != null && r.dasUiEnd && typeof r.dasUiEnd == "object" && Object.keys(r.dasUiEnd).length && (o[t] = {
+      ...o[t] || {},
+      ...r.dasUiEnd
+    }), o[t] && Object.keys(o[t]).length && Q(o), V(t);
   } catch (r) {
     console.error("registerMicroI18nData error:", r);
   }
 }, _ = (e) => {
-  var p, A, u, U, D;
+  var p, A, i, j, D;
   const t = ((p = e == null ? void 0 : e.router) == null ? void 0 : p.routerBase) ?? "/", r = ((A = e == null ? void 0 : e.router) == null ? void 0 : A.options) || {};
-  let o = Object.assign(((u = e == null ? void 0 : e.router) == null ? void 0 : u.glob) || {});
-  const a = Object.values(o).filter((l) => !!l).flat().sort((l, s) => (l.index ?? 0) - (s.index ?? 0)), c = [];
-  (U = e == null ? void 0 : e.microApps) == null || U.map((l) => {
-    var E;
-    const s = Object.values(((E = l.router) == null ? void 0 : E.glob) || {}).filter((n) => !!n).flat().sort((n, w) => (n.index ?? 0) - (w.index ?? 0));
-    c.push(
-      ...s.map((n) => ({ ...n, path: `/${l.microAppName}${n.path}` }))
-    ), c.push(
-      ...s.filter((n) => !!n.path).filter((n) => n.path !== "").filter((n) => n.path !== "/").filter((n) => !n.path.startsWith(`/${n.microAppName}`)).map((n) => ({
-        path: n.path,
-        redirect: `/${l.microAppName}${n.path}`,
-        meta: { ...n.meta || {}, isMicroAppRouteRedirect: !0 }
+  let o = Object.assign(((i = e == null ? void 0 : e.router) == null ? void 0 : i.glob) || {});
+  const a = Object.values(o).filter((c) => !!c).flat().sort((c, n) => (c.index ?? 0) - (n.index ?? 0)), l = [];
+  (j = e == null ? void 0 : e.microApps) == null || j.map((c) => {
+    var k;
+    const n = Object.values(((k = c.router) == null ? void 0 : k.glob) || {}).filter((s) => !!s).flat().sort((s, y) => (s.index ?? 0) - (y.index ?? 0));
+    l.push(
+      ...n.map((s) => ({ ...s, path: `/${c.microAppName}${s.path}` }))
+    ), l.push(
+      ...n.filter((s) => !!s.path).filter((s) => s.path !== "").filter((s) => s.path !== "/").filter((s) => !s.path.startsWith(`/${s.microAppName}`)).map((s) => ({
+        path: s.path,
+        redirect: `/${c.microAppName}${s.path}`,
+        meta: { ...s.meta || {}, isMicroAppRouteRedirect: !0 }
       }))
     );
   });
-  const i = ((D = e == null ? void 0 : e.router) == null ? void 0 : D.routers) || [], f = [
-    ...k(a, e),
-    ...k(i, e),
-    ...k(c, e)
-  ], b = z({ history: C(t), routes: f, ...r }), d = X;
+  const u = ((D = e == null ? void 0 : e.router) == null ? void 0 : D.routers) || [], f = [
+    ...E(a, e),
+    ...E(u, e),
+    ...E(l, e)
+  ], b = S({ history: z(t), routes: f, ...r }), d = X;
   if (Array.isArray(e == null ? void 0 : e.microApps) && e.microApps.length && d) {
-    const l = /* @__PURE__ */ new Map();
-    for (const s of e.microApps)
-      s != null && s.microAppName && (s != null && s.i18n) && l.set(s.microAppName, s.i18n);
-    b.beforeEach(async (s, E, n) => {
-      var w;
+    const c = /* @__PURE__ */ new Map();
+    for (const n of e.microApps)
+      n != null && n.microAppName && (n != null && n.i18n) && c.set(n.microAppName, n.i18n);
+    b.beforeEach(async (n, k, s) => {
+      var y;
       try {
-        const g = ((w = s.query) == null ? void 0 : w.uiCulture) || window.localStorage.getItem($) || window.navigator.language || "zh-CN", I = s.path || "";
-        for (const [h, m] of l.entries()) {
-          if (!h || !I.toLowerCase().startsWith(`/${h.toLowerCase()}`)) continue;
-          if (d.isLoaded(g, h) || !m || !(m != null && m.length)) break;
-          const N = typeof m == "string" ? [m] : m;
-          d.markLoaded(g, h);
+        const h = ((y = n.query) == null ? void 0 : y.uiCulture) || window.localStorage.getItem(L) || window.navigator.language || "zh-CN", $ = n.path || "";
+        for (const [g, m] of c.entries()) {
+          if (!g || !$.toLowerCase().startsWith(`/${g.toLowerCase()}`)) continue;
+          if (d.isLoaded(h, g) || !m || !(m != null && m.length)) break;
+          const I = typeof m == "string" ? [m] : m;
+          d.markLoaded(h, g);
           try {
-            await Z(N, g);
-          } catch (P) {
-            d.markUnloaded(g, h), console.error(`[initRouter] load micro app i18n failed for ${h}:`, P);
+            await Z(I, h);
+          } catch (N) {
+            d.markUnloaded(h, g), console.error(`[initRouter] load micro app i18n failed for ${g}:`, N);
           }
           break;
         }
-      } catch (g) {
-        console.error("[initRouter] microApps i18n beforeEach handler error:", g);
+      } catch (h) {
+        console.error("[initRouter] microApps i18n beforeEach handler error:", h);
       } finally {
-        n();
+        s();
       }
     });
   }
   return { router: b };
-}, k = (e, t) => e.map((r) => {
+}, E = (e, t) => e.map((r) => {
   const o = r.meta || {};
   return o.keepAlive = o.keepAlive ?? (t == null ? void 0 : t.keepAlive) ?? !0, { ...r, meta: o };
-}), le = (e) => {
+}), ce = (e) => {
   var f;
   e || (e = {});
   const t = O(!0);
-  Promise.all([B(e)]).then(() => {
+  Promise.all([x(e)]).then(() => {
     t.value = !1;
   });
-  const { container: r, component: o, props: a } = (e == null ? void 0 : e.root) || {}, c = x(o || M, a);
-  c.use(F, e), c.use(v);
-  const { router: i } = _(e);
-  return c.use(i), c.mount(r || "#app"), (f = window.top) != null && f.vueRouter || window.top && (window.top.vueRouter = i), { app: c, router: i, loading: t, store: v };
+  const { container: r, component: o, props: a } = (e == null ? void 0 : e.root) || {}, l = P(o || B, a);
+  l.use(q, e), l.use(R);
+  const { router: u } = _(e);
+  return l.use(u), l.mount(r || "#app"), (f = window.top) != null && f.vueRouter || window.top && (window.top.vueRouter = u), { app: l, router: u, loading: t, store: R };
 };
 export {
-  le as createDasWebApp
+  ce as createDasWebApp
 };