@zat-design/sisyphus-react 3.4.10-beta.17 → 3.4.10-beta.19

package/es/ProEditTable/components/RenderField/index.js

@@ -489,6 +489,7 @@ var RenderField = function RenderField(_ref) {
     otherProps: {
       form: form,
       names: names,
+      namePath: [].concat(_toConsumableArray(namePath), [index]),
       name: cellName,
       listName: cellName,
       viewEmpty: viewEmpty,

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -1,10 +1,8 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after"];
 import { jsx as _jsx } from "react/jsx-runtime";
-/* eslint-disable prefer-destructuring */
 import React from 'react';
 import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
 import { FieldProvider } from '../../../../utils/useFieldProps';
@@ -42,66 +40,7 @@ var ComRender = function ComRender(props) {
     rest = _objectWithoutProperties(props, _excluded);
   var TypeComponent = componentMap[type];
   var componentProps = _objectSpread(_objectSpread({}, fieldProps), rest);
-  /**
-   * 函数新参数组装
-   */
-  var functionArgs = function functionArgs(args, form, name, valueType) {
-    var _args = _toConsumableArray(args);
-    _args[1] = form.getFieldsValue();
-    _args[2] = {
-      form: form
-    };
-    // 优先处理FormList场景
-    if (Array.isArray(name) && (name === null || name === void 0 ? void 0 : name.some(function (item) {
-      return typeof item === 'number';
-    }))) {
-      var namePath = (name === null || name === void 0 ? void 0 : name.slice(0, -1)) || [];
-      _args[1] = form.getFieldValue(name === null || name === void 0 ? void 0 : name.slice(0, -1));
-      _args[2].namePath = namePath;
-      _args[2].index = namePath[namePath.length - 1];
-    }
-    // 返回表单元素默认值
-    _args[2].extra = args;
-    // 当设置valueType后返回转换后的值
-    if (valueType) {
-      _args[2].transformValue = form.getFieldValue(name) || undefined;
-    }
-    _args[2].option = args[1];
-    switch (type) {
-      case 'ProCascader':
-        _args[2].selectedOptions = args[1];
-        break;
-      case 'DatePicker':
-      case 'RangePicker':
-        _args[2].dateString = args[1];
-        break;
-      default:
-        break;
-    }
-    return _args;
-  };
-  /**
-   * onChange参数重置 (value, record, { form, index, namePath, option }) => void
-   */
-  var handleChange = function handleChange() {
-    var _componentProps$chang;
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    var _args = [].concat(args);
-    // 优先使用onFieldChange
-    var changeKey = Object.keys(componentProps).includes('onFieldChange') ? 'onFieldChange' : 'onChange';
-    if (changeKey === 'onChange') {
-      _args[2] = contextProps.form;
-    }
-    if (changeKey === 'onFieldChange') {
-      _args = functionArgs([].concat(args), contextProps.form, props === null || props === void 0 ? void 0 : props.name, props === null || props === void 0 ? void 0 : props.valueType);
-    }
-    (_componentProps$chang = componentProps[changeKey]) === null || _componentProps$chang === void 0 ? void 0 : _componentProps$chang.call.apply(_componentProps$chang, [componentProps].concat(_toConsumableArray(_args)));
-  };
-  var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
-    onChange: handleChange
-  }));
+  var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
   return _jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {

package/es/ProForm/components/combination/Group/utils.js

@@ -5,9 +5,10 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useRef } from 'react';
-import { isFunction } from 'lodash';
+import { cloneDeep, isEqual, isFunction } from 'lodash';
 import valueTypeMap from '../../../utils/valueType';
 import { useDeepCompareMemo } from '../../../utils/useDeepCompareMemo';
+import { difference } from '../../../../ProEditTable/utils/tools';
 /**
  * 插入间隔符
  * @param columns 表单配置数组
@@ -234,13 +235,29 @@ export var useTransformColumns = function useTransformColumns(params) {
         newValue = ((_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue)) || (normalize === null || normalize === void 0 ? void 0 : normalize(newValue));
       }
       internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
+      var values = form.getFieldValue(namePath);
+      var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? cloneDeep(values) : undefined;
       onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
-      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, form.getFieldValue(namePath), {
+      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, values, {
         index: outerIndex,
         namePath: namePath,
         form: form,
         option: args === null || args === void 0 ? void 0 : args[1]
       });
+      // 如果是在可编辑表格或formList内部, 储存当前行的值, 并在变更后更新到表单里
+      if ((namePath === null || namePath === void 0 ? void 0 : namePath.length) && !isEqual(originRow, values)) {
+        var _Object$keys, _Object$keys$map;
+        form.setFieldValue(namePath, values);
+        var diff = difference(originRow, values) || {};
+        var validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
+          return [].concat(_toConsumableArray(namePath), [key]);
+        });
+        if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
+          setTimeout(function () {
+            form.validateFields([name].concat(_toConsumableArray(validateFieldKeys)));
+          }, 100);
+        }
+      }
     };
     return _objectSpread(_objectSpread(_objectSpread({}, column), {}, {
       name: columnName

package/es/ProForm/utils/useForm.js

@@ -13,15 +13,11 @@ export var useForm = function useForm(originForm) {
     setFieldsValue = form.setFieldsValue;
   // @ts-ignore
   var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
-    // 默认行为查询并过滤
-    if (nameList === undefined || Array.isArray(nameList)) {
+    // 全部查询
+    if (nameList !== true) {
       var values = getFieldsValue(nameList || true, filterFunc);
       return filterInternalFields(values);
     }
-    // @ts-ignore 特殊处理 传入false不过滤
-    if (nameList === false) {
-      return getFieldsValue();
-    }
     return getFieldsValue(nameList, filterFunc);
   };
   // const _setFieldsValue: FormInstance<T>['setFieldsValue'] = (data) => {

package/es/ProForm/utils/useShouldUpdate.js

@@ -122,7 +122,13 @@ var useShouldUpdate = function useShouldUpdate(props) {
   return {
     shouldUpdate: function shouldUpdate(prevValues, currentValues) {
       // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
-      var _currentValues = form.getFieldsValue(namePath ? [namePath] : false) || {};
+      var _currentValues;
+      if (namePath) {
+        // formList场景values取当前行数据
+        _currentValues = form.getFieldValue(namePath) || {};
+      } else {
+        _currentValues = form.getFieldsValue(true);
+      }
       var _show = isFunction(show) ? Boolean(show(_currentValues, {
         form: form,
         index: index,

package/lib/ProEditTable/components/RenderField/index.js

@@ -492,6 +492,7 @@ var RenderField = function RenderField(_ref) {
     otherProps: {
       form: form,
       names: names,
+      namePath: [].concat((0, _toConsumableArray2.default)(namePath), [index]),
       name: cellName,
       listName: cellName,
       viewEmpty: viewEmpty,

package/lib/ProForm/components/combination/Group/component/ComRender.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -17,7 +16,6 @@ var _useFieldProps = require("../../../../utils/useFieldProps");
 var componentMap = _interopRequireWildcard(require("../../../../../index"));
 var _AddonWrapper = _interopRequireDefault(require("./AddonWrapper"));
 var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after"];
-/* eslint-disable prefer-destructuring */
 // 这里的key与组件内参数一致, 决定使用哪个包裹组件
 var wrapperMap = {
   confirm: _ConfirmWrapper.default,
@@ -50,66 +48,7 @@ var ComRender = function ComRender(props) {
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var TypeComponent = componentMap[type];
   var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest);
-  /**
-   * 函数新参数组装
-   */
-  var functionArgs = function functionArgs(args, form, name, valueType) {
-    var _args = (0, _toConsumableArray2.default)(args);
-    _args[1] = form.getFieldsValue();
-    _args[2] = {
-      form: form
-    };
-    // 优先处理FormList场景
-    if (Array.isArray(name) && (name === null || name === void 0 ? void 0 : name.some(function (item) {
-      return typeof item === 'number';
-    }))) {
-      var namePath = (name === null || name === void 0 ? void 0 : name.slice(0, -1)) || [];
-      _args[1] = form.getFieldValue(name === null || name === void 0 ? void 0 : name.slice(0, -1));
-      _args[2].namePath = namePath;
-      _args[2].index = namePath[namePath.length - 1];
-    }
-    // 返回表单元素默认值
-    _args[2].extra = args;
-    // 当设置valueType后返回转换后的值
-    if (valueType) {
-      _args[2].transformValue = form.getFieldValue(name) || undefined;
-    }
-    _args[2].option = args[1];
-    switch (type) {
-      case 'ProCascader':
-        _args[2].selectedOptions = args[1];
-        break;
-      case 'DatePicker':
-      case 'RangePicker':
-        _args[2].dateString = args[1];
-        break;
-      default:
-        break;
-    }
-    return _args;
-  };
-  /**
-   * onChange参数重置 (value, record, { form, index, namePath, option }) => void
-   */
-  var handleChange = function handleChange() {
-    var _componentProps$chang;
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    var _args = [].concat(args);
-    // 优先使用onFieldChange
-    var changeKey = Object.keys(componentProps).includes('onFieldChange') ? 'onFieldChange' : 'onChange';
-    if (changeKey === 'onChange') {
-      _args[2] = contextProps.form;
-    }
-    if (changeKey === 'onFieldChange') {
-      _args = functionArgs([].concat(args), contextProps.form, props === null || props === void 0 ? void 0 : props.name, props === null || props === void 0 ? void 0 : props.valueType);
-    }
-    (_componentProps$chang = componentProps[changeKey]) === null || _componentProps$chang === void 0 ? void 0 : _componentProps$chang.call.apply(_componentProps$chang, [componentProps].concat((0, _toConsumableArray2.default)(_args)));
-  };
-  var Component = component ? ( /*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, componentProps), {}, {
-    onChange: handleChange
-  }));
+  var Component = component ? ( /*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {

package/lib/ProForm/components/combination/Group/utils.js

@@ -15,6 +15,7 @@ var _lodash = require("lodash");
 var _antd = require("antd");
 var _valueType = _interopRequireDefault(require("../../../utils/valueType"));
 var _useDeepCompareMemo = require("../../../utils/useDeepCompareMemo");
+var _tools = require("../../../../ProEditTable/utils/tools");
 /**
  * 插入间隔符
  * @param columns 表单配置数组
@@ -241,13 +242,29 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
         newValue = ((_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue)) || (normalize === null || normalize === void 0 ? void 0 : normalize(newValue));
       }
       internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
+      var values = form.getFieldValue(namePath);
+      var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? (0, _lodash.cloneDeep)(values) : undefined;
       onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
-      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, form.getFieldValue(namePath), {
+      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, values, {
         index: outerIndex,
         namePath: namePath,
         form: form,
         option: args === null || args === void 0 ? void 0 : args[1]
       });
+      // 如果是在可编辑表格或formList内部, 储存当前行的值, 并在变更后更新到表单里
+      if ((namePath === null || namePath === void 0 ? void 0 : namePath.length) && !(0, _lodash.isEqual)(originRow, values)) {
+        var _Object$keys, _Object$keys$map;
+        form.setFieldValue(namePath, values);
+        var diff = (0, _tools.difference)(originRow, values) || {};
+        var validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
+          return [].concat((0, _toConsumableArray2.default)(namePath), [key]);
+        });
+        if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
+          setTimeout(function () {
+            form.validateFields([name].concat((0, _toConsumableArray2.default)(validateFieldKeys)));
+          }, 100);
+        }
+      }
     };
     return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
       name: columnName

package/lib/ProForm/utils/useForm.js

@@ -19,15 +19,11 @@ var useForm = exports.useForm = function useForm(originForm) {
     setFieldsValue = form.setFieldsValue;
   // @ts-ignore
   var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
-    // 默认行为查询并过滤
-    if (nameList === undefined || Array.isArray(nameList)) {
+    // 全部查询
+    if (nameList !== true) {
       var values = getFieldsValue(nameList || true, filterFunc);
       return (0, _index.filterInternalFields)(values);
     }
-    // @ts-ignore 特殊处理 传入false不过滤
-    if (nameList === false) {
-      return getFieldsValue();
-    }
     return getFieldsValue(nameList, filterFunc);
   };
   // const _setFieldsValue: FormInstance<T>['setFieldsValue'] = (data) => {

package/lib/ProForm/utils/useShouldUpdate.js

@@ -129,7 +129,13 @@ var useShouldUpdate = function useShouldUpdate(props) {
   return {
     shouldUpdate: function shouldUpdate(prevValues, currentValues) {
       // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
-      var _currentValues = form.getFieldsValue(namePath ? [namePath] : false) || {};
+      var _currentValues;
+      if (namePath) {
+        // formList场景values取当前行数据
+        _currentValues = form.getFieldValue(namePath) || {};
+      } else {
+        _currentValues = form.getFieldsValue(true);
+      }
       var _show = (0, _lodash.isFunction)(show) ? Boolean(show(_currentValues, {
         form: form,
         index: index,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.10-beta.17",
+  "version": "3.4.10-beta.19",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",