@zat-design/sisyphus-react 3.11.6-beta.3 → 3.11.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.
- package/es/ProEnum/hooks/useEnumRequest.js +1 -1
- package/es/ProEnum/index.js +1 -1
- package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +2 -1
- package/es/ProSelect/index.js +1 -1
- package/es/ProTabs/index.js +1 -1
- package/es/ProTree/components/ProTree.js +1 -1
- package/es/ProTree/components/ProTreeSelect/index.js +1 -1
- package/es/ProTreeModal/index.js +1 -1
- package/lib/ProEnum/hooks/useEnumRequest.js +1 -1
- package/lib/ProEnum/index.js +1 -1
- package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +2 -1
- package/lib/ProSelect/index.js +1 -1
- package/lib/ProTabs/index.js +1 -1
- package/lib/ProTree/components/ProTree.js +1 -1
- package/lib/ProTree/components/ProTreeSelect/index.js +1 -1
- package/lib/ProTreeModal/index.js +1 -1
- package/package.json +1 -1
@@ -256,7 +256,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
|
|
256
256
|
if (useRequest && (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service)) {
|
257
257
|
var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
|
258
258
|
defaultParams = _ref4.defaultParams;
|
259
|
-
var params = Array.isArray(defaultParams) ? defaultParams[0] : defaultParams;
|
259
|
+
var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
260
260
|
if (requestRefresh) {
|
261
261
|
window.localStorage.removeItem(cacheKey);
|
262
262
|
window.sessionStorage.removeItem(cacheKey);
|
package/es/ProEnum/index.js
CHANGED
@@ -127,7 +127,7 @@ var ProEnum = function ProEnum(props) {
|
|
127
127
|
useDeepCompareEffect(function () {
|
128
128
|
var _ref3 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
|
129
129
|
defaultParams = _ref3.defaultParams;
|
130
|
-
var params = Array.isArray(defaultParams) ? defaultParams[0] : defaultParams;
|
130
|
+
var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
131
131
|
if (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) {
|
132
132
|
run(params);
|
133
133
|
}
|
@@ -49,6 +49,7 @@ export function useRequestList(service, options, useRequestOptions) {
|
|
49
49
|
transformResponse = _useDefaultOptions.transformResponse;
|
50
50
|
var _ref2 = useRequestOptions || {},
|
51
51
|
defaultParams = _ref2.defaultParams;
|
52
|
+
var _defaultParams = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
52
53
|
// 搜索表单里的值
|
53
54
|
var _useState3 = useState(),
|
54
55
|
_useState4 = _slicedToArray(_useState3, 2),
|
@@ -56,7 +57,7 @@ export function useRequestList(service, options, useRequestOptions) {
|
|
56
57
|
setSearchValues = _useState4[1];
|
57
58
|
// 当次执行service的请求,包括page参数
|
58
59
|
var params = useMemo(function () {
|
59
|
-
var _condition = _objectSpread(_objectSpread({},
|
60
|
+
var _condition = _objectSpread(_objectSpread({}, _defaultParams), searchValues);
|
60
61
|
var tempParams = withPagination ? _objectSpread(_objectSpread({}, page), {}, {
|
61
62
|
queryBean: _condition !== null && _condition !== void 0 ? _condition : {}
|
62
63
|
}) : _condition;
|
package/es/ProSelect/index.js
CHANGED
@@ -160,7 +160,7 @@ export var ProSelect = function ProSelect(props, ref) {
|
|
160
160
|
if (manual || (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length)) {
|
161
161
|
return;
|
162
162
|
}
|
163
|
-
var params = Array.isArray(defaultParams) ? defaultParams[0] : defaultParams;
|
163
|
+
var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
164
164
|
fetchFunction.run(params);
|
165
165
|
}, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
|
166
166
|
// disable默认值
|
package/es/ProTabs/index.js
CHANGED
@@ -85,7 +85,7 @@ var ProTabs = function ProTabs(props, ref) {
|
|
85
85
|
var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
|
86
86
|
defaultParams = _ref.defaultParams,
|
87
87
|
manual = _ref.manual;
|
88
|
-
var params = Array.isArray(defaultParams) ? defaultParams[0] : defaultParams;
|
88
|
+
var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
89
89
|
if (manual || !useRequest) {
|
90
90
|
return;
|
91
91
|
}
|
@@ -174,7 +174,7 @@ var ProTree = function ProTree(props) {
|
|
174
174
|
var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
|
175
175
|
defaultParams = _ref.defaultParams,
|
176
176
|
manual = _ref.manual;
|
177
|
-
var params = Array.isArray(defaultParams) ? defaultParams[0] : defaultParams;
|
177
|
+
var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
178
178
|
if (manual) {
|
179
179
|
return;
|
180
180
|
}
|
@@ -219,7 +219,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
219
219
|
// 如果配置手动加载,不执行请求
|
220
220
|
var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
|
221
221
|
defaultParams = _ref4.defaultParams;
|
222
|
-
var params = Array.isArray(defaultParams) ? defaultParams[0] : defaultParams;
|
222
|
+
var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
223
223
|
// 执行用户配置的枚举服务,拉取枚举数据进行更新
|
224
224
|
fetchFunction.run(params);
|
225
225
|
}, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, defaultDisableValue]);
|
package/es/ProTreeModal/index.js
CHANGED
@@ -166,7 +166,7 @@ var ProTreeModal = function ProTreeModal(props) {
|
|
166
166
|
var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
|
167
167
|
defaultParams = _ref.defaultParams,
|
168
168
|
manual = _ref.manual;
|
169
|
-
var params = Array.isArray(defaultParams) ? defaultParams[0] : defaultParams;
|
169
|
+
var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
170
170
|
if (manual) {
|
171
171
|
return;
|
172
172
|
}
|
@@ -263,7 +263,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
|
|
263
263
|
if (useRequest && (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service)) {
|
264
264
|
var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
|
265
265
|
defaultParams = _ref4.defaultParams;
|
266
|
-
var params = Array.isArray(defaultParams) ? defaultParams[0] : defaultParams;
|
266
|
+
var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
267
267
|
if (requestRefresh) {
|
268
268
|
window.localStorage.removeItem(cacheKey);
|
269
269
|
window.sessionStorage.removeItem(cacheKey);
|
package/lib/ProEnum/index.js
CHANGED
@@ -128,7 +128,7 @@ var ProEnum = function ProEnum(props) {
|
|
128
128
|
(0, _ahooks.useDeepCompareEffect)(function () {
|
129
129
|
var _ref3 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
|
130
130
|
defaultParams = _ref3.defaultParams;
|
131
|
-
var params = Array.isArray(defaultParams) ? defaultParams[0] : defaultParams;
|
131
|
+
var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
132
132
|
if (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) {
|
133
133
|
run(params);
|
134
134
|
}
|
@@ -58,6 +58,7 @@ function useRequestList(service, options, useRequestOptions) {
|
|
58
58
|
transformResponse = _useDefaultOptions.transformResponse;
|
59
59
|
var _ref2 = useRequestOptions || {},
|
60
60
|
defaultParams = _ref2.defaultParams;
|
61
|
+
var _defaultParams = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
61
62
|
// 搜索表单里的值
|
62
63
|
var _useState3 = (0, _react.useState)(),
|
63
64
|
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
@@ -65,7 +66,7 @@ function useRequestList(service, options, useRequestOptions) {
|
|
65
66
|
setSearchValues = _useState4[1];
|
66
67
|
// 当次执行service的请求,包括page参数
|
67
68
|
var params = (0, _react.useMemo)(function () {
|
68
|
-
var _condition = (0, _objectSpread2.default)((0, _objectSpread2.default)({},
|
69
|
+
var _condition = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _defaultParams), searchValues);
|
69
70
|
var tempParams = withPagination ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, page), {}, {
|
70
71
|
queryBean: _condition !== null && _condition !== void 0 ? _condition : {}
|
71
72
|
}) : _condition;
|
package/lib/ProSelect/index.js
CHANGED
@@ -161,7 +161,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
|
|
161
161
|
if (manual || (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length)) {
|
162
162
|
return;
|
163
163
|
}
|
164
|
-
var params = Array.isArray(defaultParams) ? defaultParams[0] : defaultParams;
|
164
|
+
var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
165
165
|
fetchFunction.run(params);
|
166
166
|
}, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
|
167
167
|
// disable默认值
|
package/lib/ProTabs/index.js
CHANGED
@@ -91,7 +91,7 @@ var ProTabs = function ProTabs(props, ref) {
|
|
91
91
|
var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
|
92
92
|
defaultParams = _ref.defaultParams,
|
93
93
|
manual = _ref.manual;
|
94
|
-
var params = Array.isArray(defaultParams) ? defaultParams[0] : defaultParams;
|
94
|
+
var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
95
95
|
if (manual || !useRequest) {
|
96
96
|
return;
|
97
97
|
}
|
@@ -174,7 +174,7 @@ var ProTree = function ProTree(props) {
|
|
174
174
|
var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
|
175
175
|
defaultParams = _ref.defaultParams,
|
176
176
|
manual = _ref.manual;
|
177
|
-
var params = Array.isArray(defaultParams) ? defaultParams[0] : defaultParams;
|
177
|
+
var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
178
178
|
if (manual) {
|
179
179
|
return;
|
180
180
|
}
|
@@ -219,7 +219,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
|
|
219
219
|
// 如果配置手动加载,不执行请求
|
220
220
|
var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
|
221
221
|
defaultParams = _ref4.defaultParams;
|
222
|
-
var params = Array.isArray(defaultParams) ? defaultParams[0] : defaultParams;
|
222
|
+
var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
223
223
|
// 执行用户配置的枚举服务,拉取枚举数据进行更新
|
224
224
|
fetchFunction.run(params);
|
225
225
|
}, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, defaultDisableValue]);
|
@@ -168,7 +168,7 @@ var ProTreeModal = function ProTreeModal(props) {
|
|
168
168
|
var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
|
169
169
|
defaultParams = _ref.defaultParams,
|
170
170
|
manual = _ref.manual;
|
171
|
-
var params = Array.isArray(defaultParams) ? defaultParams[0] : defaultParams;
|
171
|
+
var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
|
172
172
|
if (manual) {
|
173
173
|
return;
|
174
174
|
}
|