@zat-design/sisyphus-react 3.11.6-beta.2 → 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.
Files changed (17) hide show
  1. package/es/ProEnum/hooks/useEnumRequest.js +2 -1
  2. package/es/ProEnum/index.js +2 -1
  3. package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +2 -1
  4. package/es/ProSelect/index.js +2 -1
  5. package/es/ProTabs/index.js +2 -1
  6. package/es/ProTree/components/ProTree.js +2 -1
  7. package/es/ProTree/components/ProTreeSelect/index.js +2 -1
  8. package/es/ProTreeModal/index.js +2 -1
  9. package/lib/ProEnum/hooks/useEnumRequest.js +2 -1
  10. package/lib/ProEnum/index.js +2 -1
  11. package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +2 -1
  12. package/lib/ProSelect/index.js +2 -1
  13. package/lib/ProTabs/index.js +2 -1
  14. package/lib/ProTree/components/ProTree.js +2 -1
  15. package/lib/ProTree/components/ProTreeSelect/index.js +2 -1
  16. package/lib/ProTreeModal/index.js +2 -1
  17. package/package.json +1 -1
package/es/ProEnum/hooks/useEnumRequest.js CHANGED
@@ -256,11 +256,12 @@ 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 === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
259
260
  if (requestRefresh) {
260
261
  window.localStorage.removeItem(cacheKey);
261
262
  window.sessionStorage.removeItem(cacheKey);
262
263
  }
263
- enumRes.run(defaultParams);
264
+ enumRes.run(params);
264
265
  // TODO 这段代码目前看起来是没啥用的、没起到作用
265
266
  mergeData();
266
267
  } else if (Object.keys(dataSource)) {
package/es/ProEnum/index.js CHANGED
@@ -127,8 +127,9 @@ 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 === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
130
131
  if (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) {
131
- run(defaultParams);
132
+ run(params);
132
133
  }
133
134
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
134
135
  var enumLists = useMemo(function () {
package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js CHANGED
@@ -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({}, defaultParams), searchValues);
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,8 @@ 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
- fetchFunction.run(defaultParams);
163
+ var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
164
+ fetchFunction.run(params);
164
165
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
165
166
  // disable默认值
166
167
  if (defaultDisableValue) {
package/es/ProTabs/index.js CHANGED
@@ -85,10 +85,11 @@ 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 === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
88
89
  if (manual || !useRequest) {
89
90
  return;
90
91
  }
91
- fetchFunction.run(defaultParams);
92
+ fetchFunction.run(params);
92
93
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
93
94
  useImperativeHandle(ref, function () {
94
95
  return {
package/es/ProTree/components/ProTree.js CHANGED
@@ -174,11 +174,12 @@ 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 === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
177
178
  if (manual) {
178
179
  return;
179
180
  }
180
181
  // 执行用户配置的枚举服务，拉取枚举数据进行更新
181
- fetchFunction.run(defaultParams);
182
+ fetchFunction.run(params);
182
183
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
183
184
  var handleSignalSelect = function handleSignalSelect(value) {
184
185
  var checkedValues = [];
package/es/ProTree/components/ProTreeSelect/index.js CHANGED
@@ -219,8 +219,9 @@ 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 === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
222
223
  // 执行用户配置的枚举服务，拉取枚举数据进行更新
223
- fetchFunction.run(defaultParams);
224
+ fetchFunction.run(params);
224
225
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, defaultDisableValue]);
225
226
  // disable默认值
226
227
  if (defaultDisableValue) {
package/es/ProTreeModal/index.js CHANGED
@@ -166,11 +166,12 @@ 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 === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
169
170
  if (manual) {
170
171
  return;
171
172
  }
172
173
  // 执行用户配置的枚举服务，拉取枚举数据进行更新
173
- fetchFunction.run(defaultParams);
174
+ fetchFunction.run(params);
174
175
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
175
176
  useEffect(function () {
176
177
  setState({
package/lib/ProEnum/hooks/useEnumRequest.js CHANGED
@@ -263,11 +263,12 @@ 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 === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
266
267
  if (requestRefresh) {
267
268
  window.localStorage.removeItem(cacheKey);
268
269
  window.sessionStorage.removeItem(cacheKey);
269
270
  }
270
- enumRes.run(defaultParams);
271
+ enumRes.run(params);
271
272
  // TODO 这段代码目前看起来是没啥用的、没起到作用
272
273
  mergeData();
273
274
  } else if (Object.keys(dataSource)) {
package/lib/ProEnum/index.js CHANGED
@@ -128,8 +128,9 @@ 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 === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
131
132
  if (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) {
132
- run(defaultParams);
133
+ run(params);
133
134
  }
134
135
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
135
136
  var enumLists = (0, _react.useMemo)(function () {
package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js CHANGED
@@ -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)({}, defaultParams), searchValues);
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,8 @@ 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
- fetchFunction.run(defaultParams);
164
+ var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
165
+ fetchFunction.run(params);
165
166
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
166
167
  // disable默认值
167
168
  if (defaultDisableValue) {
package/lib/ProTabs/index.js CHANGED
@@ -91,10 +91,11 @@ 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 === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
94
95
  if (manual || !useRequest) {
95
96
  return;
96
97
  }
97
- fetchFunction.run(defaultParams);
98
+ fetchFunction.run(params);
98
99
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
99
100
  (0, _react.useImperativeHandle)(ref, function () {
100
101
  return {
package/lib/ProTree/components/ProTree.js CHANGED
@@ -174,11 +174,12 @@ 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 === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
177
178
  if (manual) {
178
179
  return;
179
180
  }
180
181
  // 执行用户配置的枚举服务，拉取枚举数据进行更新
181
- fetchFunction.run(defaultParams);
182
+ fetchFunction.run(params);
182
183
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
183
184
  var handleSignalSelect = function handleSignalSelect(value) {
184
185
  var checkedValues = [];
package/lib/ProTree/components/ProTreeSelect/index.js CHANGED
@@ -219,8 +219,9 @@ 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 === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
222
223
  // 执行用户配置的枚举服务，拉取枚举数据进行更新
223
- fetchFunction.run(defaultParams);
224
+ fetchFunction.run(params);
224
225
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, defaultDisableValue]);
225
226
  // disable默认值
226
227
  if (defaultDisableValue) {
package/lib/ProTreeModal/index.js CHANGED
@@ -168,11 +168,12 @@ 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 === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
171
172
  if (manual) {
172
173
  return;
173
174
  }
174
175
  // 执行用户配置的枚举服务，拉取枚举数据进行更新
175
- fetchFunction.run(defaultParams);
176
+ fetchFunction.run(params);
176
177
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
177
178
  (0, _react.useEffect)(function () {
178
179
  setState({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.11.6-beta.2",
3
+ "version": "3.11.6-beta.4",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",