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

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

@@ -1,20 +1,9 @@
-import React, { type ReactNode } from 'react';
+import { type ReactNode } from 'react';
 import type { Locale } from '../locale/locale';
-import { message, Modal } from '@lemon-fe/components';
-import { type HooksOpts } from '@lemon-fe/hooks';
 declare type AppConfigProps = {
     children?: ReactNode | null;
     locale?: Locale;
-    hooksConfig?: Partial<HooksOpts>;
 };
-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?: BatchOperatorConfig | undefined;
-}>;
 declare function AppProvider(props: AppConfigProps): JSX.Element;
 declare namespace AppProvider {
     var useApp;

package/es/app-provider/index.js

@@ -1,22 +1,15 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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, useCallback } from 'react';
-import { PageLoading, message, Modal, ConfigProvider, Result, Button, RequestErrorMessage } from '@lemon-fe/components';
+import React, { createContext, useMemo, useContext } from 'react';
+import { PageLoading, message, Modal, ConfigProvider, Result, Button } 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({
+var AppContext = /*#__PURE__*/createContext({
   message: message,
   modal: Modal
 });
@@ -32,44 +25,15 @@ export default function AppProvider(props) {
     _Modal$useModal2 = _slicedToArray(_Modal$useModal, 2),
     modalApi = _Modal$useModal2[0],
     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 locale = useContext(ConfigProvider.ConfigContext).locale;
   var appContext = useMemo(function () {
     return {
       message: messageApi,
-      modal: modalApi,
-      batchOperatorConfig: batchOperatorConfig
+      modal: modalApi
     };
-  }, [batchOperatorConfig, messageApi, modalApi]);
+  }, []);
   var hooksConfig = useMemo(function () {
-    var result = _objectSpread({
+    var result = {
       showToast: function showToast() {
         var _locale$Common;
         return messageApi.loading(locale === null || locale === void 0 || (_locale$Common = locale.Common) === null || _locale$Common === void 0 ? void 0 : _locale$Common.waitingText, 0);
@@ -82,7 +46,9 @@ export default function AppProvider(props) {
       },
       showError: function showError(err) {
         console.error(err);
-        _showError(err);
+        if (err && typeof err.message === 'string') {
+          messageApi.error(err.message);
+        }
       },
       setPrimaryColor: function setPrimaryColor(color) {
         ConfigProvider.config({
@@ -92,23 +58,21 @@ export default function AppProvider(props) {
         });
       },
       errorResult: function errorResult(err, refresh) {
-        var _locale$Common2;
+        var _props$locale;
         return /*#__PURE__*/_jsx(Result, {
           status: "500",
           title: "500",
-          subTitle: /*#__PURE__*/_jsx(RequestErrorMessage, {
-            error: err
-          }),
+          subTitle: err.message,
           extra: /*#__PURE__*/_jsx(Button, {
             type: "primary",
             onClick: refresh,
-            children: locale === null || locale === void 0 || (_locale$Common2 = locale.Common) === null || _locale$Common2 === void 0 ? void 0 : _locale$Common2.reloadPageText
+            children: (_props$locale = props.locale) === null || _props$locale === void 0 || (_props$locale = _props$locale.Common) === null || _props$locale === void 0 ? void 0 : _props$locale.reloadPageText
           })
         });
       }
-    }, props.hooksConfig);
+    };
     return result;
-  }, [props.hooksConfig, messageApi, locale, _showError]);
+  }, [props.locale, messageApi]);
   return /*#__PURE__*/_jsxs(AppContext.Provider, {
     value: appContext,
     children: [messageContextHolder, modalContextHolder, /*#__PURE__*/_jsx(HooksConfigProvider, {

package/es/hooks/use-batch-operator/index.d.ts

@@ -85,10 +85,6 @@ interface Props<RecordType extends Record<string, any> = Record<string, any>, Re
      * @description 打开立即执行
      */
     executeWhenOpen?: boolean;
-    /**
-     * @description 显示完整信息，可点击
-     */
-    openError?: (err: Error) => void;
 }
 export default function useBatchOperate<RecordType extends Record<string, any> = Record<string, any>, ResultType = any, ParamsType = any>(options: Props<RecordType, ResultType, ParamsType>): {
     run: (rows: RecordType[], otherOpts?: Partial<Props<RecordType, ResultType, ParamsType>>) => void;

package/es/hooks/use-batch-operator/index.js

@@ -27,10 +27,8 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { Tooltip } from 'antd';
 import React, { useContext, Component, createRef } from 'react';
 import { unmountComponentAtNode, render } from 'react-dom';
-import { AppContext } from "../../app-provider";
 import defaultLocale from "./locale/zh_CN";
 import { ConfigProvider, Modal, Row, Spin, Typography } from '@lemon-fe/components';
 import { Actions, ComponentConfigureContext, DataGrid, Icons, Layout, Section } from '@lemon-fe/components';
@@ -51,39 +49,6 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_this), "resultsSubject", new Subject());
     _defineProperty(_assertThisInitialized(_this), "mounted", true);
     _defineProperty(_assertThisInitialized(_this), "locale", defaultLocale);
-    _defineProperty(_assertThisInitialized(_this), "renderIconTip", function (type, err) {
-      if (!(err instanceof Error)) {
-        return /*#__PURE__*/_jsx(Icons.Tip, {
-          type: type,
-          style: {
-            marginRight: 2
-          }
-        });
-      }
-      var openError = _this.props.openError;
-      var clickToShowMore = _this.locale.clickToShowMore;
-      if (openError && type === 'error') {
-        return /*#__PURE__*/_jsx(Tooltip, {
-          title: clickToShowMore,
-          children: /*#__PURE__*/_jsx(Icons.Tip, {
-            type: type,
-            style: {
-              marginRight: 2
-            },
-            onClick: function onClick() {
-              return openError(err);
-            }
-          })
-        });
-      } else {
-        return /*#__PURE__*/_jsx(Icons.Tip, {
-          type: type,
-          style: {
-            marginRight: 2
-          }
-        });
-      }
-    });
     _defineProperty(_assertThisInitialized(_this), "getRowKey", function (record) {
       var rowKey = _this.props.rowKey;
       var result = typeof rowKey === 'function' ? rowKey(record) : get(record, rowKey);
@@ -266,7 +231,12 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
                                 style: {
                                   flex: 1
                                 },
-                                children: [_this2.renderIconTip('warning', error), /*#__PURE__*/_jsxs("span", {
+                                children: [/*#__PURE__*/_jsx(Icons.Tip, {
+                                  type: "warning",
+                                  style: {
+                                    marginRight: 2
+                                  }
+                                }), /*#__PURE__*/_jsxs("span", {
                                   children: [error.message, " "]
                                 })]
                               }), /*#__PURE__*/_jsx("a", {
@@ -287,7 +257,12 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
                               ellipsis: {
                                 tooltip: error.message
                               },
-                              children: [_this2.renderIconTip('error', error), /*#__PURE__*/_jsx("span", {
+                              children: [/*#__PURE__*/_jsx(Icons.Tip, {
+                                type: "error",
+                                style: {
+                                  marginRight: 2
+                                }
+                              }), /*#__PURE__*/_jsx("span", {
                                 children: error.message
                               })]
                             }), /*#__PURE__*/_jsx(Icons.Reload, {
@@ -413,7 +388,6 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
   }, {
     key: "getProcess",
     value: function getProcess() {
-      var _this4 = this;
       var _this$props2 = this.props,
         process = _this$props2.process,
         _handler = _this$props2.handler,
@@ -450,7 +424,12 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
                   ellipsis: {
                     tooltip: error.message
                   },
-                  children: [_this4.renderIconTip('error', error), /*#__PURE__*/_jsx("span", {
+                  children: [/*#__PURE__*/_jsx(Icons.Tip, {
+                    type: "error",
+                    style: {
+                      marginRight: 2
+                    }
+                  }), /*#__PURE__*/_jsx("span", {
                     children: error.message
                   })]
                 }), /*#__PURE__*/_jsx(Icons.Reload, {
@@ -508,7 +487,7 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
   }, {
     key: "getCols",
     value: function getCols() {
-      var _this5 = this;
+      var _this4 = this;
       var _this$props3 = this.props,
         columns = _this$props3.columns,
         rowKey = _this$props3.rowKey;
@@ -551,13 +530,13 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
               api.applyTransaction({
                 remove: [node.data]
               });
-              _this5.setState(function (prev) {
+              _this4.setState(function (prev) {
                 var results = prev.results,
                   data = prev.data;
                 var newData = _toConsumableArray(data);
                 var newResults = results;
                 newData.splice(data.findIndex(function (item) {
-                  return _this5.getRowKey(item) === node.id;
+                  return _this4.getRowKey(item) === node.id;
                 }), 1);
                 if (results.has(key)) {
                   newResults = new Map(results);
@@ -632,7 +611,7 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this6 = this,
+      var _this5 = this,
         _results$get;
       var _this$props4 = this.props,
         modalTitle = _this$props4.modalTitle,
@@ -661,10 +640,10 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
         centered: true,
         open: open,
         onCancel: function onCancel() {
-          _this6.setState({
+          _this5.setState({
             paused: true
           }, function () {
-            _this6.handleClose();
+            _this5.handleClose();
           });
         },
         footer: typeof footer === 'function' ? footer(data, {
@@ -672,7 +651,7 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
         }) : footer,
         maskClosable: false,
         afterClose: function afterClose() {
-          _this6.setState({
+          _this5.setState({
             results: new Map(),
             paused: true,
             active: undefined,
@@ -696,7 +675,7 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
                 disabled: data.length <= 0,
                 text: suspendExecText,
                 onClick: function onClick() {
-                  _this6.setState({
+                  _this5.setState({
                     paused: true
                   });
                 }
@@ -728,8 +707,6 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
 export default function useBatchOperate(options) {
   var ctx = useContext(ConfigProvider.ConfigContext);
   var componentCtx = useContext(ComponentConfigureContext);
-  var _useContext = useContext(AppContext),
-    batchOperatorConfig = _useContext.batchOperatorConfig;
   var run = function run(rows) {
     var otherOpts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var root = document.createDocumentFragment();
@@ -741,9 +718,9 @@ export default function useBatchOperate(options) {
       iconPrefixCls: iconPrefixCls,
       children: /*#__PURE__*/_jsx(ComponentConfigureContext.Provider, {
         value: componentCtx,
-        children: /*#__PURE__*/_jsx(BatchOperate, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+        children: /*#__PURE__*/_jsx(BatchOperate, _objectSpread(_objectSpread(_objectSpread({
           rows: rows
-        }, options), otherOpts), batchOperatorConfig), {}, {
+        }, options), otherOpts), {}, {
           locale: locale,
           afterClose: function afterClose() {
             unmountComponentAtNode(root);

package/es/hooks/use-batch-operator/locale/en_US.js

@@ -8,7 +8,6 @@ var locale = {
   suspendExecText: 'Pause',
   resultStateText: 'State',
   pendingStateText: 'Pending',
-  progressStateText: 'Progress',
-  clickToShowMore: 'Click to show more'
+  progressStateText: 'Progress'
 };
 export default locale;

package/es/hooks/use-batch-operator/locale/locale.d.ts

@@ -9,5 +9,4 @@ export interface UseBatchOperateLocale {
     resultStateText: string;
     pendingStateText: string;
     progressStateText: string;
-    clickToShowMore: string;
 }

package/es/hooks/use-batch-operator/locale/vi.js

@@ -8,7 +8,6 @@ var locale = {
   suspendExecText: 'Tạm dừng thực thi',
   resultStateText: 'Trạng thái xử lý',
   pendingStateText: 'Chờ xử lý',
-  progressStateText: 'Đang trong quá trình thực hiện',
-  clickToShowMore: 'Nhấn để hiển thị thêm'
+  progressStateText: 'Đang trong quá trình thực hiện'
 };
 export default locale;

package/es/hooks/use-batch-operator/locale/zh_CN.js

@@ -8,7 +8,6 @@ var locale = {
   suspendExecText: '暂停执行',
   resultStateText: '处理状态',
   pendingStateText: '待处理',
-  progressStateText: '进行中',
-  clickToShowMore: '点击显示更多'
+  progressStateText: '进行中'
 };
 export default locale;

package/es/hooks/use-batch-operator/locale/zh_Hant_HK.js

@@ -8,7 +8,6 @@ var locale = {
   suspendExecText: '暫停執行',
   resultStateText: '處理狀態',
   pendingStateText: '待處理',
-  progressStateText: '進行中',
-  clickToShowMore: '點擊顯示更多'
+  progressStateText: '進行中'
 };
 export default locale;

package/es/locale/en_US.js

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

package/es/locale/locale.d.ts

@@ -11,6 +11,5 @@ 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 vi: Locale;
-export default vi;
+declare const enUS: Locale;
+export default enUS;

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 vi = _objectSpread(_objectSpread({}, componentsVi), {}, {
+var enUS = _objectSpread(_objectSpread({}, componentsVi), {}, {
   UseBatchOperator: UseBacthOperatorLocale,
   BasicLayout: BasicLayoutLocale,
   MicroLayout: MicroLayoutLocale,
@@ -16,8 +16,7 @@ var vi = _objectSpread(_objectSpread({}, componentsVi), {}, {
     backText: 'Quay lại',
     waitingText: 'Đang tải',
     reloadPageText: 'Tải lại trang',
-    modalDefaultTitle: 'Thông báo',
-    requestErrorTitle: 'Lỗi Yêu Cầu'
+    modalDefaultTitle: 'Thông báo'
   }
 });
-export default vi;
+export default enUS;

package/es/locale/zh_CN.js

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

package/es/locale/zh_Hant_HK.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.4.14-alpha.2",
+  "version": "1.4.14",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -24,9 +24,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@lemon-fe/components": "^1.4.14-alpha.2",
-    "@lemon-fe/hooks": "^1.4.14-alpha.1",
-    "@lemon-fe/utils": "^1.4.14-alpha.2",
+    "@lemon-fe/components": "^1.4.14",
+    "@lemon-fe/hooks": "^1.4.0",
+    "@lemon-fe/utils": "^1.3.0",
     "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": "a28302dbd6045eceae1f473b0d09583b7d737303"
+  "gitHead": "b2acd15b9728c17e93306c9f6c6ade2933b51dc7"
 }