@next-core/brick-kit 2.145.2 → 2.146.0

package/dist/index.esm.js

@@ -2181,26 +2181,6 @@ function _resolveNormalStoryboardContext() {
         // Or if the resolve is ignored or lazy, use its `value` as a fallback.
         value = computeRealValue(contextConf.value, mergedContext, true);
       }
-
-      if (contextConf.track) {
-        // Track its dependencies and auto update when each of them changed.
-        var deps = (isTemplateState ? trackUsedState : trackUsedContext)(load ? contextConf.resolve : contextConf.value);
-
-        for (var dep of deps) {
-          var _eventTarget;
-
-          var ctx = storyboardContextWrapper.get().get(dep);
-          ctx === null || ctx === void 0 ? void 0 : (_eventTarget = ctx.eventTarget) === null || _eventTarget === void 0 ? void 0 : _eventTarget.addEventListener(isTemplateState ? "state.change" : "context.change", () => {
-            if (load) {
-              storyboardContextWrapper.updateValue(contextConf.name, {
-                cache: "default"
-              }, "refresh");
-            } else {
-              storyboardContextWrapper.updateValue(contextConf.name, computeRealValue(contextConf.value, mergedContext, true), "replace");
-            }
-          });
-        }
-      }
     }
 
     resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, load, !isLazyResolve);
@@ -2250,6 +2230,27 @@ function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardC
     }
   }
 
+  if (contextConf.track) {
+    var isTemplateState = !!storyboardContextWrapper.tplContextId; // Track its dependencies and auto update when each of them changed.
+
+    var deps = (isTemplateState ? trackUsedState : trackUsedContext)(load ? contextConf.resolve : contextConf.value);
+
+    for (var dep of deps) {
+      var _eventTarget;
+
+      var ctx = storyboardContextWrapper.get().get(dep);
+      ctx === null || ctx === void 0 ? void 0 : (_eventTarget = ctx.eventTarget) === null || _eventTarget === void 0 ? void 0 : _eventTarget.addEventListener(isTemplateState ? "state.change" : "context.change", () => {
+        if (load) {
+          storyboardContextWrapper.updateValue(contextConf.name, {
+            cache: "default"
+          }, "refresh");
+        } else {
+          storyboardContextWrapper.updateValue(contextConf.name, computeRealValue(contextConf.value, mergedContext, true), "replace");
+        }
+      });
+    }
+  }
+
   storyboardContextWrapper.set(contextConf.name, newContext);
 }
 
@@ -10615,14 +10616,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;
 
@@ -10635,7 +10632,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 === "/"
         })) {
@@ -12024,6 +12021,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 {
@@ -12093,16 +12104,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); // 预加载权限信息