@zat-design/sisyphus-react 3.4.10-beta.12 → 3.4.10-beta.14

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 (7) hide show
  1. package/es/ProForm/index.js +3 -2
  2. package/es/ProForm/utils/useForm.js +7 -3
  3. package/es/ProForm/utils/useShouldUpdate.js +2 -2
  4. package/lib/ProForm/index.js +3 -2
  5. package/lib/ProForm/utils/useForm.js +7 -3
  6. package/lib/ProForm/utils/useShouldUpdate.js +2 -2
  7. package/package.json +1 -1
package/es/ProForm/index.js CHANGED
@@ -159,10 +159,11 @@ var ProForm = function ProForm(props, ref) {
159
159
  });
160
160
  // 解决平铺后的值拿不到的问题
161
161
  var handleValuesChange = function handleValuesChange(changedValue) {
162
+ if (!onValuesChange) return;
162
163
  // 暂时通过'-'区分组合组件字段和普通字段
163
164
  var keys = Object.keys(changedValue);
164
165
  if (!keys.length) {
165
- onValuesChange === null || onValuesChange === void 0 ? void 0 : onValuesChange(changedValue, form.getFieldsValue());
166
+ onValuesChange(changedValue, form.getFieldsValue());
166
167
  } else {
167
168
  var values = keys.map(function (key) {
168
169
  if (key.includes('-')) {
@@ -174,7 +175,7 @@ var ProForm = function ProForm(props, ref) {
174
175
  }
175
176
  return {};
176
177
  });
177
- onValuesChange === null || onValuesChange === void 0 ? void 0 : onValuesChange(merge.apply(void 0, [changedValue].concat(_toConsumableArray(values))), form.getFieldsValue());
178
+ onValuesChange(merge.apply(void 0, [changedValue].concat(_toConsumableArray(values))), form.getFieldsValue());
178
179
  }
179
180
  };
180
181
  // 包装一层兼容 names 改变
package/es/ProForm/utils/useForm.js CHANGED
@@ -13,11 +13,15 @@ export var useForm = function useForm(originForm) {
13
13
  setFieldsValue = form.setFieldsValue;
14
14
  // @ts-ignore
15
15
  var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
16
- // 全部查询
17
- if (nameList !== true) {
18
- var values = getFieldsValue(true, filterFunc);
16
+ // 默认行为查询并过滤
17
+ if (nameList === undefined || Array.isArray(nameList)) {
18
+ var values = getFieldsValue(nameList || true, filterFunc);
19
19
  return filterInternalFields(values);
20
20
  }
21
+ // @ts-ignore 特殊处理 传入false不过滤
22
+ if (nameList === false) {
23
+ return getFieldsValue();
24
+ }
21
25
  return getFieldsValue(nameList, filterFunc);
22
26
  };
23
27
  // const _setFieldsValue: FormInstance<T>['setFieldsValue'] = (data) => {
package/es/ProForm/utils/useShouldUpdate.js CHANGED
@@ -121,8 +121,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
121
121
  }
122
122
  return {
123
123
  shouldUpdate: function shouldUpdate(prevValues, currentValues) {
124
- // formList场景取当前行数据，不取shouldUpdate变更后值
125
- var _currentValues = form.getFieldsValue(namePath ? [namePath] : undefined) || {};
124
+ // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
125
+ var _currentValues = form.getFieldsValue(namePath ? [namePath] : false) || {};
126
126
  var _show = isFunction(show) ? Boolean(show(_currentValues, {
127
127
  form: form,
128
128
  index: index,
package/lib/ProForm/index.js CHANGED
@@ -160,10 +160,11 @@ var ProForm = function ProForm(props, ref) {
160
160
  });
161
161
  // 解决平铺后的值拿不到的问题
162
162
  var handleValuesChange = function handleValuesChange(changedValue) {
163
+ if (!onValuesChange) return;
163
164
  // 暂时通过'-'区分组合组件字段和普通字段
164
165
  var keys = Object.keys(changedValue);
165
166
  if (!keys.length) {
166
- onValuesChange === null || onValuesChange === void 0 ? void 0 : onValuesChange(changedValue, form.getFieldsValue());
167
+ onValuesChange(changedValue, form.getFieldsValue());
167
168
  } else {
168
169
  var values = keys.map(function (key) {
169
170
  if (key.includes('-')) {
@@ -175,7 +176,7 @@ var ProForm = function ProForm(props, ref) {
175
176
  }
176
177
  return {};
177
178
  });
178
- onValuesChange === null || onValuesChange === void 0 ? void 0 : onValuesChange(_lodash.merge.apply(void 0, [changedValue].concat((0, _toConsumableArray2.default)(values))), form.getFieldsValue());
179
+ onValuesChange(_lodash.merge.apply(void 0, [changedValue].concat((0, _toConsumableArray2.default)(values))), form.getFieldsValue());
179
180
  }
180
181
  };
181
182
  // 包装一层兼容 names 改变
package/lib/ProForm/utils/useForm.js CHANGED
@@ -19,11 +19,15 @@ var useForm = exports.useForm = function useForm(originForm) {
19
19
  setFieldsValue = form.setFieldsValue;
20
20
  // @ts-ignore
21
21
  var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
22
- // 全部查询
23
- if (nameList !== true) {
24
- var values = getFieldsValue(true, filterFunc);
22
+ // 默认行为查询并过滤
23
+ if (nameList === undefined || Array.isArray(nameList)) {
24
+ var values = getFieldsValue(nameList || true, filterFunc);
25
25
  return (0, _index.filterInternalFields)(values);
26
26
  }
27
+ // @ts-ignore 特殊处理 传入false不过滤
28
+ if (nameList === false) {
29
+ return getFieldsValue();
30
+ }
27
31
  return getFieldsValue(nameList, filterFunc);
28
32
  };
29
33
  // const _setFieldsValue: FormInstance<T>['setFieldsValue'] = (data) => {
package/lib/ProForm/utils/useShouldUpdate.js CHANGED
@@ -128,8 +128,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
128
128
  }
129
129
  return {
130
130
  shouldUpdate: function shouldUpdate(prevValues, currentValues) {
131
- // formList场景取当前行数据，不取shouldUpdate变更后值
132
- var _currentValues = form.getFieldsValue(namePath ? [namePath] : undefined) || {};
131
+ // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
132
+ var _currentValues = form.getFieldsValue(namePath ? [namePath] : false) || {};
133
133
  var _show = (0, _lodash.isFunction)(show) ? Boolean(show(_currentValues, {
134
134
  form: form,
135
135
  index: index,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.4.10-beta.12",
3
+ "version": "3.4.10-beta.14",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",