@lemon-fe/kits 1.1.6 → 1.1.8

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

@@ -45,7 +45,7 @@ interface Props<RecordType extends Record<string, any> = Record<string, any>, Re
     /**
      * @description 弹窗关闭前的检验，返回true校验通过关闭弹窗，false校验不通过
      */
-    onBeforeClose?: (results: Map<Key, Result<ResultType>>) => Promise<boolean>;
+    onBeforeClose?: (results: Map<Key, Result<ResultType>>, datas: RecordType[]) => Promise<boolean>;
     /**
      * @description 自定义渲染结果，不要依赖上下文
      * @param params

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

@@ -53,11 +53,12 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
       return String(result !== null && result !== void 0 ? result : '').toString();
     });
     _defineProperty(_assertThisInitialized(_this), "handleClose", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _this$props, onBeforeClose, onClose, results, value;
+      var _this$props, onBeforeClose, onClose, data, results, value;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _this$props = _this.props, onBeforeClose = _this$props.onBeforeClose, onClose = _this$props.onClose;
+            data = _this.state.data;
             results = new Map();
             _toConsumableArray(_this.state.results).forEach(function (_ref2) {
               var _ref3 = _slicedToArray(_ref2, 2),
@@ -70,20 +71,20 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
             });
             _context.t0 = onBeforeClose;
             if (!_context.t0) {
-              _context.next = 8;
+              _context.next = 9;
               break;
             }
-            _context.next = 7;
-            return onBeforeClose(results);
-          case 7:
-            _context.t0 = !_context.sent;
+            _context.next = 8;
+            return onBeforeClose(results, data);
           case 8:
+            _context.t0 = !_context.sent;
+          case 9:
             if (!_context.t0) {
-              _context.next = 10;
+              _context.next = 11;
               break;
             }
             return _context.abrupt("return");
-          case 10:
+          case 11:
             _this.setState({
               open: false
             });
@@ -97,7 +98,7 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
                 results: results
               });
             }
-          case 12:
+          case 13:
           case "end":
             return _context.stop();
         }

package/es/index.d.ts

@@ -1,6 +1,6 @@
 export * from 'antd';
 export { default as zhCN } from 'antd/es/locale/zh_CN';
-export { Alert, Dropdown, InputNumber, Layout, Table } from '@lemon-fe/components';
+export { Alert, Dropdown, InputNumber, Layout, Table, Modal, type ModalProps, } from '@lemon-fe/components';
 export * from '@lemon-fe/components';
 export * from '@lemon-fe/hooks';
 export * from '@lemon-fe/utils';

package/es/index.js

@@ -1,6 +1,6 @@
 export * from 'antd';
 export { default as zhCN } from 'antd/es/locale/zh_CN';
-export { Alert, Dropdown, InputNumber, Layout, Table } from '@lemon-fe/components';
+export { Alert, Dropdown, InputNumber, Layout, Table, Modal } from '@lemon-fe/components';
 //@ts-ignore
 export * from '@lemon-fe/components';
 export * from '@lemon-fe/hooks';

package/es/init.js

@@ -4,14 +4,13 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 _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); }
-import { message, Modal, Select, ConfigProvider, Result, Button, DatePicker, Cascader, TreeSelect, Empty, Menu, TimePicker, Tree } from 'antd';
+import { message, Select, ConfigProvider, Result, Button, DatePicker, Cascader, TreeSelect, Empty, Menu, TimePicker, Tree } from 'antd';
 import React from 'react';
 import { Icons, PageLoading, PREFIX_CLS, EmptyImage } from '@lemon-fe/components';
 import { config } from '@lemon-fe/hooks';
 import { jsx as _jsx } from "react/jsx-runtime";
 var Tip = Icons.Tip,
   Down = Icons.Down,
-  CloseLight = Icons.CloseLight,
   Clear = Icons.Clear;
 export default function init() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -31,7 +30,6 @@ export default function init() {
   var types = ['success', 'error', 'warning', 'info'];
   types.forEach(function (item) {
     var msgAPI = message[item].bind(message);
-    var modalAPI = Modal[item].bind(Modal);
     message[item] = function () {
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
@@ -55,29 +53,6 @@ export default function init() {
         })
       });
     };
-    Modal[item] = function (args) {
-      return modalAPI(_objectSpread({
-        title: '提示',
-        width: 400,
-        icon: /*#__PURE__*/_jsx(Tip, {
-          type: item
-        })
-      }, args));
-    };
-  });
-  var modalConfirm = Modal.confirm.bind(Modal);
-  Modal.confirm = function (args) {
-    return modalConfirm(_objectSpread({
-      icon: /*#__PURE__*/_jsx(Tip, {
-        type: "info"
-      }),
-      width: 400,
-      title: '提示'
-    }, args));
-  };
-  Modal.defaultProps = _objectSpread(_objectSpread({}, Modal.defaultProps), {}, {
-    maskClosable: false,
-    closeIcon: /*#__PURE__*/_jsx(CloseLight, {})
   });
   var node = /*#__PURE__*/_jsx(Down, {
     style: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@lemon-fe/components": "^1.1.6",
+    "@lemon-fe/components": "^1.1.8",
     "@lemon-fe/hooks": "^1.1.0",
     "@lemon-fe/utils": "^1.1.0",
     "antd": "4.24.8",
@@ -44,5 +44,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "c7d4df34f076bd59e43ec432dfd824c89a215cdc"
+  "gitHead": "c1976880d7e69d49e8b2416734ca3a4a137f535d"
 }