wargerm 0.7.35 → 0.7.37

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.
@@ -0,0 +1,3 @@
1
+ /// <reference types="react" />
2
+ declare const _default: () => JSX.Element;
3
+ export default _default;
@@ -0,0 +1,3 @@
1
+ /// <reference types="react" />
2
+ declare const _default: () => JSX.Element;
3
+ export default _default;
package/dist/index.esm.js CHANGED
@@ -4193,8 +4193,8 @@ var WForm = function WForm(props, ref) {
4193
4193
  form === null || form === void 0 ? void 0 : (_form$setFieldsValue2 = form.setFieldsValue) === null || _form$setFieldsValue2 === void 0 ? void 0 : _form$setFieldsValue2.call(form, _defineProperty({}, c.dataIndex, (_columnsFields$c$data = columnsFields === null || columnsFields === void 0 ? void 0 : (_columnsFields$c$data2 = columnsFields[c.dataIndex]) === null || _columnsFields$c$data2 === void 0 ? void 0 : (_columnsFields$c$data3 = _columnsFields$c$data2[0]) === null || _columnsFields$c$data3 === void 0 ? void 0 : _columnsFields$c$data3.value) !== null && _columnsFields$c$data !== void 0 ? _columnsFields$c$data : ''));
4194
4194
  }
4195
4195
  });
4196
- var values = form.getFieldsValue();
4197
- onReset && onReset(filterObj(values));
4196
+ var values = getFormValues();
4197
+ onReset && onReset(values);
4198
4198
  };
4199
4199
 
4200
4200
  var setFieldsValue = function setFieldsValue(record) {
@@ -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);
@@ -12203,13 +12206,13 @@ function NtTable(_ref, ref) {
12203
12206
  });
12204
12207
  useEffect(function () {
12205
12208
  _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
12206
- var requestParams, res;
12209
+ var requestParams, values, res;
12207
12210
  return regeneratorRuntime.wrap(function _callee$(_context) {
12208
12211
  while (1) {
12209
12212
  switch (_context.prev = _context.next) {
12210
12213
  case 0:
12211
12214
  if (!request) {
12212
- _context.next = 15;
12215
+ _context.next = 16;
12213
12216
  break;
12214
12217
  }
12215
12218
 
@@ -12221,11 +12224,12 @@ function NtTable(_ref, ref) {
12221
12224
  requestParams.pageSize = pagination.pageSize || 20;
12222
12225
  }
12223
12226
 
12224
- requestParams = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, requestParams), params), formSearch), pageParams);
12225
- _context.next = 7;
12227
+ values = formSearchRef.current.getFormValues() || {};
12228
+ requestParams = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, requestParams), params), values), pageParams);
12229
+ _context.next = 8;
12226
12230
  return request(requestParams);
12227
12231
 
12228
- case 7:
12232
+ case 8:
12229
12233
  res = _context.sent;
12230
12234
  setLoading(false);
12231
12235
  onLoad && onLoad(res === null || res === void 0 ? void 0 : res.data, res);
@@ -12238,10 +12242,10 @@ function NtTable(_ref, ref) {
12238
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
12239
12243
  }, pagination), requestParams);
12240
12244
  });
12241
- _context.next = 16;
12245
+ _context.next = 17;
12242
12246
  break;
12243
12247
 
12244
- case 15:
12248
+ case 16:
12245
12249
  setpaginationParams(function (c) {
12246
12250
  var _tableList$slice;
12247
12251
 
@@ -12255,14 +12259,16 @@ function NtTable(_ref, ref) {
12255
12259
  return obj;
12256
12260
  });
12257
12261
 
12258
- case 16:
12262
+ case 17:
12259
12263
  case "end":
12260
12264
  return _context.stop();
12261
12265
  }
12262
12266
  }
12263
12267
  }, _callee);
12264
12268
  }))();
12265
- }, [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
+ ]);
12266
12272
 
12267
12273
  var onFormSubmit = function onFormSubmit(values) {
12268
12274
  var requestParams = {};
package/dist/index.js CHANGED
@@ -4237,8 +4237,8 @@ var WForm = function WForm(props, ref) {
4237
4237
  form === null || form === void 0 ? void 0 : (_form$setFieldsValue2 = form.setFieldsValue) === null || _form$setFieldsValue2 === void 0 ? void 0 : _form$setFieldsValue2.call(form, _defineProperty({}, c.dataIndex, (_columnsFields$c$data = columnsFields === null || columnsFields === void 0 ? void 0 : (_columnsFields$c$data2 = columnsFields[c.dataIndex]) === null || _columnsFields$c$data2 === void 0 ? void 0 : (_columnsFields$c$data3 = _columnsFields$c$data2[0]) === null || _columnsFields$c$data3 === void 0 ? void 0 : _columnsFields$c$data3.value) !== null && _columnsFields$c$data !== void 0 ? _columnsFields$c$data : ''));
4238
4238
  }
4239
4239
  });
4240
- var values = form.getFieldsValue();
4241
- onReset && onReset(filterObj(values));
4240
+ var values = getFormValues();
4241
+ onReset && onReset(values);
4242
4242
  };
4243
4243
 
4244
4244
  var setFieldsValue = function setFieldsValue(record) {
@@ -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);
@@ -12247,13 +12250,13 @@ function NtTable(_ref, ref) {
12247
12250
  });
12248
12251
  React.useEffect(function () {
12249
12252
  _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
12250
- var requestParams, res;
12253
+ var requestParams, values, res;
12251
12254
  return regeneratorRuntime.wrap(function _callee$(_context) {
12252
12255
  while (1) {
12253
12256
  switch (_context.prev = _context.next) {
12254
12257
  case 0:
12255
12258
  if (!request) {
12256
- _context.next = 15;
12259
+ _context.next = 16;
12257
12260
  break;
12258
12261
  }
12259
12262
 
@@ -12265,11 +12268,12 @@ function NtTable(_ref, ref) {
12265
12268
  requestParams.pageSize = pagination.pageSize || 20;
12266
12269
  }
12267
12270
 
12268
- requestParams = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, requestParams), params), formSearch), pageParams);
12269
- _context.next = 7;
12271
+ values = formSearchRef.current.getFormValues() || {};
12272
+ requestParams = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, requestParams), params), values), pageParams);
12273
+ _context.next = 8;
12270
12274
  return request(requestParams);
12271
12275
 
12272
- case 7:
12276
+ case 8:
12273
12277
  res = _context.sent;
12274
12278
  setLoading(false);
12275
12279
  onLoad && onLoad(res === null || res === void 0 ? void 0 : res.data, res);
@@ -12282,10 +12286,10 @@ function NtTable(_ref, ref) {
12282
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
12283
12287
  }, pagination), requestParams);
12284
12288
  });
12285
- _context.next = 16;
12289
+ _context.next = 17;
12286
12290
  break;
12287
12291
 
12288
- case 15:
12292
+ case 16:
12289
12293
  setpaginationParams(function (c) {
12290
12294
  var _tableList$slice;
12291
12295
 
@@ -12299,14 +12303,16 @@ function NtTable(_ref, ref) {
12299
12303
  return obj;
12300
12304
  });
12301
12305
 
12302
- case 16:
12306
+ case 17:
12303
12307
  case "end":
12304
12308
  return _context.stop();
12305
12309
  }
12306
12310
  }
12307
12311
  }, _callee);
12308
12312
  }))();
12309
- }, [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
+ ]);
12310
12316
 
12311
12317
  var onFormSubmit = function onFormSubmit(values) {
12312
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.35",
4
+ "version": "0.7.37",
5
5
  "scripts": {
6
6
  "dev": "dumi dev",
7
7
  "docs:build": "dumi build",