@zat-design/sisyphus-react 3.13.6-beta.3 → 3.13.6-beta.4

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/es/ProTable/hooks/useAntdTable.js +15 -15
  2. package/lib/ProTable/hooks/useAntdTable.js +14 -14
  3. package/package.json +1 -1
package/es/ProTable/hooks/useAntdTable.js CHANGED
@@ -7,7 +7,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
7
7
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
8
8
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
9
9
  var _excluded = ["page", "filters", "sorter"];
10
- import { useCallback, useEffect, useMemo, useState } from 'react';
10
+ import { useEffect, useMemo, useState } from 'react';
11
11
  import { useRequest, useSetState, useDeepCompareEffect, usePrevious } from 'ahooks';
12
12
  import { pickBy, isObject, merge, set, isEqual, omit } from 'lodash';
13
13
  import { defaultPage } from '../index';
@@ -71,7 +71,7 @@ function useAntdTable(service, options, useRequestOptions) {
71
71
  var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
72
72
  var initPage = (options === null || options === void 0 ? void 0 : options.page) || defaultPage;
73
73
  var previousPage = usePrevious(page || defaultPage);
74
- var getTransformParams = useCallback(function (params) {
74
+ var getTransformParams = function getTransformParams(params) {
75
75
  var _pickBy;
76
76
  var realParams = _objectSpread(_objectSpread(_objectSpread({}, defaultParam), extraParams), params);
77
77
  var _realParams$page = realParams.page,
@@ -92,7 +92,7 @@ function useAntdTable(service, options, useRequestOptions) {
92
92
  return transformParams(realParams, requestParams);
93
93
  }
94
94
  return requestParams;
95
- }, [defaultParam, extraParams]);
95
+ };
96
96
  // 仅清数据源相关，查询相关
97
97
  var handleSetStateCallback = function handleSetStateCallback(values) {
98
98
  setState(_objectSpread({
@@ -137,13 +137,13 @@ function useAntdTable(service, options, useRequestOptions) {
137
137
  var run = result.run,
138
138
  refreshAsync = result.refreshAsync;
139
139
  // service变化时触发 (禁止掉防止service变更时导致的死循环)
140
- var clearSelected = useCallback(function () {
140
+ var clearSelected = function clearSelected() {
141
141
  setState({
142
142
  allSelected: false,
143
143
  selectedRecords: [],
144
144
  selectedRowKeys: []
145
145
  });
146
- }, []);
146
+ };
147
147
  /**
148
148
  * 手动触发时，手动调用run
149
149
  */
@@ -189,7 +189,7 @@ function useAntdTable(service, options, useRequestOptions) {
189
189
  };
190
190
  }, []);
191
191
  // 分页变更
192
- var handlePageChange = useCallback(function (current, pageSize) {
192
+ var handlePageChange = function handlePageChange(current, pageSize) {
193
193
  var _form$getFieldsValue;
194
194
  var page = {
195
195
  pageNum: current,
@@ -207,8 +207,8 @@ function useAntdTable(service, options, useRequestOptions) {
207
207
  run(getTransformParams(_objectSpread(_objectSpread({
208
208
  page: page
209
209
  }, nextValues), extraFilter)));
210
- }, [allSelected, extraFilter, data, getTransformParams]);
211
- var handleTableChange = useCallback(function (pagination, filters, sorter, extra) {
210
+ };
211
+ var handleTableChange = function handleTableChange(pagination, filters, sorter, extra) {
212
212
  var _form$getFieldsValue2;
213
213
  // 跳过分页改变，使用pagination的onChange
214
214
  if (extra.action === 'paginate') {
@@ -234,8 +234,8 @@ function useAntdTable(service, options, useRequestOptions) {
234
234
  filters: filters,
235
235
  sorter: sorter
236
236
  })));
237
- }, [allSelected, getTransformParams]);
238
- var onSearch = useCallback(function (values) {
237
+ };
238
+ var onSearch = function onSearch(values) {
239
239
  var newPage = {
240
240
  pageNum: 1,
241
241
  pageSize: page.pageSize
@@ -258,8 +258,8 @@ function useAntdTable(service, options, useRequestOptions) {
258
258
  run(getTransformParams(_objectSpread(_objectSpread({
259
259
  page: newPage
260
260
  }, extraFilter), _values)));
261
- }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
262
- var resetParams = useCallback(function (page) {
261
+ };
262
+ var resetParams = function resetParams(page) {
263
263
  setState({
264
264
  searchValues: {},
265
265
  allSelected: false,
@@ -270,9 +270,9 @@ function useAntdTable(service, options, useRequestOptions) {
270
270
  sorter: undefined
271
271
  }
272
272
  });
273
- }, []);
273
+ };
274
274
  // 重置查询条件: 页码还原、勾选清空
275
- var onReset = useCallback(function () {
275
+ var onReset = function onReset() {
276
276
  form === null || form === void 0 ? void 0 : form.resetFields();
277
277
  var newPage = {
278
278
  pageNum: 1,
@@ -285,7 +285,7 @@ function useAntdTable(service, options, useRequestOptions) {
285
285
  page: newPage
286
286
  }));
287
287
  }
288
- }, [page.pageSize, run, resetParams, getTransformParams]);
288
+ };
289
289
  var refreshPage = function refreshPage(res) {
290
290
  var transformResult = transformResponse ? transformResponse(res) : res || {};
291
291
  var _ref3 = isListResult(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},
package/lib/ProTable/hooks/useAntdTable.js CHANGED
@@ -78,7 +78,7 @@ function useAntdTable(service, options, useRequestOptions) {
78
78
  var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
79
79
  var initPage = (options === null || options === void 0 ? void 0 : options.page) || _index.defaultPage;
80
80
  var previousPage = (0, _ahooks.usePrevious)(page || _index.defaultPage);
81
- var getTransformParams = (0, _react.useCallback)(function (params) {
81
+ var getTransformParams = function getTransformParams(params) {
82
82
  var _pickBy;
83
83
  var realParams = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultParam), extraParams), params);
84
84
  var _realParams$page = realParams.page,
@@ -99,7 +99,7 @@ function useAntdTable(service, options, useRequestOptions) {
99
99
  return transformParams(realParams, requestParams);
100
100
  }
101
101
  return requestParams;
102
- }, [defaultParam, extraParams]);
102
+ };
103
103
  // 仅清数据源相关，查询相关
104
104
  var handleSetStateCallback = function handleSetStateCallback(values) {
105
105
  setState((0, _objectSpread2.default)({
@@ -144,13 +144,13 @@ function useAntdTable(service, options, useRequestOptions) {
144
144
  var run = result.run,
145
145
  refreshAsync = result.refreshAsync;
146
146
  // service变化时触发 (禁止掉防止service变更时导致的死循环)
147
- var clearSelected = (0, _react.useCallback)(function () {
147
+ var clearSelected = function clearSelected() {
148
148
  setState({
149
149
  allSelected: false,
150
150
  selectedRecords: [],
151
151
  selectedRowKeys: []
152
152
  });
153
- }, []);
153
+ };
154
154
  /**
155
155
  * 手动触发时，手动调用run
156
156
  */
@@ -196,7 +196,7 @@ function useAntdTable(service, options, useRequestOptions) {
196
196
  };
197
197
  }, []);
198
198
  // 分页变更
199
- var handlePageChange = (0, _react.useCallback)(function (current, pageSize) {
199
+ var handlePageChange = function handlePageChange(current, pageSize) {
200
200
  var _form$getFieldsValue;
201
201
  var page = {
202
202
  pageNum: current,
@@ -214,8 +214,8 @@ function useAntdTable(service, options, useRequestOptions) {
214
214
  run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
215
215
  page: page
216
216
  }, nextValues), extraFilter)));
217
- }, [allSelected, extraFilter, data, getTransformParams]);
218
- var handleTableChange = (0, _react.useCallback)(function (pagination, filters, sorter, extra) {
217
+ };
218
+ var handleTableChange = function handleTableChange(pagination, filters, sorter, extra) {
219
219
  var _form$getFieldsValue2;
220
220
  // 跳过分页改变，使用pagination的onChange
221
221
  if (extra.action === 'paginate') {
@@ -241,8 +241,8 @@ function useAntdTable(service, options, useRequestOptions) {
241
241
  filters: filters,
242
242
  sorter: sorter
243
243
  })));
244
- }, [allSelected, getTransformParams]);
245
- var onSearch = (0, _react.useCallback)(function (values) {
244
+ };
245
+ var onSearch = function onSearch(values) {
246
246
  var newPage = {
247
247
  pageNum: 1,
248
248
  pageSize: page.pageSize
@@ -265,8 +265,8 @@ function useAntdTable(service, options, useRequestOptions) {
265
265
  run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
266
266
  page: newPage
267
267
  }, extraFilter), _values)));
268
- }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
269
- var resetParams = (0, _react.useCallback)(function (page) {
268
+ };
269
+ var resetParams = function resetParams(page) {
270
270
  setState({
271
271
  searchValues: {},
272
272
  allSelected: false,
@@ -277,9 +277,9 @@ function useAntdTable(service, options, useRequestOptions) {
277
277
  sorter: undefined
278
278
  }
279
279
  });
280
- }, []);
280
+ };
281
281
  // 重置查询条件: 页码还原、勾选清空
282
- var onReset = (0, _react.useCallback)(function () {
282
+ var onReset = function onReset() {
283
283
  form === null || form === void 0 ? void 0 : form.resetFields();
284
284
  var newPage = {
285
285
  pageNum: 1,
@@ -292,7 +292,7 @@ function useAntdTable(service, options, useRequestOptions) {
292
292
  page: newPage
293
293
  }));
294
294
  }
295
- }, [page.pageSize, run, resetParams, getTransformParams]);
295
+ };
296
296
  var refreshPage = function refreshPage(res) {
297
297
  var transformResult = transformResponse ? transformResponse(res) : res || {};
298
298
  var _ref3 = (0, _utils.isListResult)(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.13.6-beta.3",
3
+ "version": "3.13.6-beta.4",
4
4
  "license": "MIT",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",