@zat-design/sisyphus-react 3.13.1-beta.7 → 3.13.2-beta.1
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.
|
@@ -26,7 +26,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
|
|
|
26
26
|
};
|
|
27
27
|
var previousSearchValues = null;
|
|
28
28
|
function useAntdTable(service, options, useRequestOptions) {
|
|
29
|
-
var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5;
|
|
29
|
+
var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params;
|
|
30
30
|
var _useSetState = useSetState({
|
|
31
31
|
data: [],
|
|
32
32
|
total: 0,
|
|
@@ -103,12 +103,6 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
|
103
103
|
allSelected: false
|
|
104
104
|
}, values));
|
|
105
105
|
};
|
|
106
|
-
var params = useMemo(function () {
|
|
107
|
-
var newQueryBean = _objectSpread(_objectSpread({}, searchValues), extraFilter);
|
|
108
|
-
return getTransformParams(_objectSpread({
|
|
109
|
-
page: page
|
|
110
|
-
}, newQueryBean));
|
|
111
|
-
}, [page, searchValues, extraFilter]);
|
|
112
106
|
var curService = useMemo(function () {
|
|
113
107
|
return service.toString();
|
|
114
108
|
}, [service]);
|
|
@@ -247,7 +241,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
|
247
241
|
onPageChange(newPage);
|
|
248
242
|
}
|
|
249
243
|
// 减少查询按钮的渲染，只有需要重置值时才需要调用
|
|
250
|
-
if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || isNonEmptyObject(_values)
|
|
244
|
+
if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || isNonEmptyObject(_values) || !isEqual(previousSearchValues, _values)) {
|
|
251
245
|
previousSearchValues = _values;
|
|
252
246
|
setState({
|
|
253
247
|
searchValues: _values,
|
|
@@ -477,7 +471,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
|
477
471
|
};
|
|
478
472
|
var useAntdTableProps = _objectSpread(_objectSpread({}, result), {}, {
|
|
479
473
|
data: data,
|
|
480
|
-
params: params,
|
|
474
|
+
params: (result === null || result === void 0 ? void 0 : (_result$params = result.params) === null || _result$params === void 0 ? void 0 : _result$params[0]) || {},
|
|
481
475
|
rowSelection: rowSelection,
|
|
482
476
|
searchValues: searchValues,
|
|
483
477
|
allSelected: allSelected,
|
|
@@ -33,7 +33,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
|
|
|
33
33
|
};
|
|
34
34
|
var previousSearchValues = null;
|
|
35
35
|
function useAntdTable(service, options, useRequestOptions) {
|
|
36
|
-
var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5;
|
|
36
|
+
var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params;
|
|
37
37
|
var _useSetState = (0, _ahooks.useSetState)({
|
|
38
38
|
data: [],
|
|
39
39
|
total: 0,
|
|
@@ -110,12 +110,6 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
|
110
110
|
allSelected: false
|
|
111
111
|
}, values));
|
|
112
112
|
};
|
|
113
|
-
var params = (0, _react.useMemo)(function () {
|
|
114
|
-
var newQueryBean = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, searchValues), extraFilter);
|
|
115
|
-
return getTransformParams((0, _objectSpread2.default)({
|
|
116
|
-
page: page
|
|
117
|
-
}, newQueryBean));
|
|
118
|
-
}, [page, searchValues, extraFilter]);
|
|
119
113
|
var curService = (0, _react.useMemo)(function () {
|
|
120
114
|
return service.toString();
|
|
121
115
|
}, [service]);
|
|
@@ -254,7 +248,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
|
254
248
|
onPageChange(newPage);
|
|
255
249
|
}
|
|
256
250
|
// 减少查询按钮的渲染，只有需要重置值时才需要调用
|
|
257
|
-
if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || (0, _utils.isNonEmptyObject)(_values)
|
|
251
|
+
if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || (0, _utils.isNonEmptyObject)(_values) || !(0, _lodash.isEqual)(previousSearchValues, _values)) {
|
|
258
252
|
previousSearchValues = _values;
|
|
259
253
|
setState({
|
|
260
254
|
searchValues: _values,
|
|
@@ -484,7 +478,7 @@ function useAntdTable(service, options, useRequestOptions) {
|
|
|
484
478
|
};
|
|
485
479
|
var useAntdTableProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, result), {}, {
|
|
486
480
|
data: data,
|
|
487
|
-
params: params,
|
|
481
|
+
params: (result === null || result === void 0 ? void 0 : (_result$params = result.params) === null || _result$params === void 0 ? void 0 : _result$params[0]) || {},
|
|
488
482
|
rowSelection: rowSelection,
|
|
489
483
|
searchValues: searchValues,
|
|
490
484
|
allSelected: allSelected,
|