@next-core/brick-kit 2.128.0 → 2.129.1

package/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.129.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.129.0...@next-core/brick-kit@2.129.1) (2022-08-22)
+
+
+### Bug Fixes
+
+* **handleHttpError:** 修复请求报错msg超出弹窗的问题  refs INSTANCE-2681 ([0944a36](https://github.com/easyops-cn/next-core/commit/0944a36f2733f4f10ae77f93391adaf5ed994cd8))
+
+
+
+
+
+# [2.129.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.128.1...@next-core/brick-kit@2.129.0) (2022-08-19)
+
+
+### Features
+
+* support crsf token ([3ef8c62](https://github.com/easyops-cn/next-core/commit/3ef8c624af8126185222ce2e98c4c5622e6de9e7))
+
+
+
+
+
+## [2.128.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.128.0...@next-core/brick-kit@2.128.1) (2022-08-19)
+
+
+### Bug Fixes
+
+* fix menu prefetch in standalone apps ([e96b0cf](https://github.com/easyops-cn/next-core/commit/e96b0cfbe973a285ec6f8b5ceb2d8a3e638210bb))
+* support setting standalone app root ([8e0d3e4](https://github.com/easyops-cn/next-core/commit/8e0d3e49c2c2b93f2b05de4a857c6c6724f27b82))
+
+
+
+
+
 # [2.128.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.127.3...@next-core/brick-kit@2.128.0) (2022-08-18)
 
 

package/dist/index.bundle.js

@@ -1414,7 +1414,8 @@
       userInstanceId: newAuth.userInstanceId,
       loginFrom: newAuth.loginFrom,
       accessRule: newAuth.accessRule,
-      isAdmin: newAuth.isAdmin
+      isAdmin: newAuth.isAdmin,
+      csrfToken: newAuth.csrfToken
     }); // re-init analytics to set user_id
 
     if (easyopsAnalytics.userAnalytics.initialized) {
@@ -1438,6 +1439,7 @@
     auth.userInstanceId = undefined;
     auth.accessRule = undefined;
     auth.isAdmin = undefined;
+    auth.csrfToken = undefined;
     resetPermissionPreChecks(); // re-init analytics to clear user_id
 
     easyopsAnalytics.userAnalytics.setUserId();
@@ -3011,30 +3013,30 @@
     return _constructMenu.apply(this, arguments);
   }
 
-  function constructMenuByMenusList(_x4, _x5, _x6) {
-    return _constructMenuByMenusList.apply(this, arguments);
+  function preConstructMenus(_x4, _x5, _x6) {
+    return _preConstructMenus.apply(this, arguments);
   }
 
-  function _constructMenuByMenusList() {
-    _constructMenuByMenusList = _asyncToGenerator__default["default"](function* (menus, context, kernel) {
-      var data = yield Promise.all(menus.map(menuId => processMenu(menuId, context, kernel)));
+  function _preConstructMenus() {
+    _preConstructMenus = _asyncToGenerator__default["default"](function* (menus, context, kernel) {
+      var data = yield Promise.all(menus.map(menuId => processMenu(menuId, context, kernel, undefined, true)));
       data.forEach((item, index) => processMenuCache.set(menus[index], item));
     });
-    return _constructMenuByMenusList.apply(this, arguments);
+    return _preConstructMenus.apply(this, arguments);
   }
 
   var getMenu = menuId => processMenuCache.get(menuId);
-  function fetchMenuById(_x7, _x8) {
+  function fetchMenuById(_x7, _x8, _x9) {
     return _fetchMenuById.apply(this, arguments);
   }
 
   function _fetchMenuById() {
-    _fetchMenuById = _asyncToGenerator__default["default"](function* (menuId, kernel) {
+    _fetchMenuById = _asyncToGenerator__default["default"](function* (menuId, kernel, isPreFetch) {
       if (menuCache.has(menuId)) {
         return menuCache.get(menuId);
       }
 
-      var menuList = window.STANDALONE_MICRO_APPS ? kernel.getStandaloneMenus(menuId) : (yield InstanceApi_postSearch("EASYOPS_STORYBOARD_MENU", {
+      var menuList = window.STANDALONE_MICRO_APPS ? kernel.getStandaloneMenus(menuId, isPreFetch) : (yield InstanceApi_postSearch("EASYOPS_STORYBOARD_MENU", {
         page: 1,
         page_size: 200,
         fields: {
@@ -3130,7 +3132,7 @@
     });
   }
 
-  function loadDynamicMenuItems(_x9) {
+  function loadDynamicMenuItems(_x10) {
     return _loadDynamicMenuItems.apply(this, arguments);
   }
 
@@ -3148,13 +3150,13 @@
     return _loadDynamicMenuItems.apply(this, arguments);
   }
 
-  function processMenu(_x10, _x11, _x12, _x13) {
+  function processMenu(_x11, _x12, _x13, _x14, _x15) {
     return _processMenu.apply(this, arguments);
   }
 
   function _processMenu() {
-    _processMenu = _asyncToGenerator__default["default"](function* (menuId, context, kernel, hasSubMenu) {
-      var _yield$fetchMenuById = yield fetchMenuById(menuId, kernel),
+    _processMenu = _asyncToGenerator__default["default"](function* (menuId, context, kernel, hasSubMenu, isPreFetch) {
+      var _yield$fetchMenuById = yield fetchMenuById(menuId, kernel, isPreFetch),
           {
         items,
         app
@@ -3207,19 +3209,19 @@
         });
       });
 
-      return function (_x14) {
+      return function (_x16) {
         return _ref2.apply(this, arguments);
       };
     }()));
   }
 
-  function processMenuTitle(_x15) {
+  function processMenuTitle(_x17) {
     return _processMenuTitle.apply(this, arguments);
   }
 
   function _processMenuTitle() {
     _processMenuTitle = _asyncToGenerator__default["default"](function* (menuData) {
-      if (menuData.title || !menuData.titleDataSource) {
+      if (menuData.title || _.isEmpty(menuData.titleDataSource)) {
         return menuData.title;
       }
 
@@ -3308,7 +3310,7 @@
     return false;
   }
 
-  function computeRealValueWithOverrideApp(_x16, _x17, _x18, _x19) {
+  function computeRealValueWithOverrideApp(_x18, _x19, _x20, _x21) {
     return _computeRealValueWithOverrideApp.apply(this, arguments);
   }
 
@@ -4014,8 +4016,11 @@
       content: /*#__PURE__*/React__default["default"].createElement("div", {
         style: {
           whiteSpace: "pre-wrap"
+        },
+        dangerouslySetInnerHTML: {
+          __html: httpErrorToString(error)
         }
-      }, httpErrorToString(error)),
+      }),
       okText: i18next__default["default"].t("".concat(NS_BRICK_KIT, ":").concat(K.MODAL_OK))
     });
   }
@@ -9521,10 +9526,11 @@
       return Object.assign({}, (_this$bootstrapData = this.bootstrapData) === null || _this$bootstrapData === void 0 ? void 0 : (_this$bootstrapData$s = _this$bootstrapData.settings) === null || _this$bootstrapData$s === void 0 ? void 0 : _this$bootstrapData$s.featureFlags);
     }
 
-    getStandaloneMenus(menuId) {
+    getStandaloneMenus(menuId, isPreFetch) {
       var _currentStoryboard$me, _currentStoryboard$me2;
 
-      var currentAppId = this.currentApp.id;
+      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 => {
@@ -10955,7 +10961,7 @@
         var useMenus = brickUtils.scanAppGetMenuInAny(data);
 
         if (useMenus.length) {
-          yield constructMenuByMenusList(useMenus, _this7.getCurrentContext(), _this7.kernel);
+          yield preConstructMenus(useMenus, _this7.getCurrentContext(), _this7.kernel);
         }
       })();
     }