@zat-design/sisyphus-react 3.13.15-beta.1 → 3.13.15-beta.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.
Files changed (3) hide show
  1. package/es/ProForm/components/combination/Group/hooks/index.js +15 -6
  2. package/lib/ProForm/components/combination/Group/hooks/index.js +15 -6
  3. package/package.json +1 -1
package/es/ProForm/components/combination/Group/hooks/index.js CHANGED
@@ -37,9 +37,7 @@ export var useTransformColumns = function useTransformColumns(params) {
37
37
  var _ref = fieldProps || {},
38
38
  mode = _ref.mode,
39
39
  onChange = _ref.onChange,
40
- onFieldChange = _ref.onFieldChange,
41
- comDisabled = _ref.disabled,
42
- onBlur = _ref.onBlur;
40
+ comDisabled = _ref.disabled;
43
41
  var _disabled = disabled || comDisabled;
44
42
  var columnName = names ? names[index] : [].concat(name, index);
45
43
  // 响应式字段改变后的回调
@@ -78,6 +76,10 @@ export var useTransformColumns = function useTransformColumns(params) {
78
76
  desensitization: desensitization
79
77
  });
80
78
  }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
79
+ // 从处理后的fieldProps中获取事件处理器
80
+ var _ref2 = reactiveProps.fieldProps || {},
81
+ onFieldChange = _ref2.onFieldChange,
82
+ onBlur = _ref2.onBlur;
81
83
  if (reactiveProps.show === false) {
82
84
  return [];
83
85
  }
@@ -102,7 +104,9 @@ export var useTransformColumns = function useTransformColumns(params) {
102
104
  // @ts-ignore
103
105
  newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
104
106
  }
105
- internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
107
+ // 根据模式选择值管理方式
108
+ names ? form.setFieldValue(columnName, newValue) // 独立字段模式
109
+ : internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index); // 数组值模式
106
110
  var values = form.getFieldValue(namePath);
107
111
  var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? _cloneDeep(values) : undefined;
108
112
  onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
@@ -154,9 +158,14 @@ export var useTransformColumns = function useTransformColumns(params) {
154
158
  getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
155
159
  fieldProps: _objectSpread(_objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), reactiveProps === null || reactiveProps === void 0 ? void 0 : reactiveProps.fieldProps), {}, {
156
160
  onChange: handleChange,
157
- onBlur: handleBlur,
161
+ onBlur: handleBlur
162
+ }, names ? {
163
+ value: form.getFieldValue(columnName)
164
+ } // 独立字段模式
165
+ : {
158
166
  value: value === null || value === void 0 ? void 0 : value[index]
159
- })
167
+ } // 数组值模式
168
+ )
160
169
  });
161
170
  });
162
171
  };
package/lib/ProForm/components/combination/Group/hooks/index.js CHANGED
@@ -45,9 +45,7 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
45
45
  var _ref = fieldProps || {},
46
46
  mode = _ref.mode,
47
47
  onChange = _ref.onChange,
48
- onFieldChange = _ref.onFieldChange,
49
- comDisabled = _ref.disabled,
50
- onBlur = _ref.onBlur;
48
+ comDisabled = _ref.disabled;
51
49
  var _disabled = disabled || comDisabled;
52
50
  var columnName = names ? names[index] : [].concat(name, index);
53
51
  // 响应式字段改变后的回调
@@ -86,6 +84,10 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
86
84
  desensitization: desensitization
87
85
  });
88
86
  }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
87
+ // 从处理后的fieldProps中获取事件处理器
88
+ var _ref2 = reactiveProps.fieldProps || {},
89
+ onFieldChange = _ref2.onFieldChange,
90
+ onBlur = _ref2.onBlur;
89
91
  if (reactiveProps.show === false) {
90
92
  return [];
91
93
  }
@@ -110,7 +112,9 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
110
112
  // @ts-ignore
111
113
  newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
112
114
  }
113
- internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
115
+ // 根据模式选择值管理方式
116
+ names ? form.setFieldValue(columnName, newValue) // 独立字段模式
117
+ : internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index); // 数组值模式
114
118
  var values = form.getFieldValue(namePath);
115
119
  var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? (0, _cloneDeep2.default)(values) : undefined;
116
120
  onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
@@ -162,9 +166,14 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
162
166
  getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
163
167
  fieldProps: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column === null || column === void 0 ? void 0 : column.fieldProps), reactiveProps === null || reactiveProps === void 0 ? void 0 : reactiveProps.fieldProps), {}, {
164
168
  onChange: handleChange,
165
- onBlur: handleBlur,
169
+ onBlur: handleBlur
170
+ }, names ? {
171
+ value: form.getFieldValue(columnName)
172
+ } // 独立字段模式
173
+ : {
166
174
  value: value === null || value === void 0 ? void 0 : value[index]
167
- })
175
+ } // 数组值模式
176
+ )
168
177
  });
169
178
  });
170
179
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.13.15-beta.1",
3
+ "version": "3.13.15-beta.3",
4
4
  "license": "MIT",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",