@zat-design/sisyphus-react 3.11.6-beta.3 → 3.11.6-beta.5
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/ProForm/components/combination/ProModalSelect/index.js +15 -17
- 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/ProForm/components/combination/ProModalSelect/index.js +15 -17
- 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;
|
@@ -34,7 +34,7 @@ import viewSvg from '../../../../assets/view.svg';
|
|
34
34
|
import useRequestList from './hooks/useRequestList';
|
35
35
|
import locale from '../../../../locale';
|
36
36
|
var ProModalSelect = function ProModalSelect(props, ref) {
|
37
|
-
var _useRequest$options, _useRequest$
|
37
|
+
var _useRequest$options, _useRequest$options2, _useRequest$options2$, _useRequest$options3, _formColumns$;
|
38
38
|
var value = props.value,
|
39
39
|
onChange = props.onChange,
|
40
40
|
disabled = props.disabled,
|
@@ -107,7 +107,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
107
107
|
rowSelection = _ref4.rowSelection,
|
108
108
|
restTableProps = _objectWithoutProperties(_ref4, _excluded3);
|
109
109
|
var preValue = useRef(value);
|
110
|
-
var
|
110
|
+
var defaultParams = Array.isArray(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams) ? useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : (_useRequest$options2$ = _useRequest$options2.defaultParams) === null || _useRequest$options2$ === void 0 ? void 0 : _useRequest$options2$[0] : (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams) || {};
|
111
|
+
var defaultParamsRef = useRef(defaultParams); // 缓存 defaultParams 的引用
|
111
112
|
var _useSetState = useSetState({
|
112
113
|
_value: value,
|
113
114
|
isInit: true,
|
@@ -317,7 +318,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
317
318
|
};
|
318
319
|
}();
|
319
320
|
var handleClose = function handleClose() {
|
320
|
-
var _useRequest$
|
321
|
+
var _useRequest$options4;
|
321
322
|
form.resetFields();
|
322
323
|
setState({
|
323
324
|
onOff: false,
|
@@ -325,7 +326,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
325
326
|
isInit: false
|
326
327
|
});
|
327
328
|
// 当设置manual为true时,清空当前弹框内已搜索出来的值
|
328
|
-
if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$
|
329
|
+
if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.manual) {
|
329
330
|
mutate(function () {
|
330
331
|
return [];
|
331
332
|
});
|
@@ -472,7 +473,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
472
473
|
// 初始化回显,当传入initParams时,前端用来回险
|
473
474
|
var getInitValues = /*#__PURE__*/function () {
|
474
475
|
var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
|
475
|
-
var _useRequest$
|
476
|
+
var _useRequest$options5, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
|
476
477
|
return _regeneratorRuntime().wrap(function _callee4$(_context4) {
|
477
478
|
while (1) switch (_context4.prev = _context4.next) {
|
478
479
|
case 0:
|
@@ -480,11 +481,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
480
481
|
_context4.next = 9;
|
481
482
|
break;
|
482
483
|
}
|
483
|
-
queryBean = _objectSpread(_objectSpread({},
|
484
|
+
queryBean = _objectSpread(_objectSpread({}, defaultParams), initParams || {});
|
484
485
|
page = _objectSpread({
|
485
486
|
pageNum: 1,
|
486
487
|
pageSize: 10
|
487
|
-
}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$
|
488
|
+
}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
|
488
489
|
params = withPagination ? _objectSpread(_objectSpread({}, page), {}, {
|
489
490
|
queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
|
490
491
|
}) : queryBean;
|
@@ -533,12 +534,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
533
534
|
// 初始化回显,当传入initParams时,前端用来回险
|
534
535
|
var getDefaultOneValues = /*#__PURE__*/function () {
|
535
536
|
var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
|
536
|
-
var _useRequest$
|
537
|
+
var _useRequest$options6;
|
537
538
|
var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
|
538
539
|
return _regeneratorRuntime().wrap(function _callee5$(_context5) {
|
539
540
|
while (1) switch (_context5.prev = _context5.next) {
|
540
541
|
case 0:
|
541
|
-
queryBean = _objectSpread({},
|
542
|
+
queryBean = _objectSpread({}, defaultParams);
|
542
543
|
page = _objectSpread({
|
543
544
|
pageNum: 1,
|
544
545
|
pageSize: 10
|
@@ -669,22 +670,20 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
669
670
|
if (useRequest) {
|
670
671
|
// 加定时器 修复依赖数据同步更新未取到问题
|
671
672
|
setTimeout(function () {
|
672
|
-
var _useRequest$options8, _useRequest$options9;
|
673
673
|
var params = withPagination ? {
|
674
674
|
pageNum: 1,
|
675
675
|
pageSize: 50,
|
676
|
-
queryBean: _objectSpread(_objectSpread({},
|
677
|
-
} : _objectSpread(_objectSpread({},
|
676
|
+
queryBean: _objectSpread(_objectSpread({}, defaultParams), initParams)
|
677
|
+
} : _objectSpread(_objectSpread({}, defaultParams), initParams);
|
678
678
|
var nextParams = transformParams ? transformParams(params) : params;
|
679
679
|
run(nextParams);
|
680
680
|
}, 300);
|
681
681
|
}
|
682
682
|
}
|
683
|
-
}, [JSON.stringify(value), visible, JSON.stringify(
|
683
|
+
}, [JSON.stringify(value), visible, JSON.stringify(defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
|
684
684
|
var handleSelectFocus = function handleSelectFocus() {
|
685
685
|
if (useRequest) {
|
686
|
-
var
|
687
|
-
var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams) || {};
|
686
|
+
var queryBean = defaultParams || {};
|
688
687
|
var params = withPagination ? {
|
689
688
|
pageNum: 1,
|
690
689
|
pageSize: 50,
|
@@ -703,8 +702,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
703
702
|
};
|
704
703
|
var handleSelectSearch = debounce(function (val) {
|
705
704
|
if (useRequest) {
|
706
|
-
var
|
707
|
-
var queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options12 = useRequest.options) === null || _useRequest$options12 === void 0 ? void 0 : _useRequest$options12.defaultParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
|
705
|
+
var queryBean = _objectSpread(_objectSpread({}, defaultParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
|
708
706
|
var params = withPagination ? {
|
709
707
|
pageNum: 1,
|
710
708
|
pageSize: 50,
|
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;
|
@@ -29,7 +29,7 @@ var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames",
|
|
29
29
|
_excluded2 = ["onOk"],
|
30
30
|
_excluded3 = ["rowKey", "columns", "rowSelection"];
|
31
31
|
var ProModalSelect = function ProModalSelect(props, ref) {
|
32
|
-
var _useRequest$options, _useRequest$
|
32
|
+
var _useRequest$options, _useRequest$options2, _useRequest$options2$, _useRequest$options3, _formColumns$;
|
33
33
|
var value = props.value,
|
34
34
|
onChange = props.onChange,
|
35
35
|
disabled = props.disabled,
|
@@ -102,7 +102,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
102
102
|
rowSelection = _ref4.rowSelection,
|
103
103
|
restTableProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded3);
|
104
104
|
var preValue = (0, _react.useRef)(value);
|
105
|
-
var
|
105
|
+
var defaultParams = Array.isArray(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams) ? useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : (_useRequest$options2$ = _useRequest$options2.defaultParams) === null || _useRequest$options2$ === void 0 ? void 0 : _useRequest$options2$[0] : (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams) || {};
|
106
|
+
var defaultParamsRef = (0, _react.useRef)(defaultParams); // 缓存 defaultParams 的引用
|
106
107
|
var _useSetState = (0, _ahooks.useSetState)({
|
107
108
|
_value: value,
|
108
109
|
isInit: true,
|
@@ -312,7 +313,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
312
313
|
};
|
313
314
|
}();
|
314
315
|
var handleClose = function handleClose() {
|
315
|
-
var _useRequest$
|
316
|
+
var _useRequest$options4;
|
316
317
|
form.resetFields();
|
317
318
|
setState({
|
318
319
|
onOff: false,
|
@@ -320,7 +321,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
320
321
|
isInit: false
|
321
322
|
});
|
322
323
|
// 当设置manual为true时,清空当前弹框内已搜索出来的值
|
323
|
-
if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$
|
324
|
+
if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.manual) {
|
324
325
|
mutate(function () {
|
325
326
|
return [];
|
326
327
|
});
|
@@ -467,7 +468,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
467
468
|
// 初始化回显,当传入initParams时,前端用来回险
|
468
469
|
var getInitValues = /*#__PURE__*/function () {
|
469
470
|
var _ref10 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
|
470
|
-
var _useRequest$
|
471
|
+
var _useRequest$options5, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
|
471
472
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
|
472
473
|
while (1) switch (_context4.prev = _context4.next) {
|
473
474
|
case 0:
|
@@ -475,11 +476,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
475
476
|
_context4.next = 9;
|
476
477
|
break;
|
477
478
|
}
|
478
|
-
queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({},
|
479
|
+
queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams || {});
|
479
480
|
page = (0, _objectSpread3.default)({
|
480
481
|
pageNum: 1,
|
481
482
|
pageSize: 10
|
482
|
-
}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$
|
483
|
+
}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
|
483
484
|
params = withPagination ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, page), {}, {
|
484
485
|
queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
|
485
486
|
}) : queryBean;
|
@@ -528,12 +529,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
528
529
|
// 初始化回显,当传入initParams时,前端用来回险
|
529
530
|
var getDefaultOneValues = /*#__PURE__*/function () {
|
530
531
|
var _ref11 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
|
531
|
-
var _useRequest$
|
532
|
+
var _useRequest$options6;
|
532
533
|
var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
|
533
534
|
return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
|
534
535
|
while (1) switch (_context5.prev = _context5.next) {
|
535
536
|
case 0:
|
536
|
-
queryBean = (0, _objectSpread3.default)({},
|
537
|
+
queryBean = (0, _objectSpread3.default)({}, defaultParams);
|
537
538
|
page = (0, _objectSpread3.default)({
|
538
539
|
pageNum: 1,
|
539
540
|
pageSize: 10
|
@@ -664,22 +665,20 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
664
665
|
if (useRequest) {
|
665
666
|
// 加定时器 修复依赖数据同步更新未取到问题
|
666
667
|
setTimeout(function () {
|
667
|
-
var _useRequest$options8, _useRequest$options9;
|
668
668
|
var params = withPagination ? {
|
669
669
|
pageNum: 1,
|
670
670
|
pageSize: 50,
|
671
|
-
queryBean: (0, _objectSpread3.default)((0, _objectSpread3.default)({},
|
672
|
-
} : (0, _objectSpread3.default)((0, _objectSpread3.default)({},
|
671
|
+
queryBean: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams)
|
672
|
+
} : (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams);
|
673
673
|
var nextParams = transformParams ? transformParams(params) : params;
|
674
674
|
run(nextParams);
|
675
675
|
}, 300);
|
676
676
|
}
|
677
677
|
}
|
678
|
-
}, [JSON.stringify(value), visible, JSON.stringify(
|
678
|
+
}, [JSON.stringify(value), visible, JSON.stringify(defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
|
679
679
|
var handleSelectFocus = function handleSelectFocus() {
|
680
680
|
if (useRequest) {
|
681
|
-
var
|
682
|
-
var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams) || {};
|
681
|
+
var queryBean = defaultParams || {};
|
683
682
|
var params = withPagination ? {
|
684
683
|
pageNum: 1,
|
685
684
|
pageSize: 50,
|
@@ -698,8 +697,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
698
697
|
};
|
699
698
|
var handleSelectSearch = (0, _lodash.debounce)(function (val) {
|
700
699
|
if (useRequest) {
|
701
|
-
var
|
702
|
-
var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options12 = useRequest.options) === null || _useRequest$options12 === void 0 ? void 0 : _useRequest$options12.defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
|
700
|
+
var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
|
703
701
|
var params = withPagination ? {
|
704
702
|
pageNum: 1,
|
705
703
|
pageSize: 50,
|
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
|
}
|