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

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 +8 -7
  2. package/es/ProTable/propsType.d.ts +6 -0
  3. package/lib/ProTable/hooks/useAntdTable.js +8 -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,10 @@ 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
+ run(getTransformParams(_objectSpread(_objectSpread(_objectSpread({
208
207
  page: page
209
- }, searchValues), extraFilter)));
208
+ }, searchValues), newValues), extraFilter)));
210
209
  }, [allSelected, searchValues, extraFilter, data, getTransformParams]);
211
210
  var handleTableChange = useCallback(function (pagination, filters, sorter, extra) {
212
211
  // 跳过分页改变，使用pagination的onChange
@@ -247,6 +246,7 @@ function useAntdTable(service, options, useRequestOptions) {
247
246
  if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || isNonEmptyObject(_values) || !isEqual(previousSearchValues, _values)) {
248
247
  previousSearchValues = _values;
249
248
  setState({
249
+ searchValues: _values,
250
250
  allSelected: false,
251
251
  selectedRecords: [],
252
252
  selectedRowKeys: []
@@ -258,6 +258,7 @@ function useAntdTable(service, options, useRequestOptions) {
258
258
  }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
259
259
  var resetParams = useCallback(function (page) {
260
260
  setState({
261
+ searchValues: undefined,
261
262
  allSelected: false,
262
263
  selectedRecords: [],
263
264
  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,10 @@ 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
+ run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
213
214
  page: page
214
- }, searchValues), extraFilter)));
215
+ }, searchValues), newValues), extraFilter)));
215
216
  }, [allSelected, searchValues, extraFilter, data, getTransformParams]);
216
217
  var handleTableChange = (0, _react.useCallback)(function (pagination, filters, sorter, extra) {
217
218
  // 跳过分页改变，使用pagination的onChange
@@ -252,6 +253,7 @@ function useAntdTable(service, options, useRequestOptions) {
252
253
  if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || (0, _utils.isNonEmptyObject)(_values) || !(0, _lodash.isEqual)(previousSearchValues, _values)) {
253
254
  previousSearchValues = _values;
254
255
  setState({
256
+ searchValues: _values,
255
257
  allSelected: false,
256
258
  selectedRecords: [],
257
259
  selectedRowKeys: []
@@ -263,6 +265,7 @@ function useAntdTable(service, options, useRequestOptions) {
263
265
  }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
264
266
  var resetParams = (0, _react.useCallback)(function (page) {
265
267
  setState({
268
+ searchValues: undefined,
266
269
  allSelected: false,
267
270
  selectedRecords: [],
268
271
  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.2",
4
4
  "license": "MIT",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",