wargerm 0.7.34 → 0.7.36

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.
package/dist/index.esm.js CHANGED
@@ -4699,13 +4699,13 @@ function Table(_ref) {
4699
4699
 
4700
4700
  useEffect(function () {
4701
4701
  _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
4702
- var requestParams, res;
4702
+ var requestParams, values, res;
4703
4703
  return regeneratorRuntime.wrap(function _callee$(_context) {
4704
4704
  while (1) {
4705
4705
  switch (_context.prev = _context.next) {
4706
4706
  case 0:
4707
4707
  if (!request) {
4708
- _context.next = 15;
4708
+ _context.next = 16;
4709
4709
  break;
4710
4710
  }
4711
4711
 
@@ -4717,11 +4717,12 @@ function Table(_ref) {
4717
4717
  requestParams.pageSize = pagination.pageSize || 20;
4718
4718
  }
4719
4719
 
4720
- requestParams = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, requestParams), pageParams), params), formSearch);
4721
- _context.next = 7;
4720
+ values = formSearchRef.current.getFormValues() || {};
4721
+ requestParams = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, requestParams), params), values), pageParams);
4722
+ _context.next = 8;
4722
4723
  return request(requestParams);
4723
4724
 
4724
- case 7:
4725
+ case 8:
4725
4726
  res = _context.sent;
4726
4727
  setLoading(false);
4727
4728
  onLoad && onLoad(res === null || res === void 0 ? void 0 : res.data, res);
@@ -4734,10 +4735,10 @@ function Table(_ref) {
4734
4735
  total: (res === null || res === void 0 ? void 0 : res.total) || (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) || 0
4735
4736
  }, pagination), requestParams);
4736
4737
  });
4737
- _context.next = 16;
4738
+ _context.next = 17;
4738
4739
  break;
4739
4740
 
4740
- case 15:
4741
+ case 16:
4741
4742
  setpaginationParams(function (c) {
4742
4743
  var _tableList$slice;
4743
4744
 
@@ -4751,14 +4752,16 @@ function Table(_ref) {
4751
4752
  return obj;
4752
4753
  });
4753
4754
 
4754
- case 16:
4755
+ case 17:
4755
4756
  case "end":
4756
4757
  return _context.stop();
4757
4758
  }
4758
4759
  }
4759
4760
  }, _callee);
4760
4761
  }))();
4761
- }, [JSON.stringify(params), JSON.stringify(pageParams), JSON.stringify(pagination), JSON.stringify(tableList), formSearch, JSON.stringify(columns)]);
4762
+ }, [JSON.stringify(params), JSON.stringify(pageParams), JSON.stringify(pagination), JSON.stringify(tableList) // formSearch,
4763
+ // JSON.stringify(columns),
4764
+ ]);
4762
4765
 
4763
4766
  var onFormSubmit = function onFormSubmit(values) {
4764
4767
  onSubmit && onSubmit(values);
@@ -6368,7 +6371,9 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
6368
6371
  }
6369
6372
  }, renderClose ? renderClose : /*#__PURE__*/React.createElement(CloseCircleOutlined, null), showFullscreen && /*#__PURE__*/React.createElement("span", {
6370
6373
  className: "mr5 cp fullscreenIcon ".concat(fullscreenClassName),
6371
- onClick: function onClick() {
6374
+ onClick: function onClick(e) {
6375
+ e.stopPropagation();
6376
+
6372
6377
  _this.setState({
6373
6378
  isFullScreen: !_this.state.isFullScreen
6374
6379
  });
@@ -12201,13 +12206,13 @@ function NtTable(_ref, ref) {
12201
12206
  });
12202
12207
  useEffect(function () {
12203
12208
  _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
12204
- var requestParams, res;
12209
+ var requestParams, values, res;
12205
12210
  return regeneratorRuntime.wrap(function _callee$(_context) {
12206
12211
  while (1) {
12207
12212
  switch (_context.prev = _context.next) {
12208
12213
  case 0:
12209
12214
  if (!request) {
12210
- _context.next = 15;
12215
+ _context.next = 16;
12211
12216
  break;
12212
12217
  }
12213
12218
 
@@ -12219,11 +12224,12 @@ function NtTable(_ref, ref) {
12219
12224
  requestParams.pageSize = pagination.pageSize || 20;
12220
12225
  }
12221
12226
 
12222
- requestParams = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, requestParams), params), formSearch), pageParams);
12223
- _context.next = 7;
12227
+ values = formSearchRef.current.getFormValues() || {};
12228
+ requestParams = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, requestParams), params), values), pageParams);
12229
+ _context.next = 8;
12224
12230
  return request(requestParams);
12225
12231
 
12226
- case 7:
12232
+ case 8:
12227
12233
  res = _context.sent;
12228
12234
  setLoading(false);
12229
12235
  onLoad && onLoad(res === null || res === void 0 ? void 0 : res.data, res);
@@ -12236,10 +12242,10 @@ function NtTable(_ref, ref) {
12236
12242
  total: (res === null || res === void 0 ? void 0 : res.total) || (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) || 0
12237
12243
  }, pagination), requestParams);
12238
12244
  });
12239
- _context.next = 16;
12245
+ _context.next = 17;
12240
12246
  break;
12241
12247
 
12242
- case 15:
12248
+ case 16:
12243
12249
  setpaginationParams(function (c) {
12244
12250
  var _tableList$slice;
12245
12251
 
@@ -12253,14 +12259,16 @@ function NtTable(_ref, ref) {
12253
12259
  return obj;
12254
12260
  });
12255
12261
 
12256
- case 16:
12262
+ case 17:
12257
12263
  case "end":
12258
12264
  return _context.stop();
12259
12265
  }
12260
12266
  }
12261
12267
  }, _callee);
12262
12268
  }))();
12263
- }, [JSON.stringify(params), JSON.stringify(pageParams), JSON.stringify(pagination), JSON.stringify(tableList), formSearch, JSON.stringify(columns)]);
12269
+ }, [JSON.stringify(params), JSON.stringify(pageParams), JSON.stringify(pagination), JSON.stringify(tableList) // formSearch,
12270
+ // JSON.stringify(columns),
12271
+ ]);
12264
12272
 
12265
12273
  var onFormSubmit = function onFormSubmit(values) {
12266
12274
  var requestParams = {};
package/dist/index.js CHANGED
@@ -4743,13 +4743,13 @@ function Table(_ref) {
4743
4743
 
4744
4744
  React.useEffect(function () {
4745
4745
  _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
4746
- var requestParams, res;
4746
+ var requestParams, values, res;
4747
4747
  return regeneratorRuntime.wrap(function _callee$(_context) {
4748
4748
  while (1) {
4749
4749
  switch (_context.prev = _context.next) {
4750
4750
  case 0:
4751
4751
  if (!request) {
4752
- _context.next = 15;
4752
+ _context.next = 16;
4753
4753
  break;
4754
4754
  }
4755
4755
 
@@ -4761,11 +4761,12 @@ function Table(_ref) {
4761
4761
  requestParams.pageSize = pagination.pageSize || 20;
4762
4762
  }
4763
4763
 
4764
- requestParams = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, requestParams), pageParams), params), formSearch);
4765
- _context.next = 7;
4764
+ values = formSearchRef.current.getFormValues() || {};
4765
+ requestParams = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, requestParams), params), values), pageParams);
4766
+ _context.next = 8;
4766
4767
  return request(requestParams);
4767
4768
 
4768
- case 7:
4769
+ case 8:
4769
4770
  res = _context.sent;
4770
4771
  setLoading(false);
4771
4772
  onLoad && onLoad(res === null || res === void 0 ? void 0 : res.data, res);
@@ -4778,10 +4779,10 @@ function Table(_ref) {
4778
4779
  total: (res === null || res === void 0 ? void 0 : res.total) || (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) || 0
4779
4780
  }, pagination), requestParams);
4780
4781
  });
4781
- _context.next = 16;
4782
+ _context.next = 17;
4782
4783
  break;
4783
4784
 
4784
- case 15:
4785
+ case 16:
4785
4786
  setpaginationParams(function (c) {
4786
4787
  var _tableList$slice;
4787
4788
 
@@ -4795,14 +4796,16 @@ function Table(_ref) {
4795
4796
  return obj;
4796
4797
  });
4797
4798
 
4798
- case 16:
4799
+ case 17:
4799
4800
  case "end":
4800
4801
  return _context.stop();
4801
4802
  }
4802
4803
  }
4803
4804
  }, _callee);
4804
4805
  }))();
4805
- }, [JSON.stringify(params), JSON.stringify(pageParams), JSON.stringify(pagination), JSON.stringify(tableList), formSearch, JSON.stringify(columns)]);
4806
+ }, [JSON.stringify(params), JSON.stringify(pageParams), JSON.stringify(pagination), JSON.stringify(tableList) // formSearch,
4807
+ // JSON.stringify(columns),
4808
+ ]);
4806
4809
 
4807
4810
  var onFormSubmit = function onFormSubmit(values) {
4808
4811
  onSubmit && onSubmit(values);
@@ -6412,7 +6415,9 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
6412
6415
  }
6413
6416
  }, renderClose ? renderClose : /*#__PURE__*/React__default['default'].createElement(icons.CloseCircleOutlined, null), showFullscreen && /*#__PURE__*/React__default['default'].createElement("span", {
6414
6417
  className: "mr5 cp fullscreenIcon ".concat(fullscreenClassName),
6415
- onClick: function onClick() {
6418
+ onClick: function onClick(e) {
6419
+ e.stopPropagation();
6420
+
6416
6421
  _this.setState({
6417
6422
  isFullScreen: !_this.state.isFullScreen
6418
6423
  });
@@ -12245,13 +12250,13 @@ function NtTable(_ref, ref) {
12245
12250
  });
12246
12251
  React.useEffect(function () {
12247
12252
  _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
12248
- var requestParams, res;
12253
+ var requestParams, values, res;
12249
12254
  return regeneratorRuntime.wrap(function _callee$(_context) {
12250
12255
  while (1) {
12251
12256
  switch (_context.prev = _context.next) {
12252
12257
  case 0:
12253
12258
  if (!request) {
12254
- _context.next = 15;
12259
+ _context.next = 16;
12255
12260
  break;
12256
12261
  }
12257
12262
 
@@ -12263,11 +12268,12 @@ function NtTable(_ref, ref) {
12263
12268
  requestParams.pageSize = pagination.pageSize || 20;
12264
12269
  }
12265
12270
 
12266
- requestParams = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, requestParams), params), formSearch), pageParams);
12267
- _context.next = 7;
12271
+ values = formSearchRef.current.getFormValues() || {};
12272
+ requestParams = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, requestParams), params), values), pageParams);
12273
+ _context.next = 8;
12268
12274
  return request(requestParams);
12269
12275
 
12270
- case 7:
12276
+ case 8:
12271
12277
  res = _context.sent;
12272
12278
  setLoading(false);
12273
12279
  onLoad && onLoad(res === null || res === void 0 ? void 0 : res.data, res);
@@ -12280,10 +12286,10 @@ function NtTable(_ref, ref) {
12280
12286
  total: (res === null || res === void 0 ? void 0 : res.total) || (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) || 0
12281
12287
  }, pagination), requestParams);
12282
12288
  });
12283
- _context.next = 16;
12289
+ _context.next = 17;
12284
12290
  break;
12285
12291
 
12286
- case 15:
12292
+ case 16:
12287
12293
  setpaginationParams(function (c) {
12288
12294
  var _tableList$slice;
12289
12295
 
@@ -12297,14 +12303,16 @@ function NtTable(_ref, ref) {
12297
12303
  return obj;
12298
12304
  });
12299
12305
 
12300
- case 16:
12306
+ case 17:
12301
12307
  case "end":
12302
12308
  return _context.stop();
12303
12309
  }
12304
12310
  }
12305
12311
  }, _callee);
12306
12312
  }))();
12307
- }, [JSON.stringify(params), JSON.stringify(pageParams), JSON.stringify(pagination), JSON.stringify(tableList), formSearch, JSON.stringify(columns)]);
12313
+ }, [JSON.stringify(params), JSON.stringify(pageParams), JSON.stringify(pagination), JSON.stringify(tableList) // formSearch,
12314
+ // JSON.stringify(columns),
12315
+ ]);
12308
12316
 
12309
12317
  var onFormSubmit = function onFormSubmit(values) {
12310
12318
  var requestParams = {};
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "wargerm",
4
- "version": "0.7.34",
4
+ "version": "0.7.36",
5
5
  "scripts": {
6
6
  "dev": "dumi dev",
7
7
  "docs:build": "dumi build",