@zat-design/sisyphus-react 3.4.6 → 3.4.8

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

@@ -1,31 +1,31 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { isFunction } from 'lodash';
+import valueTypeMap from '../../../utils/valueType';
+import { useDeepCompareMemo } from '../../../utils/useDeepCompareMemo';
 /**
-* 插入间隔符
-* @param columns 表单配置数组
-* @returns
-*/
-export var insertSeparator = function insertSeparator(columns, space, separatorNode, otherProps) {
-  var _columns = columns;
-  var _ref = otherProps || {},
-    names = _ref.names;
-  // 紧凑模式存在names时，自动给下级拆解name
-  if (names) {
-    _columns = _columns.map(function (column, index) {
-      return _objectSpread(_objectSpread({}, column), {}, {
-        name: names[index]
-      });
-    });
-  }
+ * 插入间隔符
+ * @param columns 表单配置数组
+ * @returns
+ */
+export var insertSeparator = function insertSeparator(columns, space) {
   if (!(space === null || space === void 0 ? void 0 : space.separator)) {
-    return _columns;
+    return columns;
   }
-  return _columns.reduce(function (result, current, index, array) {
+  return columns.reduce(function (result, current, index, array) {
     // 将当前元素添加到结果数组中
     result.push(current);
     // 如果当前元素不是最后一个元素，则添加间隔符
     if (index < array.length - 1) {
       result.push({
-        component: separatorNode,
+        component: _jsx(_Button, {
+          className: "group-separator",
+          children: space.separator
+        }),
         fieldProps: {
           disabled: true
         }
@@ -34,6 +34,14 @@ export var insertSeparator = function insertSeparator(columns, space, separatorN
     return result;
   }, []);
 };
+/** 带出event的组件默认取值方法 */
+export function defaultGetValueFromEvent(valuePropName) {
+  var event = arguments.length <= 1 ? undefined : arguments[1];
+  if (event && event.target && _typeof(event.target) === 'object' && valuePropName in event.target) {
+    return event.target[valuePropName];
+  }
+  return event;
+}
 /** 转换names */
 export var transformNamesString = function transformNamesString(arr) {
   var result = arr.map(function (subArr) {
@@ -43,4 +51,186 @@ export var transformNamesString = function transformNamesString(arr) {
     return subArr;
   });
   return result;
+};
+/**
+ * Input TextArea 小写自动转大写
+ * @param type 组件类型
+ * @param upperCase 是否小写转大写
+ * @returns {}
+ */
+export var isUpperCase = function isUpperCase(type, upperCase) {
+  var result = {};
+  if (['Input', 'TextArea', 'ProCombination'].includes(type) && upperCase) {
+    result.getValueFromEvent = function (event) {
+      var _event$target, _event$target$value;
+      if (Array.isArray(event)) {
+        return event.map(function (value) {
+          var newValue = value === null || value === void 0 ? void 0 : value.replace(/[^a-zA-Z]/g, '');
+          return (newValue === null || newValue === void 0 ? void 0 : newValue.toUpperCase()) || '';
+        });
+      }
+      var newValue = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : (_event$target$value = _event$target.value) === null || _event$target$value === void 0 ? void 0 : _event$target$value.replace(/[^a-zA-Z]/g, '');
+      return newValue.toUpperCase() || '';
+    };
+  }
+  return result;
+};
+/** 计算响应式参数的值 */
+export var getReactiveProps = function getReactiveProps(params) {
+  var form = params.form,
+    index = params.index,
+    namePath = params.namePath,
+    disabled = params.disabled,
+    show = params.show,
+    component = params.component,
+    fieldProps = params.fieldProps,
+    name = params.name;
+  var values = form.getFieldsValue(namePath || undefined);
+  var _disabled = isFunction(disabled) ? disabled(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : disabled;
+  var _show = isFunction(show) ? show(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : show;
+  var _component = isFunction(component) ? component(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : component;
+  var _fieldProps = isFunction(fieldProps) ? fieldProps(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : fieldProps;
+  return {
+    disabled: _disabled,
+    show: _show,
+    component: _component,
+    fieldProps: _fieldProps
+  };
+};
+/** 获取当前字段的转换函数 */
+export var getValueTypeTrans = function getValueTypeTrans(params) {
+  var _valueTypeMap$valueTy;
+  var valueType = params.valueType;
+  var transform = (_valueTypeMap$valueTy = valueTypeMap[valueType]) === null || _valueTypeMap$valueTy === void 0 ? void 0 : _valueTypeMap$valueTy.call(valueTypeMap, params);
+  return transform;
+};
+var getTrim = function getTrim(value) {
+  return (value === null || value === void 0 ? void 0 : value.trim()) || '';
+};
+var getUpperCase = function getUpperCase(value) {
+  var _value = value === null || value === void 0 ? void 0 : value.replace(/[^a-zA-Z]/g, '');
+  return _value.toUpperCase() || '';
+};
+/** 执行所有中间件 返回处理后的值 */
+export var getValueMiddleware = function getValueMiddleware(value) {
+  var callbacks = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  return callbacks.reduce(function (preValue, cb) {
+    return cb === null || cb === void 0 ? void 0 : cb(preValue);
+  }, value);
+};
+/** 获取中间件处理后的value */
+var valueFromEventWrapper = function valueFromEventWrapper(column, args) {
+  var getValueFromEvent = column.getValueFromEvent,
+    _column$valuePropName = column.valuePropName,
+    valuePropName = _column$valuePropName === void 0 ? 'value' : _column$valuePropName,
+    trim = column.trim,
+    upperCase = column.upperCase;
+  var newValue;
+  if (getValueFromEvent) {
+    newValue = getValueFromEvent.apply(void 0, _toConsumableArray(args));
+  } else {
+    newValue = defaultGetValueFromEvent.apply(void 0, [valuePropName].concat(_toConsumableArray(args)));
+  }
+  var list = [];
+  if (trim) list.push(getTrim);
+  if (upperCase) list.push(getUpperCase);
+  return getValueMiddleware(newValue, list);
+};
+/** 转换columns */
+export var transformColumns = function transformColumns(params) {
+  var form = params.form,
+    columns = params.columns,
+    name = params.name,
+    names = params.names,
+    outerIndex = params.index,
+    namePath = params.namePath,
+    value = params.value,
+    internalChange = params.onChange,
+    groupProps = params.groupProps;
+  return columns === null || columns === void 0 ? void 0 : columns.flatMap(function (column, index) {
+    var type = column.type,
+      valueType = column.valueType,
+      switchValue = column.switchValue,
+      toISOString = column.toISOString,
+      fieldProps = column.fieldProps,
+      normalize = column.normalize,
+      disabled = column.disabled,
+      show = column.show,
+      component = column.component;
+    var _ref = fieldProps || {},
+      mode = _ref.mode,
+      onChange = _ref.onChange,
+      onFieldChange = _ref.onFieldChange,
+      comDisabled = _ref.disabled;
+    var _disabled = disabled || comDisabled;
+    var columnName = names ? names[index] : [].concat(name, index);
+    // 响应式字段
+    var reactiveProps = useDeepCompareMemo(function () {
+      return getReactiveProps({
+        form: form,
+        index: index,
+        type: type,
+        namePath: namePath,
+        disabled: _disabled,
+        show: show,
+        component: component,
+        fieldProps: fieldProps,
+        name: columnName
+      });
+    }, [value, show, fieldProps, columnName, type]);
+    if (reactiveProps.show === false) {
+      return [];
+    }
+    var transform = getValueTypeTrans({
+      type: type,
+      valueType: valueType,
+      switchValue: switchValue,
+      toISOString: toISOString,
+      mode: mode
+    });
+    var newValue;
+    var handleChange = function handleChange() {
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      newValue = valueFromEventWrapper(column, args);
+      if ((transform === null || transform === void 0 ? void 0 : transform.normalize) || normalize) {
+        var _transform$normalize;
+        // @ts-ignore
+        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);
+      onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
+      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, form.getFieldValue(namePath), {
+        index: outerIndex,
+        namePath: namePath,
+        form: form
+      });
+    };
+    return _objectSpread(_objectSpread(_objectSpread({}, column), {}, {
+      name: columnName
+    }, reactiveProps), {}, {
+      disabled: reactiveProps.disabled || groupProps.disabled,
+      fieldProps: _objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
+        onChange: handleChange,
+        value: value === null || value === void 0 ? void 0 : value[index]
+      })
+    });
+  });
 };

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -295,58 +295,64 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleFinish = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _data, flag, res;
+      var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            if (selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) {
+            if (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) {
               _context2.next = 4;
               break;
             }
             _message.error(locale.ProModalSelect.checkMsg);
             return _context2.abrupt("return", false);
           case 4:
-            _data = isMultiple ? selectedRows : selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows[0];
+            nextSelectedRows = selectedRows;
+            if (!((_nextSelectedRows = nextSelectedRows) === null || _nextSelectedRows === void 0 ? void 0 : _nextSelectedRows[0])) {
+              nextSelectedRows = data.filter(function (item) {
+                return selectedRowKeys.includes(item[valueKey]);
+              });
+            }
+            record = isMultiple ? nextSelectedRows : (_nextSelectedRows2 = nextSelectedRows) === null || _nextSelectedRows2 === void 0 ? void 0 : _nextSelectedRows2[0];
             if (!isMultiple) {
               // @ts-ignore
-              _data.value = _data[valueKey];
+              record.value = record[valueKey];
               // @ts-ignore
-              _data.label = _data[labelKey];
+              record.label = record[labelKey];
             }
             flag = true;
             if (!onOk) {
-              _context2.next = 12;
+              _context2.next = 14;
               break;
             }
-            _context2.next = 10;
-            return onOk(_data);
-          case 10:
+            _context2.next = 12;
+            return onOk(record);
+          case 12:
             res = _context2.sent;
             if (res !== null && res !== undefined) {
               // @ts-ignore
               flag = res;
             }
-          case 12:
+          case 14:
             if (flag) {
-              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? _data : getNextValues(_data), _data);
+              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
               // 更新内部展示值
               setState({
-                _value: _data,
-                options: isArray(_data) ? _data : [_data]
+                _value: record,
+                options: isArray(record) ? record : [record]
               });
               handleClose();
             }
             return _context2.abrupt("return", flag);
-          case 16:
-            _context2.prev = 16;
+          case 18:
+            _context2.prev = 18;
             _context2.t0 = _context2["catch"](0);
             console.warn('error', _context2.t0);
-          case 19:
+          case 21:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 16]]);
+      }, _callee2, null, [[0, 18]]);
     }));
     return function handleFinish() {
       return _ref7.apply(this, arguments);
@@ -427,7 +433,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data2, nextSelectRowKeys;
+      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -458,15 +464,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               } else {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               }
-              _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
-              if (_data2) {
+              _data = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
+              if (_data) {
                 nextSelectRowKeys = isMultiple ? value : [value];
                 if (labelInValue) {
-                  onChange(_data2);
+                  onChange(_data);
                 }
                 // 更新内部展示值
                 setState({
-                  _value: _data2,
+                  _value: _data,
                   isInit: false,
                   selectedRows: list,
                   selectedRowKeys: nextSelectRowKeys
@@ -493,7 +499,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
-      var queryBean, page, params, res, _list2, list, _res$data3, _data3, nextSelectRowKeys;
+      var queryBean, page, params, res, _list2, list, _res$data3, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -517,18 +523,18 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               } else {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               }
-              _data3 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
+              _data2 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
               nextSelectRowKeys = isMultiple ? value : [value];
               if (labelInValue) {
-                onChange(_data3);
+                onChange(_data2);
               } else {
-                onChange(isMultiple ? _data3.map(function (item) {
+                onChange(isMultiple ? _data2.map(function (item) {
                   return item[valueKey];
-                }) : _data3[valueKey]);
+                }) : _data2[valueKey]);
               }
               // 更新内部展示值
               setState({
-                _value: _data3,
+                _value: _data2,
                 isInit: false,
                 selectedRows: list,
                 selectedRowKeys: nextSelectRowKeys
@@ -597,8 +603,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRows = value;
         }
       } else if (value) {
+        console.log('value', value);
         nextState.selectedRowKeys = [value];
-        nextState.selectedRows = [_defineProperty({}, valueKey, value[valueKey])];
       }
       setState(nextState);
     }

package/es/ProForm/components/combination/_Group/index.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { GroupProps } from './propsType';
+declare const Group: React.FC<GroupProps>;
+export default Group;

package/es/ProForm/components/combination/_Group/index.js

@@ -0,0 +1,109 @@
+import "antd/es/space/style";
+import _Space from "antd/es/space";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useMemo } from 'react';
+import { omit, isFunction, union, isNumber } from 'lodash';
+import { useDeepCompareEffect } from 'ahooks';
+import classnames from 'classnames';
+import RenderFields from '../../render/RenderFields';
+import { insertSeparator, transformNamesString } from './utils';
+import ProForm from '../../../../ProForm';
+var Group = function Group(props) {
+  var columns = props.children,
+    otherProps = props.otherProps,
+    className = props.className,
+    _props$space = props.space,
+    space = _props$space === void 0 ? {
+      size: 12
+    } : _props$space,
+    id = props.id,
+    value = props.value,
+    isView = props.isView,
+    index = props.index,
+    onFieldChange = props.onFieldChange,
+    namePath = props.namePath;
+  var _ref = ProForm.useFieldProps() || {},
+    names = _ref.names,
+    name = _ref.name,
+    form = _ref.form,
+    _namePath = _ref.namePath;
+  var newNamePath = namePath || _namePath || [];
+  if (!Array.isArray(names)) {
+    console.error('Warning: Composite form components whose type is Group must be configured with names');
+  }
+  var data = useMemo(function () {
+    var fieldList = [];
+    var result = columns.map(function (item) {
+      return _objectSpread(_objectSpread({
+        disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
+      }, item), {}, {
+        isView: isView !== null && isView !== void 0 ? isView : item.isView,
+        noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
+        parentNames: id,
+        namePath: newNamePath
+      });
+    });
+    var node = _jsx(_Button, {
+      className: "group-separator",
+      children: space.separator
+    });
+    return {
+      columns: insertSeparator(result, space, node, otherProps),
+      fieldList: fieldList
+    };
+  }, [name, columns, space, props, names]);
+  var _className = classnames(_defineProperty({
+    'pro-group': true,
+    'pro-group-diy-width': columns.some(function (item) {
+      var _item$fieldProps, _item$fieldProps$styl;
+      return item === null || item === void 0 ? void 0 : (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : (_item$fieldProps$styl = _item$fieldProps.style) === null || _item$fieldProps$styl === void 0 ? void 0 : _item$fieldProps$styl.width;
+    }),
+    'pro-group-width-auto': columns.some(function (item) {
+      return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
+    })
+  }, "".concat(className), className));
+  // 用于formList场景下names移除掉了前缀，需要再次合并回来
+  var _names = names.map(function (item) {
+    if (isNumber(item === null || item === void 0 ? void 0 : item[0])) {
+      return union(newNamePath, item);
+    }
+    return item;
+  });
+  useDeepCompareEffect(function () {
+    var _document, _document$activeEleme;
+    // 焦点激活的表单
+    var touchName = ((_document = document) === null || _document === void 0 ? void 0 : (_document$activeEleme = _document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) || '';
+    // 模拟change,初始化不执行onFieldChange
+    if (isFunction(onFieldChange) && form.isFieldsTouched(_names) && transformNamesString(_names).includes(touchName)) {
+      onFieldChange(value, (newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.length) ? form.getFieldValue(newNamePath, true) : form.getFieldsValue(), {
+        form: form,
+        namePath: newNamePath,
+        index: index
+      });
+    }
+  }, [value]);
+  var _otherProps = omit(otherProps, ['colProps', 'required']);
+  return _jsx("div", {
+    className: _className,
+    children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
+      children: _jsx(RenderFields, _objectSpread({
+        columns: data.columns,
+        form: form
+      }, _otherProps))
+    }) : _jsx(_Space, _objectSpread(_objectSpread({
+      align: "start"
+    }, omit(space, ['separator', 'compact'])), {}, {
+      children: data.columns.map(function (column, index) {
+        return _jsx(RenderFields, _objectSpread({
+          columns: [column],
+          form: form
+        }, _otherProps), (column === null || column === void 0 ? void 0 : column.name) || index);
+      })
+    }))
+  });
+};
+export default Group;

package/es/ProForm/components/combination/_Group/propsType.d.ts

@@ -0,0 +1,35 @@
+import React from 'react';
+import { RowProps, SpaceProps } from 'antd';
+import { FormInstance } from 'antd/es/form/Form';
+import { NamePath } from 'antd/lib/form/interface';
+import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
+export interface SpaceType extends SpaceProps {
+    /**
+     * 是否紧凑合并
+     */
+    compact?: Boolean;
+    /**
+     * 分隔符
+     */
+    separator?: string | React.ReactNode;
+    /** 间隔距离 */
+    size?: number;
+}
+export interface GroupProps {
+    children?: ProColumnProps[];
+    space?: SpaceType;
+    otherProps?: ProFormOtherProps;
+    rowProps?: RowProps;
+    className?: string;
+    value?: any;
+    id?: string;
+    disabled?: boolean | (() => void);
+    isView?: boolean;
+    namePath?: NamePath;
+    index?: number;
+    onFieldChange?: (value: any[] | null, record: any, { form, }: {
+        form: FormInstance;
+        namePath?: NamePath;
+        index?: number;
+    }) => any;
+}

package/es/ProForm/components/combination/_Group/utils.d.ts

@@ -0,0 +1,10 @@
+import { ReactNode } from 'react';
+import { SpaceType } from './propsType';
+/**
+* 插入间隔符
+* @param columns 表单配置数组
+* @returns
+*/
+export declare const insertSeparator: (columns: any, space?: SpaceType, separatorNode?: ReactNode, otherProps?: any) => any;
+/** 转换names */
+export declare const transformNamesString: (arr: (string | string[])[]) => (string | string[])[];

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

@@ -0,0 +1,46 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+/**
+* 插入间隔符
+* @param columns 表单配置数组
+* @returns
+*/
+export var insertSeparator = function insertSeparator(columns, space, separatorNode, otherProps) {
+  var _columns = columns;
+  var _ref = otherProps || {},
+    names = _ref.names;
+  // 紧凑模式存在names时，自动给下级拆解name
+  if (names) {
+    _columns = _columns.map(function (column, index) {
+      return _objectSpread(_objectSpread({}, column), {}, {
+        name: names[index]
+      });
+    });
+  }
+  if (!(space === null || space === void 0 ? void 0 : space.separator)) {
+    return _columns;
+  }
+  return _columns.reduce(function (result, current, index, array) {
+    // 将当前元素添加到结果数组中
+    result.push(current);
+    // 如果当前元素不是最后一个元素，则添加间隔符
+    if (index < array.length - 1) {
+      result.push({
+        component: separatorNode,
+        fieldProps: {
+          disabled: true
+        }
+      });
+    }
+    return result;
+  }, []);
+};
+/** 转换names */
+export var transformNamesString = function transformNamesString(arr) {
+  var result = arr.map(function (subArr) {
+    if (Array.isArray(subArr)) {
+      return subArr.join('_');
+    }
+    return subArr;
+  });
+  return result;
+};

package/es/ProForm/components/render/Render.js

@@ -22,7 +22,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
-import { isFunction, isString, omit } from 'lodash';
+import { isFunction, isString, omit, set } from 'lodash';
 import useShouldUpdate from '../../utils/useShouldUpdate';
 import { isTrim, isUpperCase, findOptionByValue, parseNamePath } from '../../utils/index';
 import { useProConfig } from '../../../ProConfigProvider';
@@ -255,15 +255,17 @@ var Render = function Render(props) {
     if (changeKey === 'onFieldChange') {
       _args = functionArgs([].concat(args));
     }
+    var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
     if ( /*#__PURE__*/React.isValidElement(AutoComponent)) {
       var _AutoComponent$props$, _AutoComponent$props, _lastComponentProps$c;
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat(_toConsumableArray(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat(_toConsumableArray(_args))));
       return false;
     }
-    var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
     // FormList 和 Group场景 对比值改变的话, 回显到表单上
-    if (inList) {
-      form.setFieldsValue(_args[1]);
+    if (inList && changeKey === 'onFieldChange') {
+      var values = form.getFieldsValue();
+      var newValues = set(values, _otherFormItemProps.namePath, _args[1]);
+      form.setFieldsValue(newValues);
     }
     // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
     if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
@@ -276,7 +278,7 @@ var Render = function Render(props) {
     // ProTreeSelect返回option
     if (['ProTree'].includes(type)) {
       var _args2, _args2$;
-      _args[2].option = findOptionByValue(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0]);
+      _args[2].option = findOptionByValue(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0], (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
     }
     (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 ? void 0 : _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat(_toConsumableArray(_args)));
   };
@@ -316,7 +318,7 @@ var Render = function Render(props) {
   }();
   var renderItem = function renderItem() {
     // 移除多余字段，group保留onFieldChange
-    var lastComponentPropsFilter = type === 'Group' ? ['disabledStrictly'] : ['onFieldChange', 'disabledStrictly'];
+    var lastComponentPropsFilter = ['onFieldChange', 'disabledStrictly'];
     // 表单渲染 start
     var childProps = _objectSpread(_objectSpread(_objectSpread({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), omit(lastComponentProps, lastComponentPropsFilter)), {}, {
       // @ts-ignore

package/es/ProForm/components/render/RenderFields.js

@@ -179,6 +179,7 @@ var RenderFields = function RenderFields(props) {
       colProps: _colProps,
       mode: componentProps.mode,
       namePath: column.namePath,
+      listName: column.listName,
       globalControl: globalControl,
       formDisabled: formDisabled
     };