@next-core/brick-kit 2.121.3 → 2.122.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.122.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.121.3...@next-core/brick-kit@2.122.0) (2022-06-16)
+
+
+### Features
+
+* 增加开关控制6.0或8.0UI的切换 ([54007a4](https://github.com/easyops-cn/next-core/commit/54007a43d81e97d0eb62efd28266adc2a2ccd631))
+
+
+
+
+
 ## [2.121.3](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.121.2...@next-core/brick-kit@2.121.3) (2022-06-10)
 
 **Note:** Version bump only for package @next-core/brick-kit

package/dist/index.bundle.js

@@ -9596,8 +9596,9 @@
 
         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);
 
-        if (tplTagName) {
+        if (tplTagName && (!isBaseLayout || _this6.kernel.getFeatureFlags()["support-ui-8.0-base-layout"] && isBaseLayout)) {
           var _customTemplateRegist;
 
           yield _this6.preFetchMenu((_customTemplateRegist = customTemplateRegistry.get(tplTagName)) === null || _customTemplateRegist === void 0 ? void 0 : _customTemplateRegist.bricks);
@@ -10573,14 +10574,20 @@
         if (storyboard) {
           var _currentApp$breadcrum, _currentApp$breadcrum2;
 
+          var {
+            bricks,
+            customApis
+          } = brickUtils.scanStoryboard(storyboard);
+
           if (appChanged && currentApp.id && isLoggedIn()) {
-            var usedCustomApis = brickUtils.mapCustomApisToNameAndNamespace(brickUtils.scanCustomApisInStoryboard(storyboard));
+            var usedCustomApis = brickUtils.mapCustomApisToNameAndNamespace(customApis);
 
             if (usedCustomApis !== null && usedCustomApis !== void 0 && usedCustomApis.length) {
               yield _this3.kernel.loadMicroAppApiOrchestrationAsync(usedCustomApis);
             }
           }
 
+          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;
           var mountRoutesResult = {
             main: [],
             menuInBg: [],