@zat-design/sisyphus-react 3.14.3-beta.1 → 3.14.3
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/ProForm/index.js
CHANGED
|
@@ -228,6 +228,9 @@ var ProForm = (props, ref) => {
|
|
|
228
228
|
otherProps.layout = otherProps.layout || 'vertical';
|
|
229
229
|
}
|
|
230
230
|
}
|
|
231
|
+
|
|
232
|
+
// 过滤掉自定义 props,避免传递到 DOM 元素
|
|
233
|
+
var filteredOtherProps = omit(otherProps, ['desensitizationKey']);
|
|
231
234
|
return /*#__PURE__*/_jsxs(_Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
|
|
232
235
|
onKeyPress: event => {
|
|
233
236
|
if (!submitOnEnter) return;
|
|
@@ -237,7 +240,7 @@ var ProForm = (props, ref) => {
|
|
|
237
240
|
},
|
|
238
241
|
className: cls,
|
|
239
242
|
form: form
|
|
240
|
-
}, formProps), omit(config, ['isDiffAll'])),
|
|
243
|
+
}, formProps), omit(config, ['isDiffAll'])), filteredOtherProps), {}, {
|
|
241
244
|
labelAlign: (_ref3 = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref3 !== void 0 ? _ref3 : 'left',
|
|
242
245
|
onValuesChange: handleValuesChange,
|
|
243
246
|
onFinish: handleFinish,
|
|
@@ -27,7 +27,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
|
|
|
27
27
|
import { jsxs as _jsxs } from "react/jsx-runtime";
|
|
28
28
|
var SHOW_PARENT = _TreeSelect.SHOW_PARENT;
|
|
29
29
|
export var ProTreeSelect = (props, ref) => {
|
|
30
|
-
var _useRequest$options;
|
|
30
|
+
var _useRequest$options, _useRequest$options3;
|
|
31
31
|
// 全局属性配置在ConfigProvider
|
|
32
32
|
var _ref = useProConfig('ProTreeSelect') || {},
|
|
33
33
|
_ref$fieldNames = _ref.fieldNames,
|
|
@@ -230,7 +230,8 @@ export var ProTreeSelect = (props, ref) => {
|
|
|
230
230
|
defaultOnSuccessFun(fetchFunction.data);
|
|
231
231
|
}
|
|
232
232
|
}
|
|
233
|
-
|
|
233
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
234
|
+
}, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data, useRequest === null || useRequest === void 0 || (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.cacheKey]);
|
|
234
235
|
useDeepCompareEffect(() => {
|
|
235
236
|
if (enumCode) {
|
|
236
237
|
var dictEnum = dics[enumCode] || [];
|
|
@@ -252,7 +253,8 @@ export var ProTreeSelect = (props, ref) => {
|
|
|
252
253
|
origDataSource: _resultData
|
|
253
254
|
});
|
|
254
255
|
}
|
|
255
|
-
|
|
256
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
257
|
+
}, [enumCode, dataSource, showCodeName]);
|
|
256
258
|
useDeepCompareEffect(() => {
|
|
257
259
|
// code存在huo dataSource存在,不执行接口请求
|
|
258
260
|
if (enumCode || dataSource) {
|
package/lib/ProForm/index.js
CHANGED
|
@@ -235,6 +235,9 @@ var ProForm = (props, ref) => {
|
|
|
235
235
|
otherProps.layout = otherProps.layout || 'vertical';
|
|
236
236
|
}
|
|
237
237
|
}
|
|
238
|
+
|
|
239
|
+
// 过滤掉自定义 props,避免传递到 DOM 元素
|
|
240
|
+
var filteredOtherProps = (0, _lodash.omit)(otherProps, ['desensitizationKey']);
|
|
238
241
|
return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_form.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
|
|
239
242
|
onKeyPress: event => {
|
|
240
243
|
if (!submitOnEnter) return;
|
|
@@ -244,7 +247,7 @@ var ProForm = (props, ref) => {
|
|
|
244
247
|
},
|
|
245
248
|
className: cls,
|
|
246
249
|
form: form
|
|
247
|
-
}, formProps), (0, _lodash.omit)(config, ['isDiffAll'])),
|
|
250
|
+
}, formProps), (0, _lodash.omit)(config, ['isDiffAll'])), filteredOtherProps), {}, {
|
|
248
251
|
labelAlign: (_ref3 = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref3 !== void 0 ? _ref3 : 'left',
|
|
249
252
|
onValuesChange: handleValuesChange,
|
|
250
253
|
onFinish: handleFinish,
|
|
@@ -34,7 +34,7 @@ var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onCha
|
|
|
34
34
|
/* eslint-disable react/jsx-closing-tag-location */
|
|
35
35
|
var SHOW_PARENT = _treeSelect.default.SHOW_PARENT;
|
|
36
36
|
var ProTreeSelect = (props, ref) => {
|
|
37
|
-
var _useRequest$options;
|
|
37
|
+
var _useRequest$options, _useRequest$options3;
|
|
38
38
|
// 全局属性配置在ConfigProvider
|
|
39
39
|
var _ref = (0, _ProConfigProvider.useProConfig)('ProTreeSelect') || {},
|
|
40
40
|
_ref$fieldNames = _ref.fieldNames,
|
|
@@ -237,7 +237,8 @@ var ProTreeSelect = (props, ref) => {
|
|
|
237
237
|
defaultOnSuccessFun(fetchFunction.data);
|
|
238
238
|
}
|
|
239
239
|
}
|
|
240
|
-
|
|
240
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
241
|
+
}, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data, useRequest === null || useRequest === void 0 || (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.cacheKey]);
|
|
241
242
|
(0, _ahooks.useDeepCompareEffect)(() => {
|
|
242
243
|
if (enumCode) {
|
|
243
244
|
var dictEnum = dics[enumCode] || [];
|
|
@@ -259,7 +260,8 @@ var ProTreeSelect = (props, ref) => {
|
|
|
259
260
|
origDataSource: _resultData
|
|
260
261
|
});
|
|
261
262
|
}
|
|
262
|
-
|
|
263
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
264
|
+
}, [enumCode, dataSource, showCodeName]);
|
|
263
265
|
(0, _ahooks.useDeepCompareEffect)(() => {
|
|
264
266
|
// code存在huo dataSource存在,不执行接口请求
|
|
265
267
|
if (enumCode || dataSource) {
|