@zat-design/sisyphus-react 3.13.5-beta.1 → 3.13.5-beta.3

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 (5) hide show
  1. package/es/ProTable/hooks/useAntdTable.js +9 -7
  2. package/es/ProTable/propsType.d.ts +6 -0
  3. package/lib/ProTable/hooks/useAntdTable.js +9 -5
  4. package/lib/ProTable/propsType.d.ts +6 -0
  5. package/package.json +1 -1
package/es/ProTable/hooks/useAntdTable.js CHANGED
@@ -4,8 +4,6 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
4
4
  import "antd/es/message/style";
5
5
  import _message from "antd/es/message";
6
6
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
7
- import "antd/es/form/style";
8
- import _Form from "antd/es/form";
9
7
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
10
8
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
11
9
  var _excluded = ["page", "filters", "sorter"];
@@ -34,6 +32,7 @@ function useAntdTable(service, options, useRequestOptions) {
34
32
  total: 0,
35
33
  selectedRecords: [],
36
34
  selectedRowKeys: [],
35
+ searchValues: undefined,
37
36
  extraFilter: {
38
37
  filters: undefined,
39
38
  sorter: undefined
@@ -46,6 +45,7 @@ function useAntdTable(service, options, useRequestOptions) {
46
45
  total = _useSetState2$.total,
47
46
  selectedRecords = _useSetState2$.selectedRecords,
48
47
  selectedRowKeys = _useSetState2$.selectedRowKeys,
48
+ searchValues = _useSetState2$.searchValues,
49
49
  extraFilter = _useSetState2$.extraFilter,
50
50
  allSelected = _useSetState2$.allSelected,
51
51
  setState = _useSetState2[1];
@@ -66,9 +66,6 @@ function useAntdTable(service, options, useRequestOptions) {
66
66
  transformParams = _useDefaultOptions.transformParams,
67
67
  transformResponse = _useDefaultOptions.transformResponse,
68
68
  disabled = _useDefaultOptions.disabled;
69
- // 搜索表单里的值
70
- var _searchValues = _Form.useWatch([], form);
71
- var searchValues = removeEmptyKeys(_searchValues);
72
69
  var _ref = useRequestOptions || {},
73
70
  defaultParams = _ref.defaultParams;
74
71
  var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
@@ -193,6 +190,7 @@ function useAntdTable(service, options, useRequestOptions) {
193
190
  }, []);
194
191
  // 分页变更
195
192
  var handlePageChange = useCallback(function (current, pageSize) {
193
+ var _form$getFieldsValue;
196
194
  var page = {
197
195
  pageNum: current,
198
196
  pageSize: pageSize
@@ -204,9 +202,11 @@ function useAntdTable(service, options, useRequestOptions) {
204
202
  selectedRowKeys: []
205
203
  });
206
204
  }
207
- run(getTransformParams(_objectSpread(_objectSpread({
205
+ var newValues = (_form$getFieldsValue = form.getFieldsValue()) !== null && _form$getFieldsValue !== void 0 ? _form$getFieldsValue : {};
206
+ var nextValues = removeEmptyKeys(newValues);
207
+ run(getTransformParams(_objectSpread(_objectSpread(_objectSpread({
208
208
  page: page
209
- }, searchValues), extraFilter)));
209
+ }, searchValues), nextValues), extraFilter)));
210
210
  }, [allSelected, searchValues, extraFilter, data, getTransformParams]);
211
211
  var handleTableChange = useCallback(function (pagination, filters, sorter, extra) {
212
212
  // 跳过分页改变，使用pagination的onChange
@@ -247,6 +247,7 @@ function useAntdTable(service, options, useRequestOptions) {
247
247
  if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || isNonEmptyObject(_values) || !isEqual(previousSearchValues, _values)) {
248
248
  previousSearchValues = _values;
249
249
  setState({
250
+ searchValues: _values,
250
251
  allSelected: false,
251
252
  selectedRecords: [],
252
253
  selectedRowKeys: []
@@ -258,6 +259,7 @@ function useAntdTable(service, options, useRequestOptions) {
258
259
  }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
259
260
  var resetParams = useCallback(function (page) {
260
261
  setState({
262
+ searchValues: undefined,
261
263
  allSelected: false,
262
264
  selectedRecords: [],
263
265
  selectedRowKeys: [],
package/es/ProTable/propsType.d.ts CHANGED
@@ -735,6 +735,12 @@ export interface ProTableUseAntdTableType<I, R> {
735
735
  * @default []
736
736
  */
737
737
  selectedRowKeys: Key[];
738
+ /**
739
+ * 搜索值
740
+ * @description 当前表单的搜索条件
741
+ * @default undefined
742
+ */
743
+ searchValues: I;
738
744
  /**
739
745
  * 额外过滤条件
740
746
  * @description 表单之外的额外过滤条件
package/lib/ProTable/hooks/useAntdTable.js CHANGED
@@ -39,6 +39,7 @@ function useAntdTable(service, options, useRequestOptions) {
39
39
  total: 0,
40
40
  selectedRecords: [],
41
41
  selectedRowKeys: [],
42
+ searchValues: undefined,
42
43
  extraFilter: {
43
44
  filters: undefined,
44
45
  sorter: undefined
@@ -51,6 +52,7 @@ function useAntdTable(service, options, useRequestOptions) {
51
52
  total = _useSetState2$.total,
52
53
  selectedRecords = _useSetState2$.selectedRecords,
53
54
  selectedRowKeys = _useSetState2$.selectedRowKeys,
55
+ searchValues = _useSetState2$.searchValues,
54
56
  extraFilter = _useSetState2$.extraFilter,
55
57
  allSelected = _useSetState2$.allSelected,
56
58
  setState = _useSetState2[1];
@@ -71,9 +73,6 @@ function useAntdTable(service, options, useRequestOptions) {
71
73
  transformParams = _useDefaultOptions.transformParams,
72
74
  transformResponse = _useDefaultOptions.transformResponse,
73
75
  disabled = _useDefaultOptions.disabled;
74
- // 搜索表单里的值
75
- var _searchValues = _antd.Form.useWatch([], form);
76
- var searchValues = (0, _utils.removeEmptyKeys)(_searchValues);
77
76
  var _ref = useRequestOptions || {},
78
77
  defaultParams = _ref.defaultParams;
79
78
  var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
@@ -198,6 +197,7 @@ function useAntdTable(service, options, useRequestOptions) {
198
197
  }, []);
199
198
  // 分页变更
200
199
  var handlePageChange = (0, _react.useCallback)(function (current, pageSize) {
200
+ var _form$getFieldsValue;
201
201
  var page = {
202
202
  pageNum: current,
203
203
  pageSize: pageSize
@@ -209,9 +209,11 @@ function useAntdTable(service, options, useRequestOptions) {
209
209
  selectedRowKeys: []
210
210
  });
211
211
  }
212
- run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
212
+ var newValues = (_form$getFieldsValue = form.getFieldsValue()) !== null && _form$getFieldsValue !== void 0 ? _form$getFieldsValue : {};
213
+ var nextValues = (0, _utils.removeEmptyKeys)(newValues);
214
+ run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
213
215
  page: page
214
- }, searchValues), extraFilter)));
216
+ }, searchValues), nextValues), extraFilter)));
215
217
  }, [allSelected, searchValues, extraFilter, data, getTransformParams]);
216
218
  var handleTableChange = (0, _react.useCallback)(function (pagination, filters, sorter, extra) {
217
219
  // 跳过分页改变，使用pagination的onChange
@@ -252,6 +254,7 @@ function useAntdTable(service, options, useRequestOptions) {
252
254
  if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || (0, _utils.isNonEmptyObject)(_values) || !(0, _lodash.isEqual)(previousSearchValues, _values)) {
253
255
  previousSearchValues = _values;
254
256
  setState({
257
+ searchValues: _values,
255
258
  allSelected: false,
256
259
  selectedRecords: [],
257
260
  selectedRowKeys: []
@@ -263,6 +266,7 @@ function useAntdTable(service, options, useRequestOptions) {
263
266
  }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
264
267
  var resetParams = (0, _react.useCallback)(function (page) {
265
268
  setState({
269
+ searchValues: undefined,
266
270
  allSelected: false,
267
271
  selectedRecords: [],
268
272
  selectedRowKeys: [],
package/lib/ProTable/propsType.d.ts CHANGED
@@ -735,6 +735,12 @@ export interface ProTableUseAntdTableType<I, R> {
735
735
  * @default []
736
736
  */
737
737
  selectedRowKeys: Key[];
738
+ /**
739
+ * 搜索值
740
+ * @description 当前表单的搜索条件
741
+ * @default undefined
742
+ */
743
+ searchValues: I;
738
744
  /**
739
745
  * 额外过滤条件
740
746
  * @description 表单之外的额外过滤条件
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.13.5-beta.1",
3
+ "version": "3.13.5-beta.3",
4
4
  "license": "MIT",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",