@next-core/brick-kit 2.126.0 → 2.127.0

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.127.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.126.2...@next-core/brick-kit@2.127.0) (2022-08-10)
+
+
+### Features
+
+* **brick-kit:** 增加两个cmdb模板 ([e53dca1](https://github.com/easyops-cn/next-core/commit/e53dca14ac2b00ec4cf4a13011c2e7b555bb18b2))
+
+
+
+
+
+## [2.126.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.126.1...@next-core/brick-kit@2.126.2) (2022-08-09)
+
+
+### Bug Fixes
+
+* fix merge preview routes ([ed39097](https://github.com/easyops-cn/next-core/commit/ed390976eb4cb8536465aa30abce5ae51c18e72a))
+
+
+
+
+
+## [2.126.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.126.0...@next-core/brick-kit@2.126.1) (2022-08-09)
+
+
+### Bug Fixes
+
+* do not report 404 when page is empty ([869038e](https://github.com/easyops-cn/next-core/commit/869038e2d5447001aa7e22a1218ce91774ce0905))
+
+
+
+
+
 # [2.126.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.125.0...@next-core/brick-kit@2.126.0) (2022-08-08)
 
 

package/dist/index.bundle.js

@@ -10640,7 +10640,7 @@
 
         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;
@@ -11503,6 +11503,38 @@
     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__default["default"](this, "defaultCollapsed", false);
@@ -11759,7 +11791,7 @@
             }
           }
 
-          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: [],
@@ -11778,8 +11810,7 @@
           };
 
           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
@@ -11907,9 +11938,10 @@
 
           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);
@@ -11949,9 +11981,9 @@
                 _this3.kernel.prefetchDepsOfStoryboard(storyboard);
               });
             } else {
-              Promise.resolve().then(() => {
+              setTimeout(() => {
                 _this3.kernel.prefetchDepsOfStoryboard(storyboard);
-              });
+              }, 0);
             }
 
             return;
@@ -11989,50 +12021,6 @@
         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 */