@next-core/brick-kit 2.156.6 → 2.156.8

package/dist/index.esm.js

@@ -3938,9 +3938,9 @@ class Runtime {
   }
 
   getMiscSettings() {
-    var _kernel$bootstrapData5;
+    var _kernel$bootstrapData5, _kernel$nextApp, _kernel$nextApp$confi, _kernel$nextApp$confi2;
 
-    return Object.assign({}, (_kernel$bootstrapData5 = kernel.bootstrapData.settings) === null || _kernel$bootstrapData5 === void 0 ? void 0 : _kernel$bootstrapData5.misc);
+    return Object.assign({}, (_kernel$bootstrapData5 = kernel.bootstrapData.settings) === null || _kernel$bootstrapData5 === void 0 ? void 0 : _kernel$bootstrapData5.misc, (_kernel$nextApp = kernel.nextApp) === null || _kernel$nextApp === void 0 ? void 0 : (_kernel$nextApp$confi = _kernel$nextApp.config) === null || _kernel$nextApp$confi === void 0 ? void 0 : (_kernel$nextApp$confi2 = _kernel$nextApp$confi.settings) === null || _kernel$nextApp$confi2 === void 0 ? void 0 : _kernel$nextApp$confi2.misc);
   }
 
   /* istanbul ignore next */
@@ -9280,8 +9280,8 @@ class Kernel {
       _this2.loadingBar = new BaseBar(_this2, "loadingBar");
       _this2.router = new Router(_this2);
       initAnalytics();
-      yield _this2.router.bootstrap();
       _this2.originFaviconHref = (_document$querySelect = document.querySelector("link[rel='shortcut icon']")) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.href;
+      yield _this2.router.bootstrap();
 
       if (!window.STANDALONE_MICRO_APPS) {
         _this2.legacyAuthGuard();
@@ -9927,9 +9927,9 @@ class Kernel {
   }
 
   getFeatureFlags() {
-    var _this$bootstrapData, _this$bootstrapData$s;
+    var _this$bootstrapData, _this$bootstrapData$s, _this$nextApp, _this$nextApp$config, _this$nextApp$config$;
 
-    return Object.assign({}, (_this$bootstrapData = this.bootstrapData) === null || _this$bootstrapData === void 0 ? void 0 : (_this$bootstrapData$s = _this$bootstrapData.settings) === null || _this$bootstrapData$s === void 0 ? void 0 : _this$bootstrapData$s.featureFlags);
+    return Object.assign({}, (_this$bootstrapData = this.bootstrapData) === null || _this$bootstrapData === void 0 ? void 0 : (_this$bootstrapData$s = _this$bootstrapData.settings) === null || _this$bootstrapData$s === void 0 ? void 0 : _this$bootstrapData$s.featureFlags, (_this$nextApp = this.nextApp) === null || _this$nextApp === void 0 ? void 0 : (_this$nextApp$config = _this$nextApp.config) === null || _this$nextApp$config === void 0 ? void 0 : (_this$nextApp$config$ = _this$nextApp$config.settings) === null || _this$nextApp$config$ === void 0 ? void 0 : _this$nextApp$config$.featureFlags);
   }
 
   getStandaloneMenus(menuId, isPreFetch) {
@@ -12150,14 +12150,11 @@ class Router {
 
     _defineProperty$1(this, "renderId", void 0);
 
-    _defineProperty$1(this, "featureFlags", void 0);
-
     _defineProperty$1(this, "navConfig", void 0);
 
     _defineProperty$1(this, "mediaEventTargetHandler", void 0);
 
     this.kernel = kernel;
-    this.featureFlags = this.kernel.getFeatureFlags();
     var history = getHistory();
     window.addEventListener("beforeunload", event => {
       var message = this.getBlockMessageBeforePageLave({}); // See examples in https://developer.mozilla.org/en-US/docs/Web/API/WindowEventHandlers/onbeforeunload
@@ -12196,7 +12193,7 @@ class Router {
   }
 
   locationChangeNotify(from, to) {
-    if (this.featureFlags["log-location-change"]) {
+    if (this.kernel.getFeatureFlags()["log-location-change"]) {
       var _window$CORE_ROOT;
 
       var username = getAuth().username;
@@ -12339,9 +12336,10 @@ class Router {
         var _storyboard$meta, _storyboard$meta2, _storyboard$meta3;
 
         yield _this3.kernel.fulfilStoryboard(storyboard);
+        _this3.kernel.nextApp = storyboard.app;
         removeDeadConditions(storyboard, {
           constantFeatureFlags: true,
-          featureFlags: _this3.featureFlags
+          featureFlags: _this3.kernel.getFeatureFlags()
         }); // 将动态解析后的模板还原，以便重新动态解析。
 
         restoreDynamicTemplates(storyboard);
@@ -12382,7 +12380,6 @@ class Router {
 
       var appChanged = previousApp && currentApp ? previousApp.id !== currentApp.id : previousApp !== currentApp;
       var legacy = currentApp ? currentApp.legacy : undefined;
-      _this3.kernel.nextApp = currentApp;
       var layoutType = (currentApp === null || currentApp === void 0 ? void 0 : currentApp.layoutType) || "console";
       var faviconElement = document.querySelector("link[rel='shortcut icon']");
       var customFaviconHref = currentApp === null || currentApp === void 0 ? void 0 : (_currentApp$config = currentApp.config) === null || _currentApp$config === void 0 ? void 0 : (_currentApp$config$_e = _currentApp$config._easyops_app_favicon) === null || _currentApp$config$_e === void 0 ? void 0 : _currentApp$config$_e.default;
@@ -12401,7 +12398,7 @@ class Router {
       unmountTree(mountPoints.bg);
 
       var redirectToLogin = () => {
-        history.replace(_this3.featureFlags["sso-enabled"] ? "/sso-auth/login" : "/auth/login", {
+        history.replace(_this3.kernel.getFeatureFlags()["sso-enabled"] ? "/sso-auth/login" : "/auth/login", {
           from: location
         });
       };
@@ -12422,7 +12419,7 @@ class Router {
           }
         }
 
-        layoutType = bricks.some(brick => ["base-layout.tpl-base-page-module", "base-layout.tpl-homepage-base-module", "base-layout.tpl-homepage-base-module-cmdb", "base-layout.tpl-base-page-module-cmdb"].includes(brick)) && layoutType === "business" && !_this3.featureFlags["support-ui-8.0-base-layout"] ? "console" : layoutType;
+        layoutType = bricks.some(brick => ["base-layout.tpl-base-page-module", "base-layout.tpl-homepage-base-module", "base-layout.tpl-homepage-base-module-cmdb", "base-layout.tpl-base-page-module-cmdb"].includes(brick)) && layoutType === "business" && !_this3.kernel.getFeatureFlags()["support-ui-8.0-base-layout"] ? "console" : layoutType;
         var mountRoutesResult = {
           main: [],
           menuInBg: [],
@@ -12664,7 +12661,7 @@ class Router {
           _this3.state = "mounted";
           devtoolsHookEmit("rendered");
 
-          if (!_this3.featureFlags["disable-prefetch-scripts"]) {
+          if (!_this3.kernel.getFeatureFlags()["disable-prefetch-scripts"]) {
             // Try to prefetch during a browser's idle periods.
             // https://developer.mozilla.org/en-US/docs/Web/API/Window/requestIdleCallback
             if (typeof window.requestIdleCallback === "function") {