@next-core/brick-kit 2.141.1 → 2.142.0

package/dist/index.esm.js

@@ -3131,7 +3131,7 @@ function _fetchMenuById() {
       return menuCache.get(menuId);
     }
 
-    var menuList = window.STANDALONE_MICRO_APPS ? kernel.getStandaloneMenus(menuId, isPreFetch) : (yield InstanceApi_postSearch("EASYOPS_STORYBOARD_MENU", {
+    var menuList = window.STANDALONE_MICRO_APPS ? yield kernel.getStandaloneMenus(menuId, isPreFetch) : (yield InstanceApi_postSearch("EASYOPS_STORYBOARD_MENU", {
       page: 1,
       page_size: 200,
       fields: {
@@ -3450,17 +3450,10 @@ function computeRealValueWithOverrideApp(data, overrideAppId, context, kernel) {
 
   if (overrideAppId !== context.app.id && attemptToVisit(data, ["APP", "I18N"])) {
     var storyboard = kernel.bootstrapData.storyboards.find(story => story.app.id === overrideAppId);
-    /* istanbul ignore else: non-productive case */
-
-    if (storyboard) {
-      newContext = _objectSpread(_objectSpread({}, context), {}, {
-        overrideApp: storyboard.app,
-        appendI18nNamespace: data[symbolMenuI18nNamespace]
-      });
-    } else {
-      // eslint-disable-next-line no-console
-      console.error("The app which injects menu was not found:", overrideAppId);
-    }
+    newContext = _objectSpread(_objectSpread({}, context), {}, {
+      overrideApp: storyboard === null || storyboard === void 0 ? void 0 : storyboard.app,
+      appendI18nNamespace: data[symbolMenuI18nNamespace]
+    });
   }
 
   return computeRealValue(data, newContext, true, {
@@ -9320,8 +9313,7 @@ class Kernel {
       var filteredStoryboards = appIds.map(appId => _this7.bootstrapData.storyboards.find(story => story.app.id === appId)).filter(story => story && !story.$$fulfilled && !story.$$i18nFulfilled);
 
       if (window.STANDALONE_MICRO_APPS) {
-        // Fallback to fullfil whole storyboard for standalone micro-apps.
-        yield Promise.all(filteredStoryboards.map(story => _this7.fulfilStoryboard(story)));
+        // standalone micros-apps not need to request i18n
         return;
       } // Do not fulfil i18n if the app is doing a whole fulfilling.
 
@@ -9773,21 +9765,63 @@ class Kernel {
   }
 
   getStandaloneMenus(menuId, isPreFetch) {
-    var _currentStoryboard$me, _currentStoryboard$me2;
-
-    var app = isPreFetch ? this.nextApp : this.currentApp;
-    var currentAppId = app.id;
-    var currentStoryboard = this.bootstrapData.storyboards.find(storyboard => storyboard.app.id === currentAppId);
-    var menus = (_currentStoryboard$me = currentStoryboard.meta) !== null && _currentStoryboard$me !== void 0 && _currentStoryboard$me.injectMenus ? cloneDeep(currentStoryboard.meta.injectMenus) : (_currentStoryboard$me2 = currentStoryboard.meta) !== null && _currentStoryboard$me2 !== void 0 && _currentStoryboard$me2.menus ? cloneDeep(currentStoryboard.meta.menus) : [];
-    return menus.filter(menu => menu.menuId === menuId).map(menu => {
-      var _menu$app;
-
-      return _objectSpread(_objectSpread({}, menu), (_menu$app = menu.app) !== null && _menu$app !== void 0 && _menu$app.length && menu.app[0].appId ? {} : {
-        app: [{
-          appId: currentAppId
-        }]
+    var _this11 = this;
+
+    return _asyncToGenerator$3(function* () {
+      var _currentStoryboard$me, _currentStoryboard$me2;
+
+      var app = isPreFetch ? _this11.nextApp : _this11.currentApp;
+      var currentAppId = app.id;
+
+      var currentStoryboard = _this11.bootstrapData.storyboards.find(storyboard => storyboard.app.id === currentAppId);
+
+      var menus = (_currentStoryboard$me = currentStoryboard.meta) !== null && _currentStoryboard$me !== void 0 && _currentStoryboard$me.injectMenus ? cloneDeep(currentStoryboard.meta.injectMenus) : (_currentStoryboard$me2 = currentStoryboard.meta) !== null && _currentStoryboard$me2 !== void 0 && _currentStoryboard$me2.menus ? cloneDeep(currentStoryboard.meta.menus) : [];
+      var filterMenus = menus.filter(menu => menu.menuId === menuId).map(menu => {
+        var _menu$app;
+
+        return _objectSpread(_objectSpread({}, menu), (_menu$app = menu.app) !== null && _menu$app !== void 0 && _menu$app.length && menu.app[0].appId ? {} : {
+          app: [{
+            appId: currentAppId
+          }]
+        });
       });
-    });
+
+      if (!filterMenus.length) {
+        var _ref5, _yield$InstanceApi_po;
+
+        filterMenus = (_ref5 = (_yield$InstanceApi_po = yield InstanceApi_postSearch("STANDALONE_MENU@EASYOPS", {
+          page: 1,
+          page_size: 200,
+          fields: {
+            menuId: true,
+            title: true,
+            icon: true,
+            link: true,
+            titleDataSource: true,
+            defaultCollapsed: true,
+            defaultCollapsedBreakpoint: true,
+            type: true,
+            injectMenuGroupId: true,
+            dynamicItems: true,
+            itemsResolve: true,
+            items: true,
+            i18n: true,
+            "items.children": true,
+            "app.appId": true
+          },
+          query: {
+            menuId: {
+              $eq: menuId
+            },
+            "app.isActiveVersion": {
+              $eq: true
+            }
+          }
+        })) === null || _yield$InstanceApi_po === void 0 ? void 0 : _yield$InstanceApi_po.list) !== null && _ref5 !== void 0 ? _ref5 : [];
+      }
+
+      return filterMenus;
+    })();
   }
 
   getOriginFaviconHref() {
@@ -9795,22 +9829,22 @@ class Kernel {
   }
 
   getProviderBrick(provider) {
-    var _this11 = this;
+    var _this12 = this;
 
     return _asyncToGenerator$3(function* () {
       if (isCustomApiProvider(provider)) {
         provider = CUSTOM_API_PROVIDER;
       }
 
-      if (_this11.providerRepository.has(provider)) {
-        return _this11.providerRepository.get(provider);
+      if (_this12.providerRepository.has(provider)) {
+        return _this12.providerRepository.get(provider);
       }
 
       if (provider === CUSTOM_API_PROVIDER && !customElements.get(provider)) {
         registerCustomApi();
       }
 
-      yield _this11.loadDynamicBricks([provider]);
+      yield _this12.loadDynamicBricks([provider]);
 
       if (!customElements.get(provider)) {
         throw new Error("Provider not defined: \"".concat(provider, "\"."));
@@ -9818,7 +9852,7 @@ class Kernel {
 
       var brick = document.createElement(provider);
 
-      _this11.providerRepository.set(provider, brick);
+      _this12.providerRepository.set(provider, brick);
 
       return brick;
     })();