@next-core/brick-kit 2.178.13 → 2.178.15

package/dist/index.bundle.js

@@ -4044,6 +4044,20 @@
     return error instanceof brickHttp.HttpAbortError;
   }
 
+  function setLoginStateCookie(location) {
+    // 独立打包应用 登录时间超时后还是由前端控制跳转，后台无法处理设置登录前的 path 和 query 的 cookie 值
+    // 此这场景下前端做下处理
+
+    var {
+      search,
+      pathname
+    } = location;
+    var pathValue = pathname ? window.btoa(encodeURIComponent(pathname)) : "";
+    var searchValue = search ? window.btoa(encodeURIComponent(search)) : "";
+    document.cookie = "SALOGINPATH=".concat(pathValue, "; path=/");
+    document.cookie = "SALOGINQUERY=".concat(searchValue, "; path=/");
+  }
+
   /**
    * 将 http 请求错误转换为可读的字符串。
    *
@@ -4099,6 +4113,7 @@
         onOk: () => {
           var ssoEnabled = getRuntime().getFeatureFlags()["sso-enabled"];
           var history = getHistory();
+          setLoginStateCookie(history.location);
           history.push(ssoEnabled ? "/sso-auth/login" : "/auth/login", {
             from: _objectSpread__default["default"](_objectSpread__default["default"]({}, history.location), {}, {
               state: undefined
@@ -8615,6 +8630,7 @@
   }
 
   var _excluded$3 = ["params"];
+  var V3WidgetMates = ["basic.v3-widget-mate"];
   class Kernel {
     constructor() {
       var _this = this;
@@ -8671,6 +8687,7 @@
             yield loadScriptOfDll(eager.dll);
             yield loadScriptOfBricksOrTemplates(eager.deps);
             if ((_eager$v3Bricks = eager.v3Bricks) !== null && _eager$v3Bricks !== void 0 && _eager$v3Bricks.length) {
+              yield catchLoad(loader.loadBricksImperatively(V3WidgetMates, brickPackages), "brick", V3WidgetMates[0]);
               yield loader.loadBricksImperatively(eager.v3Bricks, brickPackages);
             }
             // 加载构件资源时，不再阻塞后续业务数据的加载，在挂载构件时再等待该任务完成。
@@ -8704,16 +8721,27 @@
             bricks: filteredBricks,
             processors
           }, _this.bootstrapData.brickPackages);
+          var loadV3Bricks = /*#__PURE__*/function () {
+            var _ref4 = _asyncToGenerator__default["default"](function* () {
+              if (v3Bricks !== null && v3Bricks !== void 0 && v3Bricks.some(brick => brick.includes(".tpl-"))) {
+                yield catchLoad(loader.loadBricksImperatively(V3WidgetMates, brickPackages), "brick", V3WidgetMates[0]);
+              }
+              yield Promise.all([(v3Bricks === null || v3Bricks === void 0 ? void 0 : v3Bricks.length) && loader.loadBricksImperatively(v3Bricks, brickPackages), (v3Processors === null || v3Processors === void 0 ? void 0 : v3Processors.length) && loader.loadProcessorsImperatively(v3Processors, brickPackages)]);
+            });
+            return function loadV3Bricks() {
+              return _ref4.apply(this, arguments);
+            };
+          }();
           yield loadScriptOfDll(dll);
           yield loadScriptOfBricksOrTemplates(deps);
-          yield Promise.all([loadLazyBricks(filteredBricks), (v3Bricks === null || v3Bricks === void 0 ? void 0 : v3Bricks.length) && loader.loadBricksImperatively(v3Bricks, brickPackages), (v3Processors === null || v3Processors === void 0 ? void 0 : v3Processors.length) && loader.loadProcessorsImperatively(v3Processors, brickPackages)]);
+          yield Promise.all([loadLazyBricks(filteredBricks), loadV3Bricks()]);
         });
         return function (_x2, _x3) {
           return _ref3.apply(this, arguments);
         };
       }());
       _defineProperty__default["default"](this, "_loadEditorBricks", /*#__PURE__*/function () {
-        var _ref4 = _asyncToGenerator__default["default"](function* (editorBricks) {
+        var _ref5 = _asyncToGenerator__default["default"](function* (editorBricks) {
           var {
             dll,
             deps
@@ -8726,7 +8754,7 @@
           yield loadScriptOfBricksOrTemplates(deps);
         });
         return function (_x4) {
-          return _ref4.apply(this, arguments);
+          return _ref5.apply(this, arguments);
         };
       }());
     }
@@ -8920,8 +8948,8 @@
         // Prefix to avoid conflict between brick package's i18n namespace.
         var i18nNamespace = getI18nNamespace("app", storyboard.app.id);
         // Support any language in `meta.i18n`.
-        Object.entries(storyboard.meta.i18n).forEach(_ref5 => {
-          var [lang, resources] = _ref5;
+        Object.entries(storyboard.meta.i18n).forEach(_ref6 => {
+          var [lang, resources] = _ref6;
           i18next__default["default"].addResourceBundle(lang, i18nNamespace, resources);
         });
       }
@@ -9112,12 +9140,12 @@
         routes.splice(previewRouteIndex, 1, newPreviewRoute);
       }
     }
-    _dev_only_getAddedContracts(storyboardPatch, _ref6) {
+    _dev_only_getAddedContracts(storyboardPatch, _ref7) {
       var {
         appId,
         updateStoryboardType,
         formId
-      } = _ref6;
+      } = _ref7;
       var storyboard = this.bootstrapData.storyboards.find(item => item.app.id === appId);
       var updatedStoryboard;
 
@@ -9416,8 +9444,8 @@
           });
         });
         if (!filterMenus.length) {
-          var _ref7, _yield$InstanceApi_po;
-          filterMenus = (_ref7 = _this12.getFeatureFlags()["three-level-menu-layout"] ? (yield InstalledMicroAppApi_getMenusInfo(menuId, {
+          var _ref8, _yield$InstanceApi_po;
+          filterMenus = (_ref8 = _this12.getFeatureFlags()["three-level-menu-layout"] ? (yield InstalledMicroAppApi_getMenusInfo(menuId, {
             menuObjectId: "STANDALONE_MENU@EASYOPS"
           })).menus : (_yield$InstanceApi_po = yield InstanceApi_postSearch("STANDALONE_MENU@EASYOPS", {
             page: 1,
@@ -9448,7 +9476,7 @@
                 $eq: true
               }
             }
-          })) === null || _yield$InstanceApi_po === void 0 ? void 0 : _yield$InstanceApi_po.list) !== null && _ref7 !== void 0 ? _ref7 : [];
+          })) === null || _yield$InstanceApi_po === void 0 ? void 0 : _yield$InstanceApi_po.list) !== null && _ref8 !== void 0 ? _ref8 : [];
         }
         return filterMenus;
       })();
@@ -9518,6 +9546,12 @@
       }, theme.variables));
     }
   }
+  function catchLoad(promise, type, name) {
+    return promise.catch(e => {
+      // eslint-disable-next-line no-console
+      console.error("Load ".concat(type, " \"").concat(name, "\" failed:"), e);
+    });
+  }
 
   /** @internal */
 
@@ -11705,6 +11739,7 @@
         devtoolsHookEmit("rendering");
         unmountTree(mountPoints.bg);
         var redirectToLogin = () => {
+          setLoginStateCookie(location);
           history.replace(_this3.kernel.getFeatureFlags()["sso-enabled"] ? "/sso-auth/login" : "/auth/login", {
             from: location
           });