@das-fed/upf-web 6.4.0-hot.1 → 6.4.0-hot.3

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@das-fed/upf-web",
-  "version": "6.4.0-hot.1",
+  "version": "6.4.0-hot.3",
   "type": "module",
   "main": "./index.js",
   "dependencies": {
-    "@das-fed/upf-ui": "6.4.0-hot.1",
-    "@das-fed/upf-utils": "6.4.0-hot.1",
-    "@das-fed/upf-web": "6.4.0-hot.1",
-    "@das-fed/upf-web-components": "6.4.0-hot.1",
+    "@das-fed/upf-ui": "6.4.0-hot.3",
+    "@das-fed/upf-utils": "6.4.0-hot.3",
+    "@das-fed/upf-web": "6.4.0-hot.3",
+    "@das-fed/upf-web-components": "6.4.0-hot.3",
     "@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.1",
+    "@das-fed/upf-cli": "6.4.0-hot.3",
     "@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,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 C = require('pinia-plugin-persistedstate');
+var S = 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 q = {
+var F = {
     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);
+      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);
       }).filter(function (a) {
         return a ? !!(a["default"] && a["default"].install || a.install) : false;
       }).forEach(function (a) {
@@ -44,31 +44,33 @@ var q = {
     }
   },
   v = pinia.createPinia();
-v.use(C);
-var N = "language",
-  k = vue.reactive({});
+v.use(S);
+var $ = "language",
+  y = vue.reactive({}),
+  G = vue.reactive({});
 vue.reactive({});
-vue.reactive({});
-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 T = commonTools.getUrlParams(location.href, "uiCulture") || "",
+  J = T || window.localStorage.getItem($) || window.navigator.language || "zh-CN",
+  R = vue.ref(J),
+  Q = function Q() {
     var e = document.documentElement;
-    e && e.setAttribute("lang", P.value);
+    e && e.setAttribute("lang", R.value);
   },
-  L = function L() {
+  j = function j() {
     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 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];
+    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];
     }
+    console.log("customLangeData===", y), console.log("globalLangeData===", G);
   },
-  J = function J(e) {
-    P.value = e, T();
+  V = function V(e) {
+    R.value = e, console.log("currentLang.value===", R.value), Q();
   },
-  Q = {
+  X = {
     loaded: {},
     isLoaded: function isLoaded(e, t) {
       return !!(this.loaded[e] && this.loaded[e][t]);
@@ -80,24 +82,24 @@ var F = commonTools.getUrlParams(location.href, "uiCulture") || "",
       this.loaded[e] && (delete this.loaded[e][t], Object.keys(this.loaded[e]).length === 0 && delete this.loaded[e]);
     }
   },
-  V = /*#__PURE__*/function () {
+  Y = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(e, t) {
       var _ref2, _ref3, _ref4;
-      var f, h, d, r, s, a, o, i, u, _t;
+      var f, b, d, r, o, a, c, i, u, _t;
       return _regenerator().w(function (_context) {
         while (1) switch (_context.p = _context.n) {
           case 0:
-            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;
+            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/";
             _context.p = 1;
             _context.n = 2;
             return commonTools.handleI18nData({
-              baseUrl: s ? i : "/",
+              baseUrl: o ? i : "/",
               currentLang: t,
               appName: e,
               isPullBack: a,
               fallbackBaseUrl: "/",
-              isDasUI: o
+              isDasUI: c
             });
           case 2:
             u = _context.v;
@@ -117,11 +119,11 @@ var F = commonTools.getUrlParams(location.href, "uiCulture") || "",
         }
       }, _callee, null, [[1, 4]]);
     }));
-    return function V(_x, _x2) {
+    return function Y(_x, _x2) {
       return _ref.apply(this, arguments);
     };
   }(),
-  X = /*#__PURE__*/function () {
+  Z = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
       var e,
         t,
@@ -133,100 +135,102 @@ var F = commonTools.getUrlParams(location.href, "uiCulture") || "",
           case 0:
             e = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : [];
             t = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : "zh-CN";
+            console.log("registerMicroI18nData===", e, t);
             _context2.p = 1;
             _context2.n = 2;
-            return V(e, t);
+            return Y(e, t);
           case 2:
             r = _context2.v;
-            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);
+            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)), V(t);
             _context2.n = 4;
             break;
           case 3:
             _context2.p = 3;
             _t2 = _context2.v;
+            console.error("registerMicroI18nData error:", _t2);
           case 4:
             return _context2.a(2);
         }
       }, _callee2, null, [[1, 3]]);
     }));
-    return function X() {
+    return function Z() {
       return _ref5.apply(this, arguments);
     };
   }(),
-  Y = function Y(e) {
+  _ = function _(e) {
     var _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 s = Object.assign(((u = e == null ? undefined : e.router) == null ? undefined : u.glob) || {});
-    var a = Object.values(s).filter(function (l) {
+    var p, A, u, U, 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, 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);
+      }).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);
       }),
-      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, 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);
+      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);
       });
-      o.push.apply(o, _toConsumableArray(n.map(function (c) {
-        return _objectSpread(_objectSpread({}, c), {}, {
-          path: "/".concat(l.microAppName).concat(c.path)
+      c.push.apply(c, _toConsumableArray(s.map(function (n) {
+        return _objectSpread(_objectSpread({}, n), {}, {
+          path: "/".concat(l.microAppName).concat(n.path)
         });
-      }))), o.push.apply(o, _toConsumableArray(n.filter(function (c) {
-        return !!c.path;
-      }).filter(function (c) {
-        return c.path !== "";
-      }).filter(function (c) {
-        return c.path !== "/";
-      }).filter(function (c) {
-        return !c.path.startsWith("/".concat(c.microAppName));
-      }).map(function (c) {
+      }))), 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) {
         return {
-          path: c.path,
-          redirect: "/".concat(l.microAppName).concat(c.path),
-          meta: _objectSpread(_objectSpread({}, c.meta || {}), {}, {
+          path: n.path,
+          redirect: "/".concat(l.microAppName).concat(n.path),
+          meta: _objectSpread(_objectSpread({}, n.meta || {}), {}, {
             isMicroAppRouteRedirect: true
           })
         };
       })));
     });
-    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({
+    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))),
+      b = vueRouter.createRouter(_objectSpread({
         history: vueRouter.createWebHistory(t),
         routes: f
       }, r)),
-      d = Q;
+      d = X;
     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 n = _step.value;
-          n != null && n.microAppName && n != null && n.i18n && l.set(n.microAppName, n.i18n);
+          var s = _step.value;
+          s != null && s.microAppName && s != null && s.i18n && l.set(s.microAppName, s.i18n);
         }
       } catch (err) {
         _iterator.e(err);
       } finally {
         _iterator.f();
       }
-      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;
+      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;
           return _regenerator().w(function (_context3) {
             while (1) switch (_context3.p = _context3.n) {
               case 0:
                 _context3.p = 0;
-                b = ((w = n.query) == null ? void 0 : w.uiCulture) || window.localStorage.getItem(N) || window.navigator.language || "zh-CN", $ = n.path || "";
+                g = ((w = s.query) == null ? void 0 : w.uiCulture) || window.localStorage.getItem($) || window.navigator.language || "zh-CN", I = s.path || "";
                 _iterator2 = _createForOfIteratorHelper(l.entries());
                 _context3.p = 1;
                 _iterator2.s();
@@ -235,31 +239,31 @@ var F = commonTools.getUrlParams(location.href, "uiCulture") || "",
                   _context3.n = 10;
                   break;
                 }
-                _step2$value = _slicedToArray(_step2.value, 2), y = _step2$value[0], m = _step2$value[1];
-                if (!(!y || !$.toLowerCase().startsWith("/".concat(y.toLowerCase())))) {
+                _step2$value = _slicedToArray(_step2.value, 2), h = _step2$value[0], m = _step2$value[1];
+                if (!(!h || !I.toLowerCase().startsWith("/".concat(h.toLowerCase())))) {
                   _context3.n = 3;
                   break;
                 }
                 return _context3.a(3, 9);
               case 3:
-                if (!(d.isLoaded(b, y) || !m || !(m != null && m.length))) {
+                if (!(d.isLoaded(g, h) || !m || !(m != null && m.length))) {
                   _context3.n = 4;
                   break;
                 }
                 return _context3.a(3, 10);
               case 4:
-                x = typeof m == "string" ? [m] : m;
-                d.markLoaded(b, y);
+                N = typeof m == "string" ? [m] : m;
+                d.markLoaded(g, h);
                 _context3.p = 5;
                 _context3.n = 6;
-                return X(x, b);
+                return Z(N, g);
               case 6:
                 _context3.n = 8;
                 break;
               case 7:
                 _context3.p = 7;
                 _t3 = _context3.v;
-                d.markUnloaded(b, y);
+                d.markUnloaded(g, h), console.error("[initRouter] load micro app i18n failed for ".concat(h, ":"), _t3);
               case 8:
                 return _context3.a(3, 10);
               case 9:
@@ -282,9 +286,10 @@ var F = commonTools.getUrlParams(location.href, "uiCulture") || "",
               case 14:
                 _context3.p = 14;
                 _t5 = _context3.v;
+                console.error("[initRouter] microApps i18n beforeEach handler error:", _t5);
               case 15:
                 _context3.p = 15;
-                c();
+                n();
                 return _context3.f(15);
               case 16:
                 return _context3.a(2);
@@ -297,19 +302,19 @@ var F = commonTools.getUrlParams(location.href, "uiCulture") || "",
       }());
     }
     return {
-      router: h
+      router: b
     };
   },
-  E = function E(e, t) {
+  k = function k(e, t) {
     return e.map(function (r) {
-      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
+      var _ref8, _o$keepAlive;
+      var o = r.meta || {};
+      return o.keepAlive = (_ref8 = (_o$keepAlive = o.keepAlive) !== null && _o$keepAlive !== void 0 ? _o$keepAlive : t == null ? undefined : t.keepAlive) !== null && _ref8 !== void 0 ? _ref8 : true, _objectSpread(_objectSpread({}, r), {}, {
+        meta: o
       });
     });
   },
-  oe = function oe(e) {
+  le = function le(e) {
     var f;
     e || (e = {});
     var t = vue.ref(true);
@@ -318,17 +323,17 @@ var F = commonTools.getUrlParams(location.href, "uiCulture") || "",
     });
     var _ref9 = (e == null ? undefined : e.root) || {},
       r = _ref9.container,
-      s = _ref9.component,
+      o = _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,
+      c = vue.createApp(o || index$1.DasWebLayout, a);
+    c.use(F, e), c.use(v);
+    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,
       loading: t,
       store: v
     };
   };
-exports.createDasWebApp = oe;
+exports.createDasWebApp = le;

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

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