wargerm 0.6.16 → 0.6.18

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.
Files changed (3) hide show
  1. package/dist/index.esm.js +7 -5
  2. package/dist/index.js +7 -5
  3. package/package.json +1 -1
package/dist/index.esm.js CHANGED
@@ -3920,7 +3920,7 @@ var WForm = function WForm(props, ref) {
3920
3920
  });
3921
3921
  }, [changedValues, extraColumns, disabled].concat(_toConsumableArray(deps ? [deps] : []), [JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]));
3922
3922
 
3923
- var handleSearch = function handleSearch(v) {
3923
+ var handleSearch = function handleSearch(isfirst) {
3924
3924
  var searchForm = form.getFieldsValue();
3925
3925
  filterFormColumns.forEach(function (c) {
3926
3926
  if (c.search && c.search.transform) {
@@ -3976,7 +3976,7 @@ var WForm = function WForm(props, ref) {
3976
3976
  }
3977
3977
  }
3978
3978
  });
3979
- onSubmit && onSubmit(filterObj(searchForm) || {});
3979
+ !isfirst && onSubmit && onSubmit(filterObj(searchForm) || {});
3980
3980
  return filterObj(searchForm);
3981
3981
  };
3982
3982
 
@@ -4094,7 +4094,9 @@ var WForm = function WForm(props, ref) {
4094
4094
  width: '100%'
4095
4095
  },
4096
4096
  className: "mt10",
4097
- onFinish: handleSearch,
4097
+ onFinish: function onFinish(value) {
4098
+ return handleSearch();
4099
+ },
4098
4100
  onValuesChange: function onValuesChange(changedValues, allValues) {
4099
4101
  onFormChange && onFormChange(changedValues, allValues, form);
4100
4102
  setchangedValues(changedValues);
@@ -7369,7 +7371,7 @@ var TabelCard = function TabelCard(props, ref) {
7369
7371
  var _searchFormRef$curren3;
7370
7372
 
7371
7373
  var obj = // filterObj(searchFormRef.current?.form?.getFieldsValue()) || {};
7372
- filterObj((_searchFormRef$curren3 = searchFormRef.current) === null || _searchFormRef$curren3 === void 0 ? void 0 : _searchFormRef$curren3.handleSearch()) || {};
7374
+ filterObj((_searchFormRef$curren3 = searchFormRef.current) === null || _searchFormRef$curren3 === void 0 ? void 0 : _searchFormRef$curren3.handleSearch(true)) || {};
7373
7375
  (columns || []).filter(function (c) {
7374
7376
  return c.notInitialValueInSearch;
7375
7377
  }).forEach(function (item) {
@@ -7378,7 +7380,7 @@ var TabelCard = function TabelCard(props, ref) {
7378
7380
  formSearchRef.current = obj;
7379
7381
  }
7380
7382
  }, [columns]);
7381
- return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ModalForm$1, _objectSpread2(_objectSpread2({
7383
+ return /*#__PURE__*/React.createElement(React.Fragment, null, visible && /*#__PURE__*/React.createElement(ModalForm$1, _objectSpread2(_objectSpread2({
7382
7384
  ref: modalFormRef,
7383
7385
  title: modalFormConfig.type || '新增',
7384
7386
  visible: visible,
package/dist/index.js CHANGED
@@ -3985,7 +3985,7 @@ var WForm = function WForm(props, ref) {
3985
3985
  });
3986
3986
  }, [changedValues, extraColumns, disabled].concat(_toConsumableArray(deps ? [deps] : []), [JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]));
3987
3987
 
3988
- var handleSearch = function handleSearch(v) {
3988
+ var handleSearch = function handleSearch(isfirst) {
3989
3989
  var searchForm = form.getFieldsValue();
3990
3990
  filterFormColumns.forEach(function (c) {
3991
3991
  if (c.search && c.search.transform) {
@@ -4041,7 +4041,7 @@ var WForm = function WForm(props, ref) {
4041
4041
  }
4042
4042
  }
4043
4043
  });
4044
- onSubmit && onSubmit(filterObj(searchForm) || {});
4044
+ !isfirst && onSubmit && onSubmit(filterObj(searchForm) || {});
4045
4045
  return filterObj(searchForm);
4046
4046
  };
4047
4047
 
@@ -4159,7 +4159,9 @@ var WForm = function WForm(props, ref) {
4159
4159
  width: '100%'
4160
4160
  },
4161
4161
  className: "mt10",
4162
- onFinish: handleSearch,
4162
+ onFinish: function onFinish(value) {
4163
+ return handleSearch();
4164
+ },
4163
4165
  onValuesChange: function onValuesChange(changedValues, allValues) {
4164
4166
  onFormChange && onFormChange(changedValues, allValues, form);
4165
4167
  setchangedValues(changedValues);
@@ -7434,7 +7436,7 @@ var TabelCard = function TabelCard(props, ref) {
7434
7436
  var _searchFormRef$curren3;
7435
7437
 
7436
7438
  var obj = // filterObj(searchFormRef.current?.form?.getFieldsValue()) || {};
7437
- filterObj((_searchFormRef$curren3 = searchFormRef.current) === null || _searchFormRef$curren3 === void 0 ? void 0 : _searchFormRef$curren3.handleSearch()) || {};
7439
+ filterObj((_searchFormRef$curren3 = searchFormRef.current) === null || _searchFormRef$curren3 === void 0 ? void 0 : _searchFormRef$curren3.handleSearch(true)) || {};
7438
7440
  (columns || []).filter(function (c) {
7439
7441
  return c.notInitialValueInSearch;
7440
7442
  }).forEach(function (item) {
@@ -7443,7 +7445,7 @@ var TabelCard = function TabelCard(props, ref) {
7443
7445
  formSearchRef.current = obj;
7444
7446
  }
7445
7447
  }, [columns]);
7446
- return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(ModalForm$1, _objectSpread2(_objectSpread2({
7448
+ return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, visible && /*#__PURE__*/React__default['default'].createElement(ModalForm$1, _objectSpread2(_objectSpread2({
7447
7449
  ref: modalFormRef,
7448
7450
  title: modalFormConfig.type || '新增',
7449
7451
  visible: visible,
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "wargerm",
4
- "version": "0.6.16",
4
+ "version": "0.6.18",
5
5
  "scripts": {
6
6
  "dev": "dumi dev",
7
7
  "docs:build": "dumi build",