@next-core/brick-kit 2.160.1 → 2.160.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.esm.js
CHANGED
|
@@ -1873,8 +1873,10 @@ class StoryboardContextWrapper {
|
|
|
1873
1873
|
mergedContext,
|
|
1874
1874
|
keyword
|
|
1875
1875
|
} = this.getResolveOptions(coreContext);
|
|
1876
|
-
|
|
1877
|
-
|
|
1876
|
+
if (Array.isArray(contextConfs) && contextConfs.length > 0) {
|
|
1877
|
+
var pending = deferResolveContextConcurrently(contextConfs, contextConf => resolveStoryboardContext(contextConf, mergedContext, this, brick), keyword);
|
|
1878
|
+
this.pendingStack.push(pending);
|
|
1879
|
+
}
|
|
1878
1880
|
}
|
|
1879
1881
|
define(contextConfs, coreContext, brick) {
|
|
1880
1882
|
var _this3 = this;
|
|
@@ -2773,20 +2775,23 @@ function constructMenu(_x, _x2, _x3) {
|
|
|
2773
2775
|
function _constructMenu() {
|
|
2774
2776
|
_constructMenu = _asyncToGenerator$3(function* (menuBar, context, kernel) {
|
|
2775
2777
|
var hasSubMenu = !!menuBar.subMenuId;
|
|
2776
|
-
|
|
2777
|
-
|
|
2778
|
-
|
|
2779
|
-
|
|
2780
|
-
|
|
2781
|
-
|
|
2778
|
+
yield Promise.all([_asyncToGenerator$3(function* () {
|
|
2779
|
+
if (menuBar.menuId) {
|
|
2780
|
+
var _menuBar$menu;
|
|
2781
|
+
var defaultCollapsed = (_menuBar$menu = menuBar.menu) === null || _menuBar$menu === void 0 ? void 0 : _menuBar$menu.defaultCollapsed;
|
|
2782
|
+
var menu = yield processMenu(menuBar.menuId, context, kernel, hasSubMenu);
|
|
2783
|
+
if (!isNil(defaultCollapsed)) {
|
|
2784
|
+
menu.defaultCollapsed = defaultCollapsed;
|
|
2785
|
+
}
|
|
2786
|
+
menuBar.menu = menu;
|
|
2787
|
+
}
|
|
2788
|
+
})(), _asyncToGenerator$3(function* () {
|
|
2789
|
+
if (hasSubMenu) {
|
|
2790
|
+
menuBar.subMenu = yield processMenu(menuBar.subMenuId, context, kernel);
|
|
2791
|
+
} else {
|
|
2792
|
+
menuBar.subMenu = null;
|
|
2782
2793
|
}
|
|
2783
|
-
|
|
2784
|
-
}
|
|
2785
|
-
if (hasSubMenu) {
|
|
2786
|
-
menuBar.subMenu = yield processMenu(menuBar.subMenuId, context, kernel);
|
|
2787
|
-
} else {
|
|
2788
|
-
menuBar.subMenu = null;
|
|
2789
|
-
}
|
|
2794
|
+
})()]);
|
|
2790
2795
|
});
|
|
2791
2796
|
return _constructMenu.apply(this, arguments);
|
|
2792
2797
|
}
|
|
@@ -2867,8 +2872,8 @@ function _mergeMenu() {
|
|
|
2867
2872
|
(function () {
|
|
2868
2873
|
var menuI18nNamespace = getI18nNamespace("menu", "".concat(menu.menuId, "~").concat(menu.app[0].appId, "+").concat(menu.instanceId));
|
|
2869
2874
|
// Support any language in `meta.i18n`.
|
|
2870
|
-
Object.entries(menu.i18n).forEach(
|
|
2871
|
-
var [lang, resources] =
|
|
2875
|
+
Object.entries(menu.i18n).forEach(_ref6 => {
|
|
2876
|
+
var [lang, resources] = _ref6;
|
|
2872
2877
|
i18next.addResourceBundle(lang, menuI18nNamespace, resources);
|
|
2873
2878
|
});
|
|
2874
2879
|
menuWithI18n.set(menu, menuI18nNamespace);
|