@zat-design/sisyphus-react 4.0.0-beta.7 → 4.0.0-beta.9

package/es/ProEditTable/components/RcTable/DraggableTable.js

@@ -38,8 +38,9 @@ var Row = props => {
     ref: setNodeRef,
     style: style
   }, attributes), {}, {
-    children: React.Children.map(children, child => {
-      if (child.key === 'RC_TABLE_KEY' && !disabled) {
+    children: React.Children.map(children, (child, index) => {
+      // 在第一列（通常是rowSelection列）显示拖拽图标
+      if (index === 0 && !disabled) {
         var _restProps$dataRowD;
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,
@@ -60,7 +61,8 @@ var Row = props => {
             }, listeners)) : /*#__PURE__*/_jsx(ProIcon, {
               size: 20
             }), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
-          })
+          }),
+          className: 'pro-edit-table-drag-wrapper-cell'
         });
       }
       return child;

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

@@ -23,6 +23,7 @@ import { isSelect, isTrim } from "../../../ProForm/utils";
 import ConfirmWrapper from "../../../ProForm/components/render/ConfirmWrapper";
 import { getDefaultProps } from "../../utils/getDefaultProps";
 import ListChangedWrapper from "./ListChangedWrapper";
+import useShouldUpdateForTable from "../../utils/useShouldUpdateForTable";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 var RenderField = _ref => {
@@ -58,8 +59,6 @@ var RenderField = _ref => {
     dependencies = column.dependencies,
     desensitization = column.desensitization,
     resetProps = _objectWithoutProperties(column, _excluded);
-  // editRender弃用使用component同ProForm
-  var _editRender = component || editRender;
   var mode = config.mode,
     cellName = config.cellName,
     cellNamePath = config.cellNamePath,
@@ -76,13 +75,17 @@ var RenderField = _ref => {
     validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
     otherProps = config.otherProps,
     diffConfig = config.diffConfig,
-    getIsNew = config.getIsNew;
+    getIsNew = config.getIsNew,
+    shouldUpdateDebounce = config.shouldUpdateDebounce;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
   var _valueType = valueType;
   var _disabled = false;
   var _desensitization = desensitization || [];
+
+  // editRender弃用使用component同ProForm
+  var _editRender = component || editRender;
   var isCell = mode === 'cell';
   if (isCell) {
     record['is-view'] = !isEqual(cellNamePath, cellName);
@@ -112,21 +115,34 @@ var RenderField = _ref => {
   // 行参数 - 使用useMemo优化
   var rowParams = useMemo(() => [currentValue, rowData, options], [currentValue, rowData, options]);
 
+  // 使用 hook 处理动态属性（带选择性防抖）
+  var dynamicProps = useShouldUpdateForTable({
+    rowParams,
+    column,
+    shouldUpdateDebounce
+  });
+
   // required & rules & fieldProps & disabled & valueType 函数化处理
+  // 优先使用 hook 返回的值，fallback 到原始值
   if (isFunction(required)) {
-    _required = required(...rowParams);
+    var _dynamicProps$require;
+    _required = (_dynamicProps$require = dynamicProps.required) !== null && _dynamicProps$require !== void 0 ? _dynamicProps$require : required(...rowParams);
   }
   if (isFunction(fieldProps)) {
-    _fieldProps = fieldProps(...rowParams);
+    var _dynamicProps$fieldPr;
+    _fieldProps = (_dynamicProps$fieldPr = dynamicProps.fieldProps) !== null && _dynamicProps$fieldPr !== void 0 ? _dynamicProps$fieldPr : fieldProps(...rowParams);
   }
   if (isFunction(rules)) {
-    _rules = rules(...rowParams);
+    var _dynamicProps$rules;
+    _rules = (_dynamicProps$rules = dynamicProps.rules) !== null && _dynamicProps$rules !== void 0 ? _dynamicProps$rules : rules(...rowParams);
   }
   if (isFunction(valueType)) {
-    _valueType = valueType(...rowParams);
+    var _dynamicProps$valueTy;
+    _valueType = (_dynamicProps$valueTy = dynamicProps.valueType) !== null && _dynamicProps$valueTy !== void 0 ? _dynamicProps$valueTy : valueType(...rowParams);
   }
   if (isFunction(desensitization)) {
-    _desensitization = desensitization(...rowParams);
+    var _dynamicProps$desensi;
+    _desensitization = (_dynamicProps$desensi = dynamicProps.desensitization) !== null && _dynamicProps$desensi !== void 0 ? _dynamicProps$desensi : desensitization(...rowParams);
   }
 
   // 获取最终的disabled
@@ -138,8 +154,11 @@ var RenderField = _ref => {
     columnFieldProps: _fieldProps,
     params: rowParams
   });
+
+  // isEditable 处理 - 优先使用 hook 返回的值
   if (isFunction(isEditable)) {
-    isEditable = isEditable(...rowParams);
+    var _dynamicProps$isEdita;
+    isEditable = (_dynamicProps$isEdita = dynamicProps.isEditable) !== null && _dynamicProps$isEdita !== void 0 ? _dynamicProps$isEdita : isEditable(...rowParams);
   }
 
   // 是否只读文本
@@ -756,5 +775,21 @@ export default /*#__PURE__*/memo(RenderField, (prevProps, nextProps) => {
       return false;
     }
   }
+
+  // 特殊处理：当使用自定义 component 函数时，比较整个 record 对象
+  // 因为自定义组件可能依赖 record 中的其他字段（不只是当前列的 dataIndex）
+  if (isFunction(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.component) || isFunction(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.component)) {
+    // 浅比较 record 的所有属性
+    var prevKeys = Object.keys(prevRecord || {});
+    var nextKeys = Object.keys(nextRecord || {});
+    if (prevKeys.length !== nextKeys.length) {
+      return false;
+    }
+
+    // 使用 some 方法代替 for 循环
+    if (prevKeys.some(key => (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord[key]) !== (nextRecord === null || nextRecord === void 0 ? void 0 : nextRecord[key]))) {
+      return false;
+    }
+  }
   return true;
 });

package/es/ProEditTable/index.js

@@ -20,7 +20,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var ProEditTable = (_ref, ref) => {
-  var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _resetProps$otherProp;
+  var _resetProps$id, _resetProps$id$split, _ref2, _formFieldProps$shoul, _themeConfig$data2, _resetProps$otherProp;
   var _ref$value = _ref.value,
     value = _ref$value === void 0 ? [] : _ref$value,
     onChange = _ref.onChange,
@@ -73,6 +73,7 @@ var ProEditTable = (_ref, ref) => {
   var affixRef = useRef(null);
   var form = contentForm || (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.form) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.form);
   var name = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.name) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.name) || (resetProps === null || resetProps === void 0 || (_resetProps$id = resetProps.id) === null || _resetProps$id === void 0 || (_resetProps$id$split = _resetProps$id.split) === null || _resetProps$id$split === void 0 ? void 0 : _resetProps$id$split.call(_resetProps$id, '_'));
+  var shouldUpdateDebounce = (_ref2 = (_formFieldProps$shoul = formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.shouldUpdateDebounce) !== null && _formFieldProps$shoul !== void 0 ? _formFieldProps$shoul : resetProps === null || resetProps === void 0 ? void 0 : resetProps.shouldUpdateDebounce) !== null && _ref2 !== void 0 ? _ref2 : 200;
   var _formFieldProps$isVie = formFieldProps.isView,
     isView = _formFieldProps$isVie === void 0 ? false : _formFieldProps$isVie,
     _formFieldProps$viewE = formFieldProps.viewEmpty,
@@ -95,8 +96,8 @@ var ProEditTable = (_ref, ref) => {
     _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 1),
     themeConfig = _useLocalStorageState2[0];
   var requiredAlign = useMemo(() => {
-    var _ref2, _themeConfig$data$zau, _themeConfig$data;
-    return (_ref2 = (_themeConfig$data$zau = themeConfig === null || themeConfig === void 0 || (_themeConfig$data = themeConfig.data) === null || _themeConfig$data === void 0 ? void 0 : _themeConfig$data.zauiFormAlign) !== null && _themeConfig$data$zau !== void 0 ? _themeConfig$data$zau : configRequiredAlign) !== null && _ref2 !== void 0 ? _ref2 : 'left';
+    var _ref3, _themeConfig$data$zau, _themeConfig$data;
+    return (_ref3 = (_themeConfig$data$zau = themeConfig === null || themeConfig === void 0 || (_themeConfig$data = themeConfig.data) === null || _themeConfig$data === void 0 ? void 0 : _themeConfig$data.zauiFormAlign) !== null && _themeConfig$data$zau !== void 0 ? _themeConfig$data$zau : configRequiredAlign) !== null && _ref3 !== void 0 ? _ref3 : 'left';
   }, [themeConfig === null || themeConfig === void 0 || (_themeConfig$data2 = themeConfig.data) === null || _themeConfig$data2 === void 0 ? void 0 : _themeConfig$data2.zauiFormAlign, configRequiredAlign]);
   var _useSetState = useSetState({
       cellNamePath: [],
@@ -138,8 +139,8 @@ var ProEditTable = (_ref, ref) => {
   var getRowKey = useCallback(record => {
     var key = record.rowKey || getRandom();
     if (rowKey) {
-      var _ref3;
-      key = (_ref3 = isFunction(rowKey) ? rowKey(record) : record[rowKey]) !== null && _ref3 !== void 0 ? _ref3 : key;
+      var _ref4;
+      key = (_ref4 = isFunction(rowKey) ? rowKey(record) : record[rowKey]) !== null && _ref4 !== void 0 ? _ref4 : key;
     }
     return key;
   }, [rowKey]);
@@ -174,7 +175,7 @@ var ProEditTable = (_ref, ref) => {
 
   // 分页变更
   var handlePageChange = useCallback( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(current, pageSize) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(current, pageSize) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -220,7 +221,7 @@ var ProEditTable = (_ref, ref) => {
       }, _callee, null, [[0, 10]]);
     }));
     return function (_x, _x2) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }(), [pagination, page.pageSize, form, name]);
   var config = _objectSpread({
@@ -257,6 +258,7 @@ var ProEditTable = (_ref, ref) => {
     rowDisabled,
     actionDirection,
     diffConfig: _objectSpread(_objectSpread({}, resetProps === null || resetProps === void 0 || (_resetProps$otherProp = resetProps.otherProps) === null || _resetProps$otherProp === void 0 ? void 0 : _resetProps$otherProp.diffConfig), diffConfig),
+    shouldUpdateDebounce,
     getIsNew,
     handlePageChange
   }, resetProps);
@@ -317,7 +319,7 @@ var ProEditTable = (_ref, ref) => {
 
   // 空列表状态
   var emptyDom = useMemo(() => () => {
-    var _filter, _ref5;
+    var _filter, _ref6;
     return /*#__PURE__*/_jsxs("div", {
       className: "com-empty",
       children: [/*#__PURE__*/_jsx("img", {
@@ -328,7 +330,7 @@ var ProEditTable = (_ref, ref) => {
         className: "content",
         children: disabled || isForbiddenBtn('add') ? locale.ProEditTable.noData : /*#__PURE__*/_jsxs(_Fragment, {
           children: [locale.ProEditTable.noData, "\uFF0C", /*#__PURE__*/_jsx(RenderToolbar, _objectSpread({}, _objectSpread(_objectSpread({}, config), {}, {
-            toolbarProps: toolbarProps === null || toolbarProps === void 0 || (_filter = (_ref5 = toolbarProps).filter) === null || _filter === void 0 ? void 0 : _filter.call(_ref5, item => item.type === 'add' || (item === null || item === void 0 ? void 0 : item.persistence)),
+            toolbarProps: toolbarProps === null || toolbarProps === void 0 || (_filter = (_ref6 = toolbarProps).filter) === null || _filter === void 0 ? void 0 : _filter.call(_ref6, item => item.type === 'add' || (item === null || item === void 0 ? void 0 : item.persistence)),
             dataSource: []
           })))]
         })

package/es/ProEditTable/propsType.d.ts

@@ -402,6 +402,12 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
         /** 是否跟随父元素滚动 */
         scrollFollowParent?: boolean;
     };
+    /**
+     * 动态属性更新防抖时间（毫秒）
+     * 用于优化表格编辑时的性能，对 fieldProps、desensitization, required、rules、isEditable, valueType 等属性进行防抖处理, 当设置为 0 时禁用防抖，所有属性立即响应
+     * @default 200
+     */
+    shouldUpdateDebounce?: number;
 }
 /**
  * 基础操作按钮类型（基于接口）

package/es/ProEditTable/style/index.less

@@ -1,5 +1,12 @@
 
 .pro-edit-table {
+  .pro-edit-table-drag-wrapper-cell{
+    .@{ant-prefix}-btn{
+      &:hover{
+        background: transparent;
+      }
+    }
+  }
   td[rowspan]{
     vertical-align: middle !important;
   }
@@ -81,10 +88,9 @@
 
   .pro-edit-table-drag-wrapper {
     display: flex;
-    justify-content: flex-end;
+    align-items: center;
     .anticon {
-      margin-right: var(--zaui-space-size-md, 16px);
-      margin-left: var(--zaui-space-size-xs, 4px);
+      margin-right: var(--zaui-space-size-xs, 4px);
       cursor: pointer;
     }
   }

package/es/ProEditTable/utils/useShouldUpdateForTable.d.ts

@@ -0,0 +1,15 @@
+interface UseShouldUpdateForTableProps {
+    rowParams: any[];
+    column: any;
+    shouldUpdateDebounce: number;
+}
+interface Result {
+    isEditable: any;
+    required: any;
+    rules: any;
+    fieldProps: any;
+    desensitization: any;
+    valueType: any;
+}
+declare const useShouldUpdateForTable: (props: UseShouldUpdateForTableProps) => Result;
+export default useShouldUpdateForTable;

package/es/ProEditTable/utils/useShouldUpdateForTable.js

@@ -0,0 +1,132 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useRef, useState, useEffect } from 'react';
+import { isFunction, isEqualWith, debounce } from 'lodash';
+import { customEqualForFunction } from "../../utils";
+var useShouldUpdateForTable = props => {
+  var _isEditableRef$curren, _requiredRef$current, _rulesRef$current, _fieldPropsRef$curren, _desensitizationRef$c, _valueTypeRef$current;
+  var rowParams = props.rowParams,
+    column = props.column,
+    shouldUpdateDebounce = props.shouldUpdateDebounce;
+
+  // refs 存储当前值
+  var isEditableRef = useRef();
+  var requiredRef = useRef();
+  var rulesRef = useRef();
+  var fieldPropsRef = useRef();
+  var desensitizationRef = useRef();
+  var valueTypeRef = useRef();
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    reRender = _useState2[1];
+  var debouncedUpdateRef = useRef(null);
+  var pendingParamsRef = useRef(null);
+
+  // 统一处理所有动态属性的更新
+  var processUpdate = params => {
+    var hasChange = false;
+
+    // isEditable 处理
+    if (isFunction(column.isEditable)) {
+      var newIsEditable = column.isEditable(...params);
+      if (isEditableRef.current !== newIsEditable) {
+        isEditableRef.current = newIsEditable;
+        hasChange = true;
+      }
+    } else {
+      isEditableRef.current = column.isEditable;
+    }
+
+    // required 处理
+    if (isFunction(column.required)) {
+      var newRequired = column.required(...params);
+      if (requiredRef.current !== newRequired) {
+        requiredRef.current = newRequired;
+        hasChange = true;
+      }
+    } else {
+      requiredRef.current = column.required;
+    }
+
+    // rules 处理
+    if (isFunction(column.rules)) {
+      var newRules = column.rules(...params);
+      if (!isEqualWith(rulesRef.current, newRules, customEqualForFunction)) {
+        rulesRef.current = newRules;
+        hasChange = true;
+      }
+    } else {
+      rulesRef.current = column.rules;
+    }
+
+    // fieldProps 处理
+    if (isFunction(column.fieldProps)) {
+      var newFieldProps = column.fieldProps(...params);
+      if (!isEqualWith(fieldPropsRef.current, newFieldProps, customEqualForFunction)) {
+        fieldPropsRef.current = newFieldProps;
+        hasChange = true;
+      }
+    } else {
+      fieldPropsRef.current = column.fieldProps;
+    }
+
+    // desensitization 处理
+    if (isFunction(column.desensitization)) {
+      var newDesensitization = column.desensitization(...params);
+      if (!isEqualWith(desensitizationRef.current, newDesensitization)) {
+        desensitizationRef.current = newDesensitization;
+        hasChange = true;
+      }
+    } else {
+      desensitizationRef.current = column.desensitization;
+    }
+
+    // valueType 处理
+    if (isFunction(column.valueType)) {
+      var newValueType = column.valueType(...params);
+      if (valueTypeRef.current !== newValueType) {
+        valueTypeRef.current = newValueType;
+        hasChange = true;
+      }
+    } else {
+      valueTypeRef.current = column.valueType;
+    }
+    if (hasChange) {
+      reRender({});
+    }
+  };
+
+  // 创建防抖函数（统一处理所有动态属性）
+  useEffect(() => {
+    if (shouldUpdateDebounce > 0 && (isFunction(column.isEditable) || isFunction(column.required) || isFunction(column.rules) || isFunction(column.fieldProps) || isFunction(column.desensitization) || isFunction(column.valueType))) {
+      debouncedUpdateRef.current = debounce(() => {
+        if (pendingParamsRef.current) {
+          processUpdate(pendingParamsRef.current);
+          pendingParamsRef.current = null;
+        }
+      }, shouldUpdateDebounce);
+    }
+    return () => {
+      var _debouncedUpdateRef$c;
+      (_debouncedUpdateRef$c = debouncedUpdateRef.current) === null || _debouncedUpdateRef$c === void 0 || _debouncedUpdateRef$c.cancel();
+    };
+  }, [shouldUpdateDebounce, column]);
+
+  // 统一的属性处理逻辑
+  if (shouldUpdateDebounce > 0 && debouncedUpdateRef.current) {
+    // 使用防抖延迟更新
+    pendingParamsRef.current = rowParams;
+    debouncedUpdateRef.current();
+  } else {
+    // 立即更新（shouldUpdateDebounce = 0 或无防抖函数）
+    processUpdate(rowParams);
+  }
+  return {
+    isEditable: (_isEditableRef$curren = isEditableRef.current) !== null && _isEditableRef$curren !== void 0 ? _isEditableRef$curren : column.isEditable,
+    required: (_requiredRef$current = requiredRef.current) !== null && _requiredRef$current !== void 0 ? _requiredRef$current : column.required,
+    rules: (_rulesRef$current = rulesRef.current) !== null && _rulesRef$current !== void 0 ? _rulesRef$current : column.rules,
+    fieldProps: (_fieldPropsRef$curren = fieldPropsRef.current) !== null && _fieldPropsRef$curren !== void 0 ? _fieldPropsRef$curren : column.fieldProps,
+    desensitization: (_desensitizationRef$c = desensitizationRef.current) !== null && _desensitizationRef$c !== void 0 ? _desensitizationRef$c : column.desensitization,
+    valueType: (_valueTypeRef$current = valueTypeRef.current) !== null && _valueTypeRef$current !== void 0 ? _valueTypeRef$current : column.valueType
+  };
+};
+export default useShouldUpdateForTable;

package/es/ProForm/components/combination/FormList/components/ActionButton.d.ts

@@ -18,6 +18,7 @@ export interface Props {
     mode: FormListMode;
     disabled?: boolean;
     isView?: boolean;
+    hideStartEndActionProps?: [boolean, boolean];
 }
 declare const ActionButton: React.FC<Props>;
 export default ActionButton;

package/es/ProForm/components/combination/FormList/components/ActionButton.js

@@ -113,7 +113,8 @@ var ActionButton = props => {
     min = props.min,
     max = props.max,
     mode = props.mode,
-    isView = props.isView;
+    isView = props.isView,
+    hideStartEndActionProps = props.hideStartEndActionProps;
 
   // 默认显示一个delete
   var actionProps = useMemo(() => {
@@ -181,6 +182,10 @@ var ActionButton = props => {
     });
   };
   var defaultActions = useMemo(() => getDefaultActions(mode), [mode]);
+
+  // 整体隐藏首尾 ActionButton
+  if (hideStartEndActionProps !== null && hideStartEndActionProps !== void 0 && hideStartEndActionProps[0] && index === 0) return null;
+  if (hideStartEndActionProps !== null && hideStartEndActionProps !== void 0 && hideStartEndActionProps[1] && index === fields.length - 1) return null;
   return /*#__PURE__*/_jsx(Space, {
     align: "start",
     className: "pro-form-list-action",
@@ -229,11 +234,83 @@ var ActionButton = props => {
         if (index + 1 === fields.length && type === 'moveDown') {
           return false;
         }
+
+        // 移动限制：防止将项移动到隐藏的首尾位置
+        if (hideStartEndActionProps !== null && hideStartEndActionProps !== void 0 && hideStartEndActionProps[0] && index === 1 && ['moveUp'].includes(type)) {
+          return false;
+        }
+        if (hideStartEndActionProps !== null && hideStartEndActionProps !== void 0 && hideStartEndActionProps[1] && index === fields.length - 2 && type === 'moveDown') {
+          return false;
+        }
+
+        // 处理 add 操作的插入位置
+        var handleAddClick = /*#__PURE__*/function () {
+          var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+            var value, data, insertIndex, _insertIndex;
+            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
+                case 0:
+                  value = form.getFieldValue(namePath);
+                  _context2.next = 3;
+                  return _onClick === null || _onClick === void 0 ? void 0 : _onClick(value, {
+                    namePath,
+                    index,
+                    operation,
+                    form
+                  });
+                case 3:
+                  data = _context2.sent;
+                  if (!(!_onClick || data === true)) {
+                    _context2.next = 7;
+                    break;
+                  }
+                  // 如果有 addIndex 配置，使用它计算插入位置
+                  if (item.addIndex) {
+                    insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
+                      index,
+                      namePath,
+                      form,
+                      operation
+                    }) : item.addIndex;
+                    operation.add(data, insertIndex);
+                  } else {
+                    operation.add(data, index + 1); // 默认插入到下一位置
+                  }
+                  return _context2.abrupt("return");
+                case 7:
+                  if ((item === null || item === void 0 ? void 0 : item.type) === 'add') {
+                    // 如果有 addIndex 配置，使用它计算插入位置
+                    if (item.addIndex) {
+                      _insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
+                        index,
+                        namePath,
+                        form,
+                        operation
+                      }) : item.addIndex;
+                      operation.add(data, _insertIndex);
+                    } else {
+                      operation.add(data, index + 1); // 默认插入到下一位置
+                    }
+                  }
+                case 8:
+                case "end":
+                  return _context2.stop();
+              }
+            }, _callee2);
+          }));
+          return function handleAddClick() {
+            return _ref7.apply(this, arguments);
+          };
+        }();
         return _needConfirm ? /*#__PURE__*/_jsx(Popconfirm, _objectSpread(_objectSpread({
           title: title !== null && title !== void 0 ? title : `${locale.ProForm.formListConfirmMessage}`,
           onCancel: e => e.stopPropagation(),
           onConfirm: e => {
-            handleClick(internalOnClick, _onClick, index, item);
+            if (type === 'add') {
+              handleAddClick();
+            } else {
+              handleClick(internalOnClick, _onClick, index, item);
+            }
           }
         }, _confirmProps), {}, {
           children: /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), omit(rest, filterKeys)), {}, {
@@ -251,7 +328,11 @@ var ActionButton = props => {
           type: "text",
           onClick: e => {
             e.stopPropagation();
-            handleClick(internalOnClick, _onClick, index, item);
+            if (type === 'add') {
+              handleAddClick();
+            } else {
+              handleClick(internalOnClick, _onClick, index, item);
+            }
           },
           children: label || defaultLabel
         }), `${item === null || item === void 0 ? void 0 : item.type}${index}`);

package/es/ProForm/components/combination/FormList/components/BlockFields.d.ts

@@ -16,6 +16,8 @@ interface Props extends Omit<FormListType, 'toolbarProps'> {
     level?: levelType;
     towCollapse?: boolean;
     diffConfig?: DiffConfigType;
+    hideStartEndActionProps?: [boolean, boolean];
+    titlePosition?: 'top' | 'left';
 }
 declare const BlockFields: React.FC<Props>;
 export default BlockFields;

package/es/ProForm/components/combination/FormList/components/BlockFields.js

@@ -7,6 +7,7 @@ import RenderFields from "../../../render/RenderFields";
 import ProCollapse from "../../../../../ProLayout/components/ProCollapse";
 import { memoWith } from "../utils";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var MemoRenderFields = /*#__PURE__*/React.memo(RenderFields, memoWith);
 var BlockFields = props => {
   var title = props.title,
@@ -28,7 +29,9 @@ var BlockFields = props => {
     level = _props$level === void 0 ? '2' : _props$level,
     towCollapse = props.towCollapse,
     id = props.id,
-    diffConfig = props.diffConfig;
+    diffConfig = props.diffConfig,
+    hideStartEndActionProps = props.hideStartEndActionProps,
+    titlePosition = props.titlePosition;
   var _title = useMemo(() => {
     if (isFunction(title)) {
       var record = form.getFieldValue(namePath);
@@ -37,8 +40,63 @@ var BlockFields = props => {
     return title;
   }, [title, index]);
   var cls = classNames({
-    [`pro-form-list-mode-${mode}`]: mode === 'block' || mode === 'line' || mode === 'less'
+    [`pro-form-list-mode-${mode}`]: mode === 'block' || mode === 'line' || mode === 'less',
+    'pro-form-list-title-left': titlePosition === 'left'
   });
+
+  // 左侧标题布局
+  if (titlePosition === 'left') {
+    return /*#__PURE__*/_jsx(Space, {
+      direction: "vertical",
+      className: cls,
+      id: id,
+      children: /*#__PURE__*/_jsxs("div", {
+        className: "pro-form-list-left-title-wrapper",
+        children: [/*#__PURE__*/_jsx("div", {
+          className: "pro-form-list-left-title",
+          children: _title
+        }), /*#__PURE__*/_jsx("div", {
+          className: "pro-form-list-left-content",
+          children: /*#__PURE__*/_jsx(ProCollapse, {
+            title: _title,
+            index: index,
+            form: form,
+            level: level,
+            towCollapse: towCollapse,
+            extra: actionProps !== false && /*#__PURE__*/_jsx(ActionButton, {
+              min: min,
+              max: max,
+              index: index,
+              length: fields.length,
+              operation: operation,
+              namePath: namePath,
+              form: form,
+              field: field,
+              fields: fields,
+              actionProps: actionProps,
+              mode: mode,
+              disabled: disabled,
+              isView: isView,
+              hideStartEndActionProps: hideStartEndActionProps
+            }),
+            children: /*#__PURE__*/_jsx(Row, {
+              gutter: 24,
+              children: /*#__PURE__*/_jsx(MemoRenderFields, {
+                columns: columns,
+                form: form,
+                colProps: colProps,
+                disabled: disabled,
+                isView: isView,
+                diffConfig: diffConfig
+              })
+            }, field.key)
+          })
+        })]
+      })
+    });
+  }
+
+  // 默认顶部标题布局
   return /*#__PURE__*/_jsx(Space, {
     direction: "vertical",
     className: cls,
@@ -46,9 +104,7 @@ var BlockFields = props => {
     children: /*#__PURE__*/_jsx(ProCollapse, {
       title: _title,
       index: index,
-      form: form
-      // namePath={namePath}
-      ,
+      form: form,
       level: level,
       towCollapse: towCollapse,
       extra: actionProps !== false && /*#__PURE__*/_jsx(ActionButton, {
@@ -64,7 +120,8 @@ var BlockFields = props => {
         actionProps: actionProps,
         mode: mode,
         disabled: disabled,
-        isView: isView
+        isView: isView,
+        hideStartEndActionProps: hideStartEndActionProps
       }),
       children: /*#__PURE__*/_jsx(Row, {
         gutter: 24,