@next-core/brick-kit 2.157.3 → 2.158.0

package/dist/index.bundle.js

@@ -170,6 +170,8 @@
     K["SOMETHING_WENT_WRONG"] = "SOMETHING_WENT_WRONG";
     K["LOGIN_TIMEOUT_MESSAGE"] = "LOGIN_TIMEOUT_MESSAGE";
     K["NETWORK_ERROR"] = "NETWORK_ERROR";
+    K["PAGE_NOT_FOUND"] = "PAGE_NOT_FOUND";
+    K["APP_NOT_FOUND"] = "APP_NOT_FOUND";
   })(K || (K = {}));
 
   /**
@@ -1105,7 +1107,9 @@
     [K.MODAL_CANCEL]: "Cancel",
     [K.SOMETHING_WENT_WRONG]: "Something went wrong!",
     [K.LOGIN_TIMEOUT_MESSAGE]: "You haven't logged in or your login session has expired. Login right now?",
-    [K.NETWORK_ERROR]: "Network error, please check your network."
+    [K.NETWORK_ERROR]: "Network error, please check your network.",
+    [K.PAGE_NOT_FOUND]: "Page not found, please check the URL",
+    [K.APP_NOT_FOUND]: "App not found, maybe the URL is wrong or you don't have permission to access"
   };
   var en = locale$7;
 
@@ -1115,7 +1119,9 @@
     [K.MODAL_CANCEL]: "取消",
     [K.SOMETHING_WENT_WRONG]: "出现了一些问题！",
     [K.LOGIN_TIMEOUT_MESSAGE]: "您还未登录或登录信息已过期，现在重新登录？",
-    [K.NETWORK_ERROR]: "网络错误，请检查您的网络连接。"
+    [K.NETWORK_ERROR]: "网络错误，请检查您的网络连接。",
+    [K.PAGE_NOT_FOUND]: "请求的页面未找到，请确认 URL 是否正确",
+    [K.APP_NOT_FOUND]: "请求的微应用无法找到, 可能是 URL 错误或者无权限访问"
   };
   var zh = locale$6;
 
@@ -6602,7 +6608,7 @@
       })];
       if (!window.NO_AUTH_GUARD) {
         var matches;
-        var appId = window.APP_ID || (window.APP_ROOT && (matches = window.APP_ROOT.match(/^(?:\/next)?\/sa-static\/([^/]+)\/versions\//)) ? matches[1] : null);
+        var appId = window.APP_ID || (window.APP_ROOT && (matches = window.APP_ROOT.match(/^(?:(?:\/next)?\/)?sa-static\/([^/]+)\/versions\//)) ? matches[1] : null);
         if (appId) {
           // No need to wait.
           safeGetRuntimeMicroAppStandalone(appId);
@@ -6684,6 +6690,7 @@
         console.warn("request standalone runtime api from micro-app-standalone failed: ", error, ", something might went wrong running standalone micro app");
       });
       appRuntimeDataMap.set(appId, promise);
+      return promise;
     });
     return _safeGetRuntimeMicroAppStandalone.apply(this, arguments);
   }
@@ -8194,10 +8201,10 @@
         _this3.currentLayout = layout;
         _this3.presetBricks = layout === "business" ? {
           loadingBar: "business-website.loading-bar",
-          pageNotFound: "business-website.page-not-found",
+          pageNotFound: "presentational-bricks.brick-result",
           pageError: "business-website.page-error"
         } : _objectSpread__default["default"](_objectSpread__default["default"]({}, _this3.bootstrapData.navbar), {}, {
-          pageNotFound: "basic-bricks.page-not-found",
+          pageNotFound: "presentational-bricks.brick-result",
           pageError: "basic-bricks.page-error"
         });
         for (var item of supportedLayouts) {
@@ -11139,15 +11146,37 @@
           redirectToLogin();
           return;
         }
-        yield _this3.kernel.layoutBootstrap(layoutType);
+        yield _this3.kernel.layoutBootstrap(storyboard ? layoutType : "business");
         var brickPageNotFound = _this3.kernel.presetBricks.pageNotFound;
         yield _this3.kernel.loadDynamicBricks([brickPageNotFound]);
+        var notFoundAppConfig = {
+          illustrationsConfig: {
+            name: "no-permission",
+            category: "easyops2"
+          },
+          customTitle: i18next__default["default"].t("".concat(NS_BRICK_KIT, ":").concat(K.APP_NOT_FOUND))
+        };
+        var notFoundPageConfig = {
+          illustrationsConfig: {
+            name: "http-404",
+            category: "exception"
+          },
+          customTitle: i18next__default["default"].t("".concat(NS_BRICK_KIT, ":").concat(K.PAGE_NOT_FOUND))
+        };
         _this3.state = "ready-to-mount";
         mountTree([{
           type: brickPageNotFound,
-          properties: {
-            url: history.createHref(location)
-          },
+          properties: _objectSpread__default["default"]({
+            status: "illustrations",
+            useNewIllustration: true,
+            style: {
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+              transform: "translateY(-100px)",
+              height: "calc(100vh - var(--app-bar-height))"
+            }
+          }, storyboard ? notFoundPageConfig : notFoundAppConfig),
           events: {}
         }], mountPoints.main);
         unmountTree(mountPoints.portal);