@zat-design/sisyphus-react 3.7.2-beta.6 → 3.7.2-beta.8
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/components/combination/Group/component/ComRender.js +3 -1
- package/es/ProForm/components/combination/Group/utils.js +16 -1
- package/lib/ProForm/components/combination/Group/component/ComRender.js +3 -1
- package/lib/ProForm/components/combination/Group/utils.js +16 -1
- package/package.json +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
2
2
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
3
3
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
4
|
-
var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName"];
|
|
4
|
+
var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType"];
|
|
5
5
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
6
6
|
import React from 'react';
|
|
7
7
|
import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
|
|
@@ -40,6 +40,7 @@ var ComRender = function ComRender(props) {
|
|
|
40
40
|
getValueProps = props.getValueProps,
|
|
41
41
|
_props$valuePropName = props.valuePropName,
|
|
42
42
|
valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
|
|
43
|
+
valueType = props.valueType,
|
|
43
44
|
rest = _objectWithoutProperties(props, _excluded);
|
|
44
45
|
var TypeComponent = componentMap[type];
|
|
45
46
|
var mergedGetValueProps = getValueProps || function (val) {
|
|
@@ -51,6 +52,7 @@ var ComRender = function ComRender(props) {
|
|
|
51
52
|
var Com = getComRender(Component, props, componentProps);
|
|
52
53
|
return _jsx(FieldProvider, {
|
|
53
54
|
value: _objectSpread(_objectSpread({}, contextProps), {}, {
|
|
55
|
+
valueType: valueType,
|
|
54
56
|
type: type
|
|
55
57
|
}),
|
|
56
58
|
children: Com
|
|
@@ -182,7 +182,8 @@ export var useTransformColumns = function useTransformColumns(params) {
|
|
|
182
182
|
mode = _ref.mode,
|
|
183
183
|
onChange = _ref.onChange,
|
|
184
184
|
onFieldChange = _ref.onFieldChange,
|
|
185
|
-
comDisabled = _ref.disabled
|
|
185
|
+
comDisabled = _ref.disabled,
|
|
186
|
+
onBlur = _ref.onBlur;
|
|
186
187
|
var _disabled = disabled || comDisabled;
|
|
187
188
|
var columnName = names ? names[index] : [].concat(name, index);
|
|
188
189
|
// 响应式字段改变后的回调
|
|
@@ -267,6 +268,19 @@ export var useTransformColumns = function useTransformColumns(params) {
|
|
|
267
268
|
}
|
|
268
269
|
}
|
|
269
270
|
};
|
|
271
|
+
var handleBlur = function handleBlur() {
|
|
272
|
+
if (!onBlur) return;
|
|
273
|
+
var values = form.getFieldValue(namePath);
|
|
274
|
+
for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
|
|
275
|
+
args[_key2] = arguments[_key2];
|
|
276
|
+
}
|
|
277
|
+
onBlur === null || onBlur === void 0 ? void 0 : onBlur(args[0], values, {
|
|
278
|
+
index: outerIndex,
|
|
279
|
+
namePath: namePath,
|
|
280
|
+
form: form,
|
|
281
|
+
option: args === null || args === void 0 ? void 0 : args[1]
|
|
282
|
+
});
|
|
283
|
+
};
|
|
270
284
|
return _objectSpread(_objectSpread(_objectSpread({}, column), {}, {
|
|
271
285
|
name: columnName
|
|
272
286
|
}, reactiveProps), {}, {
|
|
@@ -274,6 +288,7 @@ export var useTransformColumns = function useTransformColumns(params) {
|
|
|
274
288
|
getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
|
|
275
289
|
fieldProps: _objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
|
|
276
290
|
onChange: handleChange,
|
|
291
|
+
onBlur: handleBlur,
|
|
277
292
|
value: value === null || value === void 0 ? void 0 : value[index]
|
|
278
293
|
})
|
|
279
294
|
});
|
|
@@ -15,7 +15,7 @@ var _ConfirmWrapper = _interopRequireDefault(require("../../../../components/ren
|
|
|
15
15
|
var _useFieldProps = require("../../../../utils/useFieldProps");
|
|
16
16
|
var componentMap = _interopRequireWildcard(require("../../../../../index"));
|
|
17
17
|
var _AddonWrapper = _interopRequireDefault(require("./AddonWrapper"));
|
|
18
|
-
var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName"];
|
|
18
|
+
var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType"];
|
|
19
19
|
// 这里的key与组件内参数一致, 决定使用哪个包裹组件
|
|
20
20
|
var wrapperMap = {
|
|
21
21
|
confirm: _ConfirmWrapper.default,
|
|
@@ -48,6 +48,7 @@ var ComRender = function ComRender(props) {
|
|
|
48
48
|
getValueProps = props.getValueProps,
|
|
49
49
|
_props$valuePropName = props.valuePropName,
|
|
50
50
|
valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
|
|
51
|
+
valueType = props.valueType,
|
|
51
52
|
rest = (0, _objectWithoutProperties2.default)(props, _excluded);
|
|
52
53
|
var TypeComponent = componentMap[type];
|
|
53
54
|
var mergedGetValueProps = getValueProps || function (val) {
|
|
@@ -59,6 +60,7 @@ var ComRender = function ComRender(props) {
|
|
|
59
60
|
var Com = getComRender(Component, props, componentProps);
|
|
60
61
|
return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
|
|
61
62
|
value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {
|
|
63
|
+
valueType: valueType,
|
|
62
64
|
type: type
|
|
63
65
|
}),
|
|
64
66
|
children: Com
|
|
@@ -189,7 +189,8 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
|
|
|
189
189
|
mode = _ref.mode,
|
|
190
190
|
onChange = _ref.onChange,
|
|
191
191
|
onFieldChange = _ref.onFieldChange,
|
|
192
|
-
comDisabled = _ref.disabled
|
|
192
|
+
comDisabled = _ref.disabled,
|
|
193
|
+
onBlur = _ref.onBlur;
|
|
193
194
|
var _disabled = disabled || comDisabled;
|
|
194
195
|
var columnName = names ? names[index] : [].concat(name, index);
|
|
195
196
|
// 响应式字段改变后的回调
|
|
@@ -274,6 +275,19 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
|
|
|
274
275
|
}
|
|
275
276
|
}
|
|
276
277
|
};
|
|
278
|
+
var handleBlur = function handleBlur() {
|
|
279
|
+
if (!onBlur) return;
|
|
280
|
+
var values = form.getFieldValue(namePath);
|
|
281
|
+
for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
|
|
282
|
+
args[_key2] = arguments[_key2];
|
|
283
|
+
}
|
|
284
|
+
onBlur === null || onBlur === void 0 ? void 0 : onBlur(args[0], values, {
|
|
285
|
+
index: outerIndex,
|
|
286
|
+
namePath: namePath,
|
|
287
|
+
form: form,
|
|
288
|
+
option: args === null || args === void 0 ? void 0 : args[1]
|
|
289
|
+
});
|
|
290
|
+
};
|
|
277
291
|
return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
|
|
278
292
|
name: columnName
|
|
279
293
|
}, reactiveProps), {}, {
|
|
@@ -281,6 +295,7 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
|
|
|
281
295
|
getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
|
|
282
296
|
fieldProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
|
|
283
297
|
onChange: handleChange,
|
|
298
|
+
onBlur: handleBlur,
|
|
284
299
|
value: value === null || value === void 0 ? void 0 : value[index]
|
|
285
300
|
})
|
|
286
301
|
});
|