@next-core/brick-kit 2.167.0 → 2.168.0

package/dist/index.esm.js

@@ -4,7 +4,7 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import _defineProperty$1 from '@babel/runtime/helpers/defineProperty';
 import _asyncToGenerator$3 from '@babel/runtime/helpers/asyncToGenerator';
 import _, { set, get, difference, identity, uniqueId, cloneDeep, clamp, isNil, isEmpty, merge, sortBy, orderBy, isObject as isObject$1, uniq, pick, omit, findLastIndex, noop, isString as isString$1 } from 'lodash';
-import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, trackFormState, scanPermissionActionsInStoryboard, precookFunction, cook, collectContextUsage, deferResolveContextConcurrently, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedFormState, trackUsedState, trackUsedContext, shouldAllowRecursiveEvaluations, preevaluate, inject, scanPermissionActionsInAny, deepFreeze, matchPath, asyncProcessBrick, createProviderClass, removeDeadConditionsInTpl, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript as loadScript$1, scanAppGetMenuInAny, scanInstalledAppsInStoryboard, removeDeadConditions, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
+import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, isTrackAll, trackAll, trackContext, trackState, trackFormState, transformAndInject, transform, scanPermissionActionsInStoryboard, precookFunction, cook, collectContextUsage, deferResolveContextConcurrently, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedFormState, trackUsedState, trackUsedContext, shouldAllowRecursiveEvaluations, preevaluate, inject, scanPermissionActionsInAny, deepFreeze, matchPath, asyncProcessBrick, createProviderClass, removeDeadConditionsInTpl, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript as loadScript$1, scanAppGetMenuInAny, scanInstalledAppsInStoryboard, removeDeadConditions, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
 import React, { useState, useEffect, useRef, useMemo, useCallback, forwardRef, useImperativeHandle, useContext, createContext, useReducer } from 'react';
 import { http, HttpResponseError, HttpAbortError, HttpFetchError } from '@next-core/brick-http';
 import { Modal, message, Empty, ConfigProvider } from 'antd';
@@ -173,6 +173,10 @@ var K;
   K["NETWORK_ERROR"] = "NETWORK_ERROR";
   K["PAGE_NOT_FOUND"] = "PAGE_NOT_FOUND";
   K["APP_NOT_FOUND"] = "APP_NOT_FOUND";
+  K["LICENSE_EXPIRED"] = "LICENSE_EXPIRED";
+  K["NO_PERMISSION"] = "NO_PERMISSION";
+  K["OTHER_ERROR"] = "OTHER_ERROR";
+  K["GO_BACK_PREVIOUS_PAGE"] = "GO_BACK_PREVIOUS_PAGE";
 })(K || (K = {}));
 
 /**
@@ -822,6 +826,32 @@ function getNextStateOfUseBrick(state, isArray, key) {
   return StateOfUseBrick.INITIAL;
 }
 
+function getTracks(value) {
+  var contextNames = false;
+  var stateNames = false;
+  var formStateNames = false;
+  if (typeof value === "string" ? isEvaluable(value) : isPreEvaluated(value)) {
+    var raw = typeof value === "string" ? value : getPreEvaluatedRaw(value);
+    if (isTrackAll(raw)) {
+      var result = trackAll(raw);
+      if (result) {
+        contextNames = result.context;
+        stateNames = result.state;
+        formStateNames = result.formState;
+      }
+    } else {
+      contextNames = trackContext(raw);
+      stateNames = trackState(raw);
+      formStateNames = trackFormState(raw);
+    }
+  }
+  return {
+    contextNames,
+    stateNames,
+    formStateNames
+  };
+}
+
 /** @internal */
 function transformElementProperties(element, data, to, from, mapArray) {
   var result = preprocessTransformProperties(data, to, from, mapArray);
@@ -886,9 +916,11 @@ function doTransform(data, to, options) {
         raw = getPreEvaluatedRaw(v);
         addDataToPreEvaluated(v, data);
       }
-      var contextNames = trackContext(raw);
-      var stateNames = trackState(raw);
-      var formStateNames = trackFormState(raw);
+      var {
+        contextNames,
+        stateNames,
+        formStateNames
+      } = getTracks(raw);
       if (contextNames || stateNames || formStateNames) {
         options.trackingContextList.push({
           contextNames,
@@ -1126,7 +1158,11 @@ var locale$7 = {
   [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.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"
+  [K.APP_NOT_FOUND]: "App not found, maybe the URL is wrong or you don't have permission to access",
+  [K.LICENSE_EXPIRED]: "The license authorization has expired, please contact the platform administrator",
+  [K.NO_PERMISSION]: "Unauthorized access, unable to retrieve the required resources for this page",
+  [K.OTHER_ERROR]: "Oops! Something went wrong",
+  [K.GO_BACK_PREVIOUS_PAGE]: "Go back to previous page"
 };
 var en = locale$7;
 
@@ -1138,7 +1174,11 @@ var locale$6 = {
   [K.LOGIN_TIMEOUT_MESSAGE]: "您还未登录或登录信息已过期，现在重新登录？",
   [K.NETWORK_ERROR]: "网络错误，请检查您的网络连接。",
   [K.PAGE_NOT_FOUND]: "请求的页面未找到，请确认 URL 是否正确",
-  [K.APP_NOT_FOUND]: "请求的微应用无法找到, 可能是 URL 错误或者无权限访问"
+  [K.APP_NOT_FOUND]: "请求的微应用无法找到, 可能是 URL 错误或者无权限访问",
+  [K.LICENSE_EXPIRED]: "License 授权失效，请联系平台管理员",
+  [K.NO_PERMISSION]: "没有权限，无法获取页面所需要的资源",
+  [K.OTHER_ERROR]: "糟糕！页面出现了一些问题",
+  [K.GO_BACK_PREVIOUS_PAGE]: "回到上一页"
 };
 var zh = locale$6;
 
@@ -2621,12 +2661,12 @@ function setupTemplateProxy(proxyContext, ref, slots) {
 var _excluded$7 = ["properties", "slots"];
 function setupUseBrickInTemplate(props, proxyContext) {
   function walk(props) {
-    if (!isObject(props)) {
-      return props;
-    }
     if (Array.isArray(props)) {
       return props.map(walk);
     }
+    if (!isObject(props) || !isPlainObject(props)) {
+      return props;
+    }
     return Object.fromEntries(Object.entries(props).map(_ref => {
       var [key, value] = _ref;
       return isObject(value) && key === "useBrick" ? Array.isArray(value) ? [key, value.map(setup)] : [key, setup(value)] : [key, walk(value)];
@@ -2653,6 +2693,9 @@ function setupUseBrickInTemplate(props, proxyContext) {
   }
   return walk(props);
 }
+function isPlainObject(object) {
+  return Object.prototype.toString.call(object) === "[object Object]";
+}
 
 var computeRealValue = (value, context, injectDeep, internalOptions) => {
   var preEvaluated = isPreEvaluated(value);
@@ -2752,11 +2795,12 @@ function computeRealProperties(properties, context, injectDeep, trackingContextL
           result[propName] = realValue;
         }
       }
-      if (Array.isArray(trackingContextList) && (typeof propValue === "string" ? isEvaluable(propValue) : isPreEvaluated(propValue))) {
-        var raw = typeof propValue === "string" ? propValue : getPreEvaluatedRaw(propValue);
-        var contextNames = trackContext(raw);
-        var stateNames = trackState(raw);
-        var formStateNames = trackFormState(raw);
+      if (Array.isArray(trackingContextList)) {
+        var {
+          contextNames,
+          stateNames,
+          formStateNames
+        } = getTracks(propValue);
         if (contextNames || stateNames || formStateNames) {
           trackingContextList.push({
             contextNames,
@@ -3902,6 +3946,47 @@ function LoginTimeoutMessage() {
   }, []);
   return /*#__PURE__*/React.createElement("div", null, i18next.t("".concat(NS_BRICK_KIT, ":").concat(K.LOGIN_TIMEOUT_MESSAGE)));
 }
+function getConfOfHttpStatus(error) {
+  var _error$response;
+  switch ((_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.status) {
+    case 403:
+      return {
+        showBackLink: true,
+        title: i18next.t("".concat(NS_BRICK_KIT, ":").concat(K.NO_PERMISSION)),
+        illustration: {
+          name: "no-permission",
+          category: "easyops2"
+        }
+      };
+    default:
+      return null;
+  }
+}
+function getConfOfHttpCode(error) {
+  var _error$responseJson;
+  switch ((_error$responseJson = error.responseJson) === null || _error$responseJson === void 0 ? void 0 : _error$responseJson.code) {
+    case "200000":
+      return {
+        title: i18next.t("".concat(NS_BRICK_KIT, ":").concat(K.LICENSE_EXPIRED)),
+        illustration: {
+          name: "license-expired",
+          category: "easyops2"
+        }
+      };
+    default:
+      return {
+        showBackLink: true,
+        title: i18next.t("".concat(NS_BRICK_KIT, ":").concat(K.OTHER_ERROR)),
+        illustration: {
+          name: "unknown-error",
+          category: "easyops2"
+        }
+      };
+  }
+}
+function getRefinedErrorConf(error) {
+  return [getConfOfHttpStatus, getConfOfHttpCode].reduce((result, method) => result ? result : method(error), null);
+}
 
 class WebsocketMessageRequest {
   constructor(event, topic) {
@@ -8696,10 +8781,10 @@ class Kernel {
       _this3.presetBricks = layout === "business" ? {
         loadingBar: "business-website.loading-bar",
         pageNotFound: "presentational-bricks.brick-result",
-        pageError: "business-website.page-error"
+        pageError: "presentational-bricks.brick-result"
       } : _objectSpread(_objectSpread({}, _this3.bootstrapData.navbar), {}, {
         pageNotFound: "presentational-bricks.brick-result",
-        pageError: "basic-bricks.page-error"
+        pageError: "presentational-bricks.brick-result"
       });
       for (var item of supportedLayouts) {
         if (item === layout) {
@@ -11513,6 +11598,13 @@ class Router {
         }
         _this3.kernel.setOriginFaviconHref(faviconElement.href);
       }
+      var illustrationStyle = {
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        transform: "translateY(-100px)",
+        height: "calc(100vh - var(--app-bar-height))"
+      };
       setTheme(((_getLocalAppsTheme = getLocalAppsTheme()) === null || _getLocalAppsTheme === void 0 ? void 0 : _getLocalAppsTheme[currentApp === null || currentApp === void 0 ? void 0 : currentApp.id]) || (currentApp === null || currentApp === void 0 ? void 0 : currentApp.theme) || "light");
       getRuntime().getFeatureFlags()["support-ui-8.2-compact-layout"] ? document.body.classList.add("compact-layout") : document.body.classList.remove("compact-layout");
       setMode("default");
@@ -11570,14 +11662,41 @@ class Router {
             var brickPageError = _this3.kernel.presetBricks.pageError;
             yield _this3.kernel.loadDynamicBricks([brickPageError]);
             mountRoutesResult.flags.failed = true;
-            mountRoutesResult.main = [{
+            var {
+              title,
+              illustration,
+              showBackLink
+            } = getRefinedErrorConf(error);
+            mountRoutesResult.main = [_objectSpread(_objectSpread({
               type: brickPageError,
               properties: {
-                error: httpErrorToString(error),
-                code: error instanceof HttpResponseError ? error.response.status : null
-              },
+                status: "illustrations",
+                useNewIllustration: true,
+                customTitle: title,
+                subTitle: httpErrorToString(error),
+                illustrationsConfig: illustration,
+                style: illustrationStyle
+              }
+            }, showBackLink ? {
+              children: [{
+                type: "a",
+                properties: {
+                  textContent: i18next.t("".concat(NS_BRICK_KIT, ":").concat(K.GO_BACK_PREVIOUS_PAGE)),
+                  style: {
+                    display: "block",
+                    textAlign: "center"
+                  }
+                },
+                slotId: "content",
+                events: {
+                  click: [{
+                    action: "history.goBack"
+                  }]
+                }
+              }]
+            } : {}), {}, {
               events: {}
-            }];
+            })];
             mountRoutesResult.portal = [];
           }
         }
@@ -11798,13 +11917,7 @@ class Router {
         properties: _objectSpread({
           status: "illustrations",
           useNewIllustration: true,
-          style: {
-            display: "flex",
-            alignItems: "center",
-            justifyContent: "center",
-            transform: "translateY(-100px)",
-            height: "calc(100vh - var(--app-bar-height))"
-          }
+          style: illustrationStyle
         }, storyboard ? notFoundPageConfig : notFoundAppConfig),
         events: {}
       }], mountPoints.main);