@next-core/brick-kit 2.121.1 → 2.122.0

package/dist/index.esm.js

@@ -9,7 +9,7 @@ import { ExclamationCircleOutlined } from '@ant-design/icons';
 import i18next, { getFixedT } from 'i18next';
 import { parsePath, createBrowserHistory, locationsAreEqual, createPath } from 'history';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
-import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, scanPermissionActionsInStoryboard, precookFunction, cook, resolveContextConcurrently, syncResolveContextConcurrently, shouldAllowRecursiveEvaluations, preevaluate, inject, deepFreeze, createProviderClass, loadScript, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, matchPath, scanAppGetMenuInAny, asyncProcessBrick, restoreDynamicTemplates, mapCustomApisToNameAndNamespace, scanCustomApisInStoryboard } from '@next-core/brick-utils';
+import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, scanPermissionActionsInStoryboard, precookFunction, cook, resolveContextConcurrently, syncResolveContextConcurrently, shouldAllowRecursiveEvaluations, preevaluate, inject, deepFreeze, createProviderClass, loadScript, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, matchPath, scanAppGetMenuInAny, asyncProcessBrick, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
 import lodash, { set, get, difference, identity, uniqueId, cloneDeep, clamp, isNil, sortBy, merge, pick, orderBy, omit, findLastIndex, noop, isObject as isObject$1, isString } from 'lodash';
 import moment from 'moment';
 import { pipes } from '@next-core/pipes';
@@ -9597,8 +9597,9 @@ 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);
 
-      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);
@@ -10574,14 +10575,20 @@ class Router {
       if (storyboard) {
         var _currentApp$breadcrum, _currentApp$breadcrum2;
 
+        var {
+          bricks,
+          customApis
+        } = scanStoryboard(storyboard);
+
         if (appChanged && currentApp.id && isLoggedIn()) {
-          var usedCustomApis = mapCustomApisToNameAndNamespace(scanCustomApisInStoryboard(storyboard));
+          var usedCustomApis = 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: [],