@guo514360255/antd-lib 1.6.5 → 1.7.1

package/dist/CustomDetailModal/index.js

@@ -89,6 +89,9 @@ var CustomModal = /*#__PURE__*/forwardRef(function (props, ref) {
       return _ref.apply(this, arguments);
     };
   }();
+  var close = function close() {
+    setOpen(false);
+  };
   useImperativeHandle(ref, function () {
     return {
       open: function open(values) {
@@ -129,12 +132,10 @@ var CustomModal = /*#__PURE__*/forwardRef(function (props, ref) {
             }
           }, _callee2);
         }))();
-      }
+      },
+      close: close
     };
   });
-  var close = function close() {
-    setOpen(false);
-  };
   var handleDetailValue = function handleDetailValue(column, value, index) {
     if (isEmptyValue(value)) return value;
     var fieldProps = column.fieldProps,

package/dist/CustomFormModal/index.js

@@ -57,16 +57,25 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     drawer: Drawer
   };
   var Component = modalType[type || 'drawer'];
+  var close = function close() {
+    var _formRef$current;
+    setOpen(false);
+    var ref = (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFormRef();
+    ref === null || ref === void 0 || ref.resetFields();
+    if (onSubmit) {
+      onSubmit();
+    }
+  };
   useImperativeHandle(ref, function () {
     return {
       open: function open(values) {
         return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-          var _formRef$current;
+          var _formRef$current2;
           var ref, data, newData;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                ref = (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFormRef();
+                ref = (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getFormRef();
                 setOpen(true);
                 if (!(values !== null && values !== void 0 && values.id && detailRequest)) {
                   _context2.next = 28;
@@ -144,20 +153,21 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
         }))();
       },
       getFormRef: function getFormRef() {
-        var _formRef$current2;
-        return (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.getFormRef();
-      }
+        var _formRef$current3;
+        return (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFormRef();
+      },
+      close: close
     };
   });
   var submitEvent = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var _formRef$current3;
+      var _formRef$current4;
       var ref, _tableActionRef$curre, formData, data, result, _key;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             setLoading(true);
-            ref = (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFormRef();
+            ref = (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.getFormRef();
             _context3.prev = 2;
             if (!(!updateRequest && !saveRequest)) {
               _context3.next = 6;
@@ -230,15 +240,6 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
       return _ref2.apply(this, arguments);
     };
   }();
-  var close = function close() {
-    var _formRef$current4;
-    setOpen(false);
-    var ref = (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.getFormRef();
-    ref === null || ref === void 0 || ref.resetFields();
-    if (onSubmit) {
-      onSubmit();
-    }
-  };
   var footer = [/*#__PURE__*/React.createElement(Button, {
     key: "cancel",
     size: "large",

package/dist/CustomTable/index.js

@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["isIndex", "isDelete", "isUpdateState", "isDetail", "isUpdate", "isCreate", "createText", "columns", "rowKey", "request", "title", "defaultQueryParams", "toolBarRender", "formColumns", "formList", "dataSource", "deleteRequest", "detailRequest", "saveRequest", "updateRequest", "updateStateRequest", "handleModalData", "handleDetailData", "handleData", "formProps", "detailProps"],
+var _excluded = ["isIndex", "isDelete", "isUpdateState", "isDetail", "isUpdate", "isCreate", "createText", "columns", "rowKey", "request", "title", "defaultQueryParams", "toolBarRender", "formColumns", "formList", "dataSource", "deleteRequest", "detailRequest", "saveRequest", "updateRequest", "updateStateRequest", "batchDeleteRequest", "handleModalData", "handleDetailData", "handleData", "formProps", "detailProps"],
   _excluded2 = ["text", "msg", "isConfirm", "onClick", "danger", "isShow", "order"],
   _excluded3 = ["list"];
 /*
@@ -17,7 +17,7 @@ var _excluded = ["isIndex", "isDelete", "isUpdateState", "isDetail", "isUpdate",
 import { ProTable } from '@ant-design/pro-table';
 import CustomFormModal from "../CustomFormModal";
 import { isEmptyValue } from "../utils/util";
-import { Button, message, Popconfirm, Progress } from 'antd';
+import { Button, message, Popconfirm, Progress, Space } from 'antd';
 import cloneDeep from 'lodash/cloneDeep';
 import debounce from 'lodash/debounce';
 import isFunction from 'lodash/isFunction';
@@ -58,6 +58,7 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
     saveRequest = props.saveRequest,
     updateRequest = props.updateRequest,
     updateStateRequest = props.updateStateRequest,
+    batchDeleteRequest = props.batchDeleteRequest,
     handleModalData = props.handleModalData,
     handleDetailData = props.handleDetailData,
     handleData = props.handleData,
@@ -80,6 +81,10 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     scrollBar = _useState4[0],
     setScrollBar = _useState4[1];
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    selectedRowKeys = _useState6[0],
+    setSelectedRowKeys = _useState6[1];
   var tableContainerRef = useRef(null);
   var delEvent = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
@@ -203,6 +208,48 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
       }
     };
   });
+  var batchDelete = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys, selectedRows, onCleanSelected) {
+      var _actionRef$current3;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (isFunction(batchDeleteRequest)) {
+              _context3.next = 3;
+              break;
+            }
+            messageApi.error('批量删除接口未正确传入');
+            return _context3.abrupt("return");
+          case 3:
+            setLoading(true);
+            _context3.prev = 4;
+            _context3.next = 7;
+            return batchDeleteRequest(keys, selectedRows);
+          case 7:
+            messageApi.success('删除成功');
+            setSelectedRowKeys([]);
+            onCleanSelected();
+            (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 || _actionRef$current3.reload();
+            _context3.next = 16;
+            break;
+          case 13:
+            _context3.prev = 13;
+            _context3.t0 = _context3["catch"](4);
+            console.log(_context3.t0);
+          case 16:
+            _context3.prev = 16;
+            setLoading(false);
+            return _context3.finish(16);
+          case 19:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, null, [[4, 13, 16, 19]]);
+    }));
+    return function batchDelete(_x3, _x4, _x5) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
   var totalWidth = columns === null || columns === void 0 || (_columns$filter = columns.filter(function (item) {
     return !item.hideInTable;
   })) === null || _columns$filter === void 0 ? void 0 : _columns$filter.reduce(function (sum, col) {
@@ -313,15 +360,15 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
           style: {
             display: 'flex'
           }
-        }, buttons === null || buttons === void 0 ? void 0 : buttons.map(function (_ref5, index) {
-          var text = _ref5.text,
-            msg = _ref5.msg,
-            isConfirm = _ref5.isConfirm,
-            _onClick = _ref5.onClick,
-            danger = _ref5.danger,
-            isShow = _ref5.isShow,
-            order = _ref5.order,
-            item = _objectWithoutProperties(_ref5, _excluded2);
+        }, buttons === null || buttons === void 0 ? void 0 : buttons.map(function (_ref6, index) {
+          var text = _ref6.text,
+            msg = _ref6.msg,
+            isConfirm = _ref6.isConfirm,
+            _onClick = _ref6.onClick,
+            danger = _ref6.danger,
+            isShow = _ref6.isShow,
+            order = _ref6.order,
+            item = _objectWithoutProperties(_ref6, _excluded2);
           if (isConfirm) {
             return /*#__PURE__*/React.createElement(Popconfirm, _extends({
               key: index,
@@ -396,6 +443,34 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
     },
     loading: loading,
     bordered: true,
+    rowSelection: !!batchDeleteRequest ? {
+      defaultSelectedRowKeys: selectedRowKeys
+    } : false,
+    tableAlertRender: function tableAlertRender(_ref7) {
+      var selectedRowKeys = _ref7.selectedRowKeys,
+        onCleanSelected = _ref7.onCleanSelected;
+      if (!batchDeleteRequest) {
+        return false;
+      }
+      return /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement("span", null, "\u5DF2\u9009 ", selectedRowKeys.length, " \u9879", /*#__PURE__*/React.createElement("a", {
+        style: {
+          marginInlineStart: 8
+        },
+        onClick: onCleanSelected
+      }, "\u53D6\u6D88\u9009\u62E9")));
+    },
+    tableAlertOptionRender: function tableAlertOptionRender(_ref8) {
+      var selectedRowKeys = _ref8.selectedRowKeys,
+        selectedRows = _ref8.selectedRows,
+        onCleanSelected = _ref8.onCleanSelected;
+      return /*#__PURE__*/React.createElement(Space, {
+        size: 16
+      }, /*#__PURE__*/React.createElement("a", {
+        onClick: function onClick() {
+          return batchDelete(selectedRowKeys, selectedRows, onCleanSelected);
+        }
+      }, "\u6279\u91CF\u5220\u9664"));
+    },
     pagination: _objectSpread({
       showSizeChanger: true,
       showQuickJumper: true,
@@ -411,52 +486,52 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
     formRef: formRef,
     columns: handleColumns() || [],
     request: ( /*#__PURE__*/function () {
-      var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params, sort, filter) {
+      var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params, sort, filter) {
         var pageNo, _yield$request, list, data;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               if (!(request && !dataSource)) {
-                _context3.next = 20;
+                _context4.next = 20;
                 break;
               }
               setLoading(true);
-              _context3.prev = 2;
+              _context4.prev = 2;
               pageNo = params.current;
               delete params.current;
-              _context3.next = 7;
+              _context4.next = 7;
               return request(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, params), {}, {
                 pageNo: pageNo
               }, sort), filter), defaultQueryParams));
             case 7:
-              _yield$request = _context3.sent;
+              _yield$request = _context4.sent;
               list = _yield$request.list;
               data = _objectWithoutProperties(_yield$request, _excluded3);
               getAntTableContainer();
-              return _context3.abrupt("return", _objectSpread({
+              return _context4.abrupt("return", _objectSpread({
                 data: list
               }, data));
             case 14:
-              _context3.prev = 14;
-              _context3.t0 = _context3["catch"](2);
-              console.log(_context3.t0);
+              _context4.prev = 14;
+              _context4.t0 = _context4["catch"](2);
+              console.log(_context4.t0);
             case 17:
-              _context3.prev = 17;
+              _context4.prev = 17;
               setLoading(false);
-              return _context3.finish(17);
+              return _context4.finish(17);
             case 20:
-              return _context3.abrupt("return", {
+              return _context4.abrupt("return", {
                 data: [],
                 total: 0
               });
             case 21:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, null, [[2, 14, 17, 20]]);
+        }, _callee4, null, [[2, 14, 17, 20]]);
       }));
-      return function (_x3, _x4, _x5) {
-        return _ref6.apply(this, arguments);
+      return function (_x6, _x7, _x8) {
+        return _ref9.apply(this, arguments);
       };
     }()),
     rowKey: rowKey || 'id',

package/dist/CustomTable/table.d.ts

@@ -160,6 +160,12 @@ interface CustomTableProps {
     [key: string]: any;
   };
 
+  /**
+   * 批量删除接口
+   * @param data
+   */
+  batchDeleteRequest?: (data: any) => any;
+
   /**
    * 其它参数
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guo514360255/antd-lib",
-  "version": "1.6.5",
+  "version": "1.7.1",
   "description": "react design 5 lib",
   "license": "MIT",
   "module": "dist/index.js",