@lemon-fe/kits 1.4.14-alpha.1 → 1.4.14-alpha.2

package/es/app-provider/index.d.ts

@@ -6,14 +6,14 @@ declare type AppConfigProps = {
     children?: ReactNode | null;
     locale?: Locale;
     hooksConfig?: Partial<HooksOpts>;
-    batchOperatorConfig?: {
-        openError?: (err: Error) => void;
-    };
+};
+declare type BatchOperatorConfig = {
+    openError?: (err: Error) => void;
 };
 export declare const AppContext: React.Context<{
     message: ReturnType<typeof message.useMessage>[0];
     modal: ReturnType<typeof Modal.useModal>[0];
-    batchOperatorConfig?: AppConfigProps['batchOperatorConfig'];
+    batchOperatorConfig?: BatchOperatorConfig | undefined;
 }>;
 declare function AppProvider(props: AppConfigProps): JSX.Element;
 declare namespace AppProvider {

package/es/app-provider/index.js

@@ -10,9 +10,10 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { createContext, useMemo, useContext } from 'react';
-import { PageLoading, message, Modal, ConfigProvider, Result, Button } from '@lemon-fe/components';
+import React, { createContext, useMemo, useContext, useCallback } from 'react';
+import { PageLoading, message, Modal, ConfigProvider, Result, Button, RequestErrorMessage } from '@lemon-fe/components';
 import { HooksConfigProvider } from '@lemon-fe/hooks';
+import { isRequestError } from '@lemon-fe/utils';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var AppContext = /*#__PURE__*/createContext({
@@ -33,13 +34,40 @@ export default function AppProvider(props) {
     modalContextHolder = _Modal$useModal2[1];
   var localeCtx = useContext(ConfigProvider.ConfigContext).locale;
   var locale = props.locale || localeCtx;
+  var _showError = useCallback(function (err) {
+    if (isRequestError(err)) {
+      if (err.message.length > 30) {
+        modalApi.error({
+          title: locale === null || locale === void 0 ? void 0 : locale.Common.requestErrorTitle,
+          width: 420,
+          content: /*#__PURE__*/_jsx(RequestErrorMessage, {
+            error: err
+          })
+        });
+      } else {
+        messageApi.error( /*#__PURE__*/_jsx(RequestErrorMessage, {
+          error: err
+        }));
+      }
+    } else {
+      messageApi.warning( /*#__PURE__*/_jsx(RequestErrorMessage, {
+        error: err
+      }));
+    }
+  }, []);
+  var batchOperatorConfig = useMemo(function () {
+    var result = {
+      openError: _showError
+    };
+    return result;
+  }, []);
   var appContext = useMemo(function () {
     return {
       message: messageApi,
       modal: modalApi,
-      batchOperatorConfig: props.batchOperatorConfig
+      batchOperatorConfig: batchOperatorConfig
     };
-  }, [props.batchOperatorConfig, messageApi, modalApi]);
+  }, [batchOperatorConfig, messageApi, modalApi]);
   var hooksConfig = useMemo(function () {
     var result = _objectSpread({
       showToast: function showToast() {
@@ -54,9 +82,7 @@ export default function AppProvider(props) {
       },
       showError: function showError(err) {
         console.error(err);
-        if (err && typeof err.message === 'string') {
-          messageApi.error(err.message);
-        }
+        _showError(err);
       },
       setPrimaryColor: function setPrimaryColor(color) {
         ConfigProvider.config({
@@ -70,7 +96,9 @@ export default function AppProvider(props) {
         return /*#__PURE__*/_jsx(Result, {
           status: "500",
           title: "500",
-          subTitle: err.message,
+          subTitle: /*#__PURE__*/_jsx(RequestErrorMessage, {
+            error: err
+          }),
           extra: /*#__PURE__*/_jsx(Button, {
             type: "primary",
             onClick: refresh,
@@ -80,7 +108,7 @@ export default function AppProvider(props) {
       }
     }, props.hooksConfig);
     return result;
-  }, [props.hooksConfig, messageApi, locale]);
+  }, [props.hooksConfig, messageApi, locale, _showError]);
   return /*#__PURE__*/_jsxs(AppContext.Provider, {
     value: appContext,
     children: [messageContextHolder, modalContextHolder, /*#__PURE__*/_jsx(HooksConfigProvider, {

package/es/locale/en_US.js

@@ -16,7 +16,8 @@ var enUS = _objectSpread(_objectSpread({}, componentsEnUS), {}, {
     modalDefaultTitle: 'Tip',
     backText: 'Back',
     waitingText: 'Loading',
-    reloadPageText: 'Reload'
+    reloadPageText: 'Reload',
+    requestErrorTitle: 'Request Error'
   }
 });
 export default enUS;

package/es/locale/locale.d.ts

@@ -11,5 +11,6 @@ export interface Locale extends ComponentLocale {
         waitingText: string;
         reloadPageText: string;
         modalDefaultTitle: string;
+        requestErrorTitle: string;
     };
 }

package/es/locale/vi.d.ts

@@ -1,3 +1,3 @@
 import type { Locale } from './locale';
-declare const enUS: Locale;
-export default enUS;
+declare const vi: Locale;
+export default vi;

package/es/locale/vi.js

@@ -8,7 +8,7 @@ import { default as UseBacthOperatorLocale } from "../hooks/use-batch-operator/l
 import { default as BasicLayoutLocale } from "../layouts/basic-layout/locale/vi";
 import { default as MicroLayoutLocale } from "../layouts/micro-layout/locale/vi";
 import componentsVi from '@lemon-fe/components/es/locale/vi';
-var enUS = _objectSpread(_objectSpread({}, componentsVi), {}, {
+var vi = _objectSpread(_objectSpread({}, componentsVi), {}, {
   UseBatchOperator: UseBacthOperatorLocale,
   BasicLayout: BasicLayoutLocale,
   MicroLayout: MicroLayoutLocale,
@@ -16,7 +16,8 @@ var enUS = _objectSpread(_objectSpread({}, componentsVi), {}, {
     backText: 'Quay lại',
     waitingText: 'Đang tải',
     reloadPageText: 'Tải lại trang',
-    modalDefaultTitle: 'Thông báo'
+    modalDefaultTitle: 'Thông báo',
+    requestErrorTitle: 'Lỗi Yêu Cầu'
   }
 });
-export default enUS;
+export default vi;

package/es/locale/zh_CN.js

@@ -16,7 +16,8 @@ var zhCN = _objectSpread(_objectSpread({}, componentsZhCN), {}, {
     backText: '返回',
     waitingText: '加载中',
     reloadPageText: '重新加载',
-    modalDefaultTitle: '提示'
+    modalDefaultTitle: '提示',
+    requestErrorTitle: '请求错误'
   }
 });
 export default zhCN;

package/es/locale/zh_Hant_HK.js

@@ -16,7 +16,8 @@ var enUS = _objectSpread(_objectSpread({}, componentsZhHantHk), {}, {
     backText: '返回',
     waitingText: '加載中',
     reloadPageText: '重新加載',
-    modalDefaultTitle: '提示'
+    modalDefaultTitle: '提示',
+    requestErrorTitle: '請求錯誤'
   }
 });
 export default enUS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.4.14-alpha.1",
+  "version": "1.4.14-alpha.2",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -24,9 +24,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@lemon-fe/components": "^1.4.14-alpha.1",
+    "@lemon-fe/components": "^1.4.14-alpha.2",
     "@lemon-fe/hooks": "^1.4.14-alpha.1",
-    "@lemon-fe/utils": "^1.3.0",
+    "@lemon-fe/utils": "^1.4.14-alpha.2",
     "ag-grid-community": "29.2.0",
     "antd": "4.24.8",
     "classnames": "^2.2.6",
@@ -46,5 +46,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "57033c6a96c4e184fb28b629aa7318525fd6bbd3"
+  "gitHead": "a28302dbd6045eceae1f473b0d09583b7d737303"
 }