@zat-design/sisyphus-react 3.13.21 → 3.13.22-beta.1

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

@@ -123,7 +123,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 = (0, _react.useMemo)(() => {
@@ -191,6 +192,10 @@ var ActionButton = props => {
     });
   };
   var defaultActions = (0, _react.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__*/(0, _jsxRuntime.jsx)(_space.default, {
     align: "start",
     className: "pro-form-list-action",
@@ -239,11 +244,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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+            var value, data, insertIndex, _insertIndex;
+            return (0, _regeneratorRuntime2.default)().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__*/(0, _jsxRuntime.jsx)(_popconfirm.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           title: title !== null && title !== void 0 ? title : `${_locale.default.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__*/(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), (0, _lodash.omit)(rest, filterKeys)), {}, {
@@ -255,7 +332,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/lib/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/lib/ProForm/components/combination/FormList/components/BlockFields.js

@@ -39,7 +39,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 = (0, _react.useMemo)(() => {
     if ((0, _lodash.isFunction)(title)) {
       var record = form.getFieldValue(namePath);
@@ -48,8 +50,63 @@ var BlockFields = props => {
     return title;
   }, [title, index]);
   var cls = (0, _classnames.default)({
-    [`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__*/(0, _jsxRuntime.jsx)(_space.default, {
+      direction: "vertical",
+      className: cls,
+      id: id,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "pro-form-list-left-title-wrapper",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "pro-form-list-left-title",
+          children: _title
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "pro-form-list-left-content",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProCollapse.default, {
+            title: _title,
+            index: index,
+            form: form,
+            level: level,
+            towCollapse: towCollapse,
+            extra: actionProps !== false && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ActionButton.default, {
+              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__*/(0, _jsxRuntime.jsx)(_row.default, {
+              gutter: 24,
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(MemoRenderFields, {
+                columns: columns,
+                form: form,
+                colProps: colProps,
+                disabled: disabled,
+                isView: isView,
+                diffConfig: diffConfig
+              })
+            }, field.key)
+          })
+        })]
+      })
+    });
+  }
+
+  // 默认顶部标题布局
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
     direction: "vertical",
     className: cls,
@@ -57,9 +114,7 @@ var BlockFields = props => {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProCollapse.default, {
       title: _title,
       index: index,
-      form: form
-      // namePath={namePath}
-      ,
+      form: form,
       level: level,
       towCollapse: towCollapse,
       extra: actionProps !== false && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ActionButton.default, {
@@ -75,7 +130,8 @@ var BlockFields = props => {
         actionProps: actionProps,
         mode: mode,
         disabled: disabled,
-        isView: isView
+        isView: isView,
+        hideStartEndActionProps: hideStartEndActionProps
       }),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_row.default, {
         gutter: 24,

package/lib/ProForm/components/combination/FormList/components/Empty.js

@@ -40,7 +40,8 @@ var Empty = _ref => {
             return addConfig === null || addConfig === void 0 || (_addConfig$onClick = addConfig.onClick) === null || _addConfig$onClick === void 0 ? void 0 : _addConfig$onClick.call(addConfig, value, {
               operation,
               form,
-              namePath
+              namePath,
+              index: 0
             });
           case 5:
             data = _context.sent;

package/lib/ProForm/components/combination/FormList/components/LineFields.d.ts

@@ -14,6 +14,7 @@ interface Props extends Omit<FormListType, 'toolbarProps'> {
         key: string;
     };
     diffConfig?: DiffConfigType;
+    hideStartEndActionProps?: [boolean, boolean];
 }
 declare const LineFields: React.FC<Props>;
 export default LineFields;

package/lib/ProForm/components/combination/FormList/components/LineFields.js

@@ -36,7 +36,8 @@ var LineFields = props => {
     draggable = props.draggable,
     className = props.className,
     id = props.id,
-    diffConfig = props.diffConfig;
+    diffConfig = props.diffConfig,
+    hideStartEndActionProps = props.hideStartEndActionProps;
   var isLess = mode === 'less';
   var _useSortable = (0, _sortable.useSortable)({
       id: field.key,
@@ -94,7 +95,8 @@ var LineFields = props => {
       fields: fields,
       actionProps: actionProps,
       mode: mode,
-      disabled: disabled
+      disabled: disabled,
+      hideStartEndActionProps: hideStartEndActionProps
     })]
   });
 };

package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -65,7 +65,7 @@ var ToolbarButton = props => {
   }, [props.toolbarProps]);
   var handleClick = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, item) {
-      var value, data;
+      var value, data, insertIndex, _insertIndex;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -74,7 +74,8 @@ var ToolbarButton = props => {
             return callback === null || callback === void 0 ? void 0 : callback(value, {
               operation,
               form,
-              namePath
+              namePath,
+              index: (value === null || value === void 0 ? void 0 : value.length) || 0
             });
           case 3:
             data = _context.sent;
@@ -82,15 +83,42 @@ var ToolbarButton = props => {
               _context.next = 7;
               break;
             }
-            defaultCallback === null || defaultCallback === void 0 || defaultCallback(value, {
-              operation,
-              form,
-              namePath
-            });
+            if ((item === null || item === void 0 ? void 0 : item.type) === 'add') {
+              // 如果有 addIndex 配置，使用它计算插入位置
+              if (item.addIndex) {
+                insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
+                  namePath,
+                  form,
+                  operation,
+                  index: (value === null || value === void 0 ? void 0 : value.length) || 0
+                }) : item.addIndex;
+                operation.add(data, insertIndex);
+              } else {
+                operation.add(data); // 默认插入到末尾
+              }
+            } else {
+              defaultCallback === null || defaultCallback === void 0 || defaultCallback(value, {
+                operation,
+                form,
+                namePath,
+                index: (value === null || value === void 0 ? void 0 : value.length) || 0
+              });
+            }
             return _context.abrupt("return");
           case 7:
             if ((item === null || item === void 0 ? void 0 : item.type) === 'add' && data) {
-              operation.add(data);
+              // 如果有 addIndex 配置，使用它计算插入位置
+              if (item.addIndex) {
+                _insertIndex = typeof item.addIndex === 'function' ? item.addIndex(value, {
+                  namePath,
+                  form,
+                  operation,
+                  index: (value === null || value === void 0 ? void 0 : value.length) || 0
+                }) : item.addIndex;
+                operation.add(data, _insertIndex);
+              } else {
+                operation.add(data); // 默认插入到末尾
+              }
             }
           case 8:
           case "end":
@@ -107,7 +135,8 @@ var ToolbarButton = props => {
     callback === null || callback === void 0 || callback(value, {
       operation,
       form,
-      namePath
+      namePath,
+      index: 0
     });
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {

package/lib/ProForm/components/combination/FormList/index.js

@@ -35,7 +35,10 @@ var FormList = (props, ref) => {
     _props$span = props.span,
     span = _props$span === void 0 ? 8 : _props$span,
     disabled = props.disabled,
-    emptyBtnText = props.emptyBtnText;
+    emptyBtnText = props.emptyBtnText,
+    hideStartEndActionProps = props.hideStartEndActionProps,
+    titlePosition = props.titlePosition,
+    className = props.className;
   var _fields = fields.map(item => (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
     key: String(item.key)
   }));
@@ -88,65 +91,71 @@ var FormList = (props, ref) => {
       props.operation.move(activeIndex, overIndex);
     }
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_core.DndContext, {
-    onDragEnd: handleDragEnd,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_sortable.SortableContext, {
-      items: _fields.map(item => ({
-        id: item.key
-      })),
-      strategy: _sortable.verticalListSortingStrategy,
-      children: [_fields.map((field, index) => {
-        var namePath = [..._namePath, field.name];
-        var _columns = processColumns(index, namePath);
-        return mode === 'block' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_BlockFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-          columns: _columns,
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    className: className,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_core.DndContext, {
+      onDragEnd: handleDragEnd,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_sortable.SortableContext, {
+        items: _fields.map(item => ({
+          id: item.key
+        })),
+        strategy: _sortable.verticalListSortingStrategy,
+        children: [_fields.map((field, index) => {
+          var namePath = [..._namePath, field.name];
+          var _columns = processColumns(index, namePath);
+          return mode === 'block' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_BlockFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+            columns: _columns,
+            disabled: disabled,
+            isView: isView,
+            namePath: namePath,
+            index: index,
+            field: field,
+            colProps: {
+              span
+            },
+            form: form,
+            diffConfig: _diffConfig,
+            hideStartEndActionProps: hideStartEndActionProps,
+            titlePosition: titlePosition
+          }), field.key) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_LineFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+            className: _fields.length === index + 1 ? 'pro-form-list-last' : ''
+          }, props), {}, {
+            mode: mode,
+            columns: _columns,
+            disabled: disabled,
+            isView: isView,
+            namePath: namePath,
+            index: index,
+            field: field,
+            colProps: {
+              span: mode === 'less' ? 24 : span
+            },
+            form: form,
+            diffConfig: _diffConfig,
+            hideStartEndActionProps: hideStartEndActionProps
+          }), field.key);
+        }), _fields.length === 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
           disabled: disabled,
-          isView: isView,
-          namePath: namePath,
-          index: index,
-          field: field,
-          colProps: {
-            span
-          },
+          toolbarProps: toolbarProps,
+          operation: operation,
           form: form,
-          diffConfig: _diffConfig
-        }), field.key) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_LineFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-          className: _fields.length === index + 1 ? 'pro-form-list-last' : ''
-        }, props), {}, {
-          mode: mode,
-          columns: _columns,
+          namePath: _namePath,
+          emptyBtnText: emptyBtnText
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.ErrorList, {
+          errors: errors
+        }), toolbarProps !== false && _fields.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToolbarButton.default, {
           disabled: disabled,
           isView: isView,
-          namePath: namePath,
-          index: index,
-          field: field,
-          colProps: {
-            span: mode === 'less' ? 24 : span
-          },
+          min: min,
+          max: max,
+          length: fields.length,
+          operation: operation,
+          namePath: _namePath,
           form: form,
-          diffConfig: _diffConfig
-        }), field.key);
-      }), _fields.length === 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
-        disabled: disabled,
-        toolbarProps: toolbarProps,
-        operation: operation,
-        form: form,
-        namePath: _namePath,
-        emptyBtnText: emptyBtnText
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.ErrorList, {
-        errors: errors
-      }), toolbarProps !== false && _fields.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToolbarButton.default, {
-        disabled: disabled,
-        isView: isView,
-        min: min,
-        max: max,
-        length: fields.length,
-        operation: operation,
-        namePath: _namePath,
-        form: form,
-        fields: fields,
-        toolbarProps: toolbarProps
-      })]
+          fields: fields,
+          toolbarProps: toolbarProps
+        })]
+      })
     })
   });
 };

package/lib/ProForm/components/combination/FormList/propsType.d.ts

@@ -7,9 +7,9 @@ import type { ProFormColumnType, ProFormOtherType } from '../../../propsType';
 export type TitleRender = (record: Record<string, any>, index: number, form: FormInstance) => any;
 export type TitleType = string | React.ReactNode | TitleRender;
 type Callback = (record: any, option: Pick<Option, 'namePath' | 'index' | 'operation' | 'form'>) => any | void;
-export type ToolbarCallback = (record: any, option: Pick<Option, 'namePath' | 'form' | 'operation'>) => any | void;
+export type ToolbarCallback = (record: any, option: Pick<Option, 'index' | 'namePath' | 'form' | 'operation'>) => any | void;
 export interface Option {
-    index: number;
+    index: number | undefined;
     namePath: InternalNamePath;
     form: FormInstance;
     operation: FormListOperation;
@@ -23,12 +23,14 @@ export interface ActionType extends Omit<ButtonProps, 'onClick' | 'type'> {
     confirmProps?: boolean | PopconfirmProps;
     title?: string;
     show?: boolean | ((record: any, option: Pick<Option, 'index' | 'form' | 'namePath'>) => boolean);
+    addIndex?: number | ((record: any, option: Pick<Option, 'index' | 'form' | 'namePath' | 'operation'>) => number);
 }
 export interface ToolbarActionType extends Omit<ActionType, 'actionType' | 'onHandle' | 'onClick' | 'show' | 'type'> {
     type?: 'add';
     onHandle?: ToolbarCallback;
     onClick?: ToolbarCallback;
     show?: boolean | ((record: any, option: Pick<Option, 'form' | 'namePath'>) => boolean);
+    addIndex?: number | ((record: any, option: Pick<Option, 'index' | 'form' | 'namePath' | 'operation'>) => number);
 }
 export type FormListMode = 'block' | 'line' | 'less';
 export interface FormListType {
@@ -56,6 +58,9 @@ export interface FormListType {
     draggable?: boolean;
     id?: string;
     emptyBtnText?: string;
+    hideStartEndActionProps?: [boolean, boolean];
+    titlePosition?: 'top' | 'left';
+    className?: string;
 }
 export type TypeWithRef = FormListType & React.RefAttributes<FormListRefType>;
 export interface FormListRefType {

package/lib/ProForm/components/combination/FormList/style/index.less

@@ -93,3 +93,44 @@
     }
   }
 }
+
+// 左侧标题布局样式
+.pro-form-list-mode-block.pro-form-list-title-left {
+  .@{ant-prefix}-collapse-header-text{
+    display: none;
+  }
+  .pro-form-list-left-title-wrapper {
+    display: flex;
+    gap: 16px;
+    align-items: flex-start;
+
+    .pro-form-list-left-title {
+      flex: 0 0 80px;
+      font-weight: 600;
+      font-size: 14px;
+      line-height: 1.4;
+      color: @zaui-text;
+      padding-top: 8px;
+    }
+
+    .pro-form-list-left-content {
+      flex: 1;
+      min-width: 0;
+    }
+  }
+
+  // 移动端响应式
+  @media (max-width: 768px) {
+    .pro-form-list-left-title-wrapper {
+      flex-direction: column;
+      gap: 8px;
+
+      .pro-form-list-left-title {
+        flex: none;
+        width: 100%;
+        padding-top: 0;
+        margin-bottom: 8px;
+      }
+    }
+  }
+}

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.21",
+  "version": "3.13.22-beta.1",
   "license": "MIT",
+  "engines": {
+    "node": ">=18.19.0"
+  },
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
@@ -12,7 +15,7 @@
     "build-es": "father build --format esm",
     "build-lib": "father build --format cjs",
     "build-dist": "father build --format umd",
-    "docs": "dumi build",
+    "docs": "export NODE_OPTIONS=--openssl-legacy-provider && dumi build",
     "docs:deploy": "gh-pages -d docs-dist",
     "lint": "npm run lint:js && npm run lint:style && npm run lint:prettier",
     "lint-staged": "lint-staged",