@guo514360255/antd-lib 1.6.5 → 1.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
5
5
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
6
6
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
7
7
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
8
- 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"],
8
+ 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"],
9
9
  _excluded2 = ["text", "msg", "isConfirm", "onClick", "danger", "isShow", "order"],
10
10
  _excluded3 = ["list"];
11
11
  /*
@@ -17,7 +17,7 @@ var _excluded = ["isIndex", "isDelete", "isUpdateState", "isDetail", "isUpdate",
17
17
  import { ProTable } from '@ant-design/pro-table';
18
18
  import CustomFormModal from "../CustomFormModal";
19
19
  import { isEmptyValue } from "../utils/util";
20
- import { Button, message, Popconfirm, Progress } from 'antd';
20
+ import { Button, message, Popconfirm, Progress, Space } from 'antd';
21
21
  import cloneDeep from 'lodash/cloneDeep';
22
22
  import debounce from 'lodash/debounce';
23
23
  import isFunction from 'lodash/isFunction';
@@ -58,6 +58,7 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
58
58
  saveRequest = props.saveRequest,
59
59
  updateRequest = props.updateRequest,
60
60
  updateStateRequest = props.updateStateRequest,
61
+ batchDeleteRequest = props.batchDeleteRequest,
61
62
  handleModalData = props.handleModalData,
62
63
  handleDetailData = props.handleDetailData,
63
64
  handleData = props.handleData,
@@ -80,6 +81,10 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
80
81
  _useState4 = _slicedToArray(_useState3, 2),
81
82
  scrollBar = _useState4[0],
82
83
  setScrollBar = _useState4[1];
84
+ var _useState5 = useState([]),
85
+ _useState6 = _slicedToArray(_useState5, 2),
86
+ selectedRowKeys = _useState6[0],
87
+ setSelectedRowKeys = _useState6[1];
83
88
  var tableContainerRef = useRef(null);
84
89
  var delEvent = /*#__PURE__*/function () {
85
90
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
@@ -203,6 +208,48 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
203
208
  }
204
209
  };
205
210
  });
211
+ var batchDelete = /*#__PURE__*/function () {
212
+ var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys, selectedRows, onCleanSelected) {
213
+ var _actionRef$current3;
214
+ return _regeneratorRuntime().wrap(function _callee3$(_context3) {
215
+ while (1) switch (_context3.prev = _context3.next) {
216
+ case 0:
217
+ if (isFunction(batchDeleteRequest)) {
218
+ _context3.next = 3;
219
+ break;
220
+ }
221
+ messageApi.error('批量删除接口未正确传入');
222
+ return _context3.abrupt("return");
223
+ case 3:
224
+ setLoading(true);
225
+ _context3.prev = 4;
226
+ _context3.next = 7;
227
+ return batchDeleteRequest(keys, selectedRows);
228
+ case 7:
229
+ messageApi.success('删除成功');
230
+ setSelectedRowKeys([]);
231
+ onCleanSelected();
232
+ (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 || _actionRef$current3.reload();
233
+ _context3.next = 16;
234
+ break;
235
+ case 13:
236
+ _context3.prev = 13;
237
+ _context3.t0 = _context3["catch"](4);
238
+ console.log(_context3.t0);
239
+ case 16:
240
+ _context3.prev = 16;
241
+ setLoading(false);
242
+ return _context3.finish(16);
243
+ case 19:
244
+ case "end":
245
+ return _context3.stop();
246
+ }
247
+ }, _callee3, null, [[4, 13, 16, 19]]);
248
+ }));
249
+ return function batchDelete(_x3, _x4, _x5) {
250
+ return _ref5.apply(this, arguments);
251
+ };
252
+ }();
206
253
  var totalWidth = columns === null || columns === void 0 || (_columns$filter = columns.filter(function (item) {
207
254
  return !item.hideInTable;
208
255
  })) === null || _columns$filter === void 0 ? void 0 : _columns$filter.reduce(function (sum, col) {
@@ -313,15 +360,15 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
313
360
  style: {
314
361
  display: 'flex'
315
362
  }
316
- }, buttons === null || buttons === void 0 ? void 0 : buttons.map(function (_ref5, index) {
317
- var text = _ref5.text,
318
- msg = _ref5.msg,
319
- isConfirm = _ref5.isConfirm,
320
- _onClick = _ref5.onClick,
321
- danger = _ref5.danger,
322
- isShow = _ref5.isShow,
323
- order = _ref5.order,
324
- item = _objectWithoutProperties(_ref5, _excluded2);
363
+ }, buttons === null || buttons === void 0 ? void 0 : buttons.map(function (_ref6, index) {
364
+ var text = _ref6.text,
365
+ msg = _ref6.msg,
366
+ isConfirm = _ref6.isConfirm,
367
+ _onClick = _ref6.onClick,
368
+ danger = _ref6.danger,
369
+ isShow = _ref6.isShow,
370
+ order = _ref6.order,
371
+ item = _objectWithoutProperties(_ref6, _excluded2);
325
372
  if (isConfirm) {
326
373
  return /*#__PURE__*/React.createElement(Popconfirm, _extends({
327
374
  key: index,
@@ -396,6 +443,34 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
396
443
  },
397
444
  loading: loading,
398
445
  bordered: true,
446
+ rowSelection: !!batchDeleteRequest ? {
447
+ defaultSelectedRowKeys: selectedRowKeys
448
+ } : false,
449
+ tableAlertRender: function tableAlertRender(_ref7) {
450
+ var selectedRowKeys = _ref7.selectedRowKeys,
451
+ onCleanSelected = _ref7.onCleanSelected;
452
+ if (!batchDeleteRequest) {
453
+ return false;
454
+ }
455
+ return /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement("span", null, "\u5DF2\u9009 ", selectedRowKeys.length, " \u9879", /*#__PURE__*/React.createElement("a", {
456
+ style: {
457
+ marginInlineStart: 8
458
+ },
459
+ onClick: onCleanSelected
460
+ }, "\u53D6\u6D88\u9009\u62E9")));
461
+ },
462
+ tableAlertOptionRender: function tableAlertOptionRender(_ref8) {
463
+ var selectedRowKeys = _ref8.selectedRowKeys,
464
+ selectedRows = _ref8.selectedRows,
465
+ onCleanSelected = _ref8.onCleanSelected;
466
+ return /*#__PURE__*/React.createElement(Space, {
467
+ size: 16
468
+ }, /*#__PURE__*/React.createElement("a", {
469
+ onClick: function onClick() {
470
+ return batchDelete(selectedRowKeys, selectedRows, onCleanSelected);
471
+ }
472
+ }, "\u6279\u91CF\u5220\u9664"));
473
+ },
399
474
  pagination: _objectSpread({
400
475
  showSizeChanger: true,
401
476
  showQuickJumper: true,
@@ -411,52 +486,52 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
411
486
  formRef: formRef,
412
487
  columns: handleColumns() || [],
413
488
  request: ( /*#__PURE__*/function () {
414
- var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params, sort, filter) {
489
+ var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params, sort, filter) {
415
490
  var pageNo, _yield$request, list, data;
416
- return _regeneratorRuntime().wrap(function _callee3$(_context3) {
417
- while (1) switch (_context3.prev = _context3.next) {
491
+ return _regeneratorRuntime().wrap(function _callee4$(_context4) {
492
+ while (1) switch (_context4.prev = _context4.next) {
418
493
  case 0:
419
494
  if (!(request && !dataSource)) {
420
- _context3.next = 20;
495
+ _context4.next = 20;
421
496
  break;
422
497
  }
423
498
  setLoading(true);
424
- _context3.prev = 2;
499
+ _context4.prev = 2;
425
500
  pageNo = params.current;
426
501
  delete params.current;
427
- _context3.next = 7;
502
+ _context4.next = 7;
428
503
  return request(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, params), {}, {
429
504
  pageNo: pageNo
430
505
  }, sort), filter), defaultQueryParams));
431
506
  case 7:
432
- _yield$request = _context3.sent;
507
+ _yield$request = _context4.sent;
433
508
  list = _yield$request.list;
434
509
  data = _objectWithoutProperties(_yield$request, _excluded3);
435
510
  getAntTableContainer();
436
- return _context3.abrupt("return", _objectSpread({
511
+ return _context4.abrupt("return", _objectSpread({
437
512
  data: list
438
513
  }, data));
439
514
  case 14:
440
- _context3.prev = 14;
441
- _context3.t0 = _context3["catch"](2);
442
- console.log(_context3.t0);
515
+ _context4.prev = 14;
516
+ _context4.t0 = _context4["catch"](2);
517
+ console.log(_context4.t0);
443
518
  case 17:
444
- _context3.prev = 17;
519
+ _context4.prev = 17;
445
520
  setLoading(false);
446
- return _context3.finish(17);
521
+ return _context4.finish(17);
447
522
  case 20:
448
- return _context3.abrupt("return", {
523
+ return _context4.abrupt("return", {
449
524
  data: [],
450
525
  total: 0
451
526
  });
452
527
  case 21:
453
528
  case "end":
454
- return _context3.stop();
529
+ return _context4.stop();
455
530
  }
456
- }, _callee3, null, [[2, 14, 17, 20]]);
531
+ }, _callee4, null, [[2, 14, 17, 20]]);
457
532
  }));
458
- return function (_x3, _x4, _x5) {
459
- return _ref6.apply(this, arguments);
533
+ return function (_x6, _x7, _x8) {
534
+ return _ref9.apply(this, arguments);
460
535
  };
461
536
  }()),
462
537
  rowKey: rowKey || 'id',
@@ -160,6 +160,12 @@ interface CustomTableProps {
160
160
  [key: string]: any;
161
161
  };
162
162
 
163
+ /**
164
+ * 批量删除接口
165
+ * @param data
166
+ */
167
+ batchDeleteRequest?: (data: any) => any;
168
+
163
169
  /**
164
170
  * 其它参数
165
171
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@guo514360255/antd-lib",
3
- "version": "1.6.5",
3
+ "version": "1.7.0",
4
4
  "description": "react design 5 lib",
5
5
  "license": "MIT",
6
6
  "module": "dist/index.js",