@next-core/brick-kit 2.126.0 → 2.127.0

package/dist/index.esm.js

@@ -10641,7 +10641,7 @@ class LocationContext {
 
       yield _this6.resolver.resolve(brickConf, brick, context);
       var expandedBrickConf = brickConf;
-      var isBaseLayout = ["base-layout.tpl-homepage-base-module", "base-layout.tpl-base-page-module"].includes(tplTagName);
+      var isBaseLayout = ["base-layout.tpl-homepage-base-module", "base-layout.tpl-base-page-module", "base-layout.tpl-homepage-base-module-cmdb", "base-layout.tpl-base-page-module-cmdb"].includes(tplTagName);
 
       if (tplTagName && (!isBaseLayout || _this6.kernel.getFeatureFlags()["support-ui-8.0-base-layout"] && isBaseLayout)) {
         var _customTemplateRegist;
@@ -11504,6 +11504,38 @@ function getStandaloneInstalledApps() {
   return standaloneApps;
 }
 
+function mergePreviewRoutes(routes) {
+  var mergedRoutes = routes;
+  var specificTemplatePreviewIndex = findLastIndex(mergedRoutes, route => route.path.startsWith("${APP.homepage}/_dev_only_/template-preview/"));
+  mergedRoutes = [...mergedRoutes.slice(0, specificTemplatePreviewIndex + 1), {
+    path: "${APP.homepage}/_dev_only_/template-preview/:templateId",
+    bricks: [{
+      brick: "span"
+    }],
+    menu: false,
+    exact: true
+  }, ...mergedRoutes.slice(specificTemplatePreviewIndex + 1)];
+  var specificSnippetPreviewIndex = findLastIndex(mergedRoutes, route => route.path.startsWith("${APP.homepage}/_dev_only_/snippet-preview/"));
+  mergedRoutes = [...mergedRoutes.slice(0, specificSnippetPreviewIndex + 1), {
+    path: "${APP.homepage}/_dev_only_/snippet-preview/:snippetId",
+    bricks: [{
+      brick: "span"
+    }],
+    menu: false,
+    exact: true
+  }, ...mergedRoutes.slice(specificSnippetPreviewIndex + 1)];
+  var specificFormPreviewIndex = findLastIndex(mergedRoutes, route => route.path.startsWith("${APP.homepage}/_dev_only_/form-preview/"));
+  mergedRoutes = [...mergedRoutes.slice(0, specificFormPreviewIndex + 1), {
+    path: "${APP.homepage}/_dev_only_/form-preview/:FormId",
+    bricks: [{
+      brick: "span"
+    }],
+    menu: false,
+    exact: true
+  }, ...mergedRoutes.slice(specificFormPreviewIndex + 1)];
+  return mergedRoutes;
+}
+
 class Router {
   constructor(kernel) {
     _defineProperty$1(this, "defaultCollapsed", false);
@@ -11760,7 +11792,7 @@ class Router {
           }
         }
 
-        layoutType = bricks.some(brick => ["base-layout.tpl-base-page-module", "base-layout.tpl-homepage-base-module"].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.featureFlags["support-ui-8.0-base-layout"] ? "console" : layoutType;
         var mountRoutesResult = {
           main: [],
           menuInBg: [],
@@ -11779,8 +11811,7 @@ class Router {
         };
 
         try {
-          var mergedRoutes = _this3.MergePreviewRouter(storyboard.routes);
-
+          var mergedRoutes = mergePreviewRoutes(storyboard.routes);
           yield locationContext.mountRoutes(mergedRoutes, undefined, mountRoutesResult);
         } catch (error) {
           // eslint-disable-next-line no-console
@@ -11908,9 +11939,10 @@ class Router {
 
         menuInBg.forEach(brick => {
           appendBrick(brick, mountPoints.portal);
-        });
+        }); // When we have a matched route other than an abstract route,
+        // we say *page found*, otherwise, *page not found*.
 
-        if (main.length > 0 || portal.length > 0) {
+        if (route && route.type !== "routes" || failed) {
           main.length > 0 && mountTree(main, mountPoints.main);
           portal.length > 0 && mountTree(portal, mountPoints.portal);
           afterMountTree(mountPoints.main);
@@ -11950,9 +11982,9 @@ class Router {
               _this3.kernel.prefetchDepsOfStoryboard(storyboard);
             });
           } else {
-            Promise.resolve().then(() => {
+            setTimeout(() => {
               _this3.kernel.prefetchDepsOfStoryboard(storyboard);
-            });
+            }, 0);
           }
 
           return;
@@ -11990,50 +12022,6 @@ class Router {
       subMenu: mountResult.menuBar.subMenu
     };
   }
-
-  MergePreviewRouter(router) {
-    var mergedRoutes = router;
-    var specificTemplatePreviewIndex = findLastIndex(mergedRoutes, route => route.path.startsWith("${APP.homepage}/_dev_only_/template-preview/"));
-
-    if (specificTemplatePreviewIndex > -1) {
-      mergedRoutes = [...mergedRoutes.slice(0, specificTemplatePreviewIndex + 1), {
-        path: "${APP.homepage}/_dev_only_/template-preview/:templateId",
-        bricks: [{
-          brick: "span"
-        }],
-        menu: false,
-        exact: true
-      }, ...mergedRoutes.slice(specificTemplatePreviewIndex + 1)];
-    }
-
-    var specificSnippetPreviewIndex = findLastIndex(mergedRoutes, route => route.path.startsWith("${APP.homepage}/_dev_only_/snippet-preview/"));
-
-    if (specificSnippetPreviewIndex > -1) {
-      mergedRoutes = [...mergedRoutes.slice(0, specificSnippetPreviewIndex + 1), {
-        path: "${APP.homepage}/_dev_only_/snippet-preview/:snippetId",
-        bricks: [{
-          brick: "span"
-        }],
-        menu: false,
-        exact: true
-      }, ...mergedRoutes.slice(specificSnippetPreviewIndex + 1)];
-    }
-
-    var specificFormPreviewIndex = findLastIndex(mergedRoutes, route => route.path.startsWith("${APP.homepage}/_dev_only_/form-preview/"));
-
-    if (specificFormPreviewIndex > -1) {
-      mergedRoutes = [...mergedRoutes.slice(0, specificFormPreviewIndex + 1), {
-        path: "${APP.homepage}/_dev_only_/form-preview/:FormId",
-        bricks: [{
-          brick: "span"
-        }],
-        menu: false,
-        exact: true
-      }, ...mergedRoutes.slice(specificFormPreviewIndex + 1)];
-    }
-
-    return mergedRoutes;
-  }
   /* istanbul ignore next */