@next-core/brick-kit 2.145.1 → 2.145.3

package/dist/index.esm.js

@@ -9208,7 +9208,7 @@ class Kernel {
 
       var bootstrapResponse = _objectSpread({
         templatePackages: []
-      }, data); // Merge `app.defaultConfig` and `app.userConfig` to `app.config`.
+      }, data); // Merge `app.defaultConfig` and `app.userConfig` to `app.config`. Should merge config again in standalone mode when doFulfilStoryboard because static bootstrap.json do not have userConfig.
 
 
       processBootstrapResponse(bootstrapResponse);
@@ -9263,8 +9263,9 @@ class Kernel {
           }
 
           if (appRuntimeData) {
-            // merge user config
-            storyboard.app.userConfig = _objectSpread(_objectSpread({}, storyboard.app.userConfig), appRuntimeData.userConfig); // get inject menus (Actually, appRuntimeData contains both main and inject menus)
+            // Merge `app.defaultConfig` and `app.userConfig` to `app.config`.
+            storyboard.app.userConfig = _objectSpread(_objectSpread({}, storyboard.app.userConfig), appRuntimeData.userConfig);
+            storyboard.app.config = deepFreeze(merge({}, storyboard.app.defaultConfig, storyboard.app.userConfig)); // get inject menus (Actually, appRuntimeData contains both main and inject menus)
 
             storyboard.meta = _objectSpread(_objectSpread({}, storyboard.meta), {}, {
               injectMenus: appRuntimeData.injectMenus
@@ -10614,14 +10615,10 @@ class LocationContext {
     return "missed";
   }
 
-  matchStoryboard(storyboards) {
-    if (window.STANDALONE_MICRO_APPS && storyboards.length === 1) {
-      return storyboards[0];
-    } // Put apps with longer homepage before shorter ones.
+  matchStoryboard(storyboards, location) {
+    // Put apps with longer homepage before shorter ones.
     // E.g., `/legacy/tool` will match first before `/legacy`.
     // This enables two apps with relationship of parent-child of homepage.
-
-
     var sortedStoryboards = orderBy(storyboards, storyboard => {
       var _storyboard$app$homep, _storyboard$app, _storyboard$app$homep2;
 
@@ -10634,7 +10631,7 @@ class LocationContext {
       var homepage = (_storyboard$app2 = storyboard.app) === null || _storyboard$app2 === void 0 ? void 0 : _storyboard$app2.homepage;
 
       if (typeof homepage === "string" && homepage[0] === "/") {
-        if (matchPath(this.location.pathname, {
+        if (matchPath((location || this.location).pathname, {
           path: homepage,
           exact: homepage === "/"
         })) {
@@ -12023,6 +12020,20 @@ class Router {
 
           _this.locationContext.messageDispatcher.reset();
 
+          var storyboard = _this.locationContext.matchStoryboard(_this.kernel.bootstrapData.storyboards, location);
+
+          if (!window.STANDALONE_MICRO_APPS) {
+            if (storyboard && storyboard.app.standaloneMode) {
+              // from non-standalone app to standalone app, should jump out off site
+              window.location.assign(window.location.href);
+            }
+          } else {
+            if (!storyboard) {
+              // from standalone app goback to non-standalone app, should reload
+              window.location.reload();
+            }
+          }
+
           if (_this.rendering) {
             _this.nextLocation = location;
           } else {
@@ -12092,16 +12103,6 @@ class Router {
       if (storyboard) {
         var _storyboard$meta, _storyboard$meta2, _storyboard$meta3;
 
-        if (!window.STANDALONE_MICRO_APPS) {
-          if (storyboard.app.standaloneMode) {
-            // if nextApp was standalone micro-apps, use location.replace to reload window;
-            var path = history.createHref({
-              pathname: storyboard.app.homepage
-            });
-            window.location.replace(path);
-          }
-        }
-
         yield _this3.kernel.fulfilStoryboard(storyboard); // 将动态解析后的模板还原，以便重新动态解析。
 
         restoreDynamicTemplates(storyboard); // 预加载权限信息