@zat-design/sisyphus-react 3.0.16-beta.4 → 3.1.4

package/lib/ProForm/components/base/SwitchCheckbox/style/index.less

@@ -3,11 +3,10 @@
   align-items: center;
 
   .switch-checkbox-view-label {
-    width      : var(--zaui-form-label-width, 130px);
-    max-width  : var(--zaui-form-label-width, 130px);
+    flex         : 0 0 @zaui-form-label-width;
     overflow   : initial;
     line-height: 1;
     white-space: pre-wrap;
     color      : var(--zaui-aide-text, #939599);
   }
-}
+}

package/lib/ProForm/components/base/TextArea/index.d.ts

@@ -1,6 +1,7 @@
-import { TextAreaProps } from 'antd/lib/input';
+import { TextAreaProps } from 'antd/es/input';
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
+import './index.less';
 export interface Props extends TextAreaProps {
     otherProps?: ProFormOtherProps;
 }

package/lib/ProForm/components/base/TextArea/index.js

@@ -7,36 +7,43 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
-var _sisyphusReact = require("@zat-design/sisyphus-react");
-var _react = _interopRequireDefault(require("react"));
-var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["placeholder", "otherProps"];
+var _classnames = _interopRequireDefault(require("classnames"));
+var _ProConfigProvider = require("../../../../ProConfigProvider");
+require("./index.less");
+var _excluded = ["placeholder", "otherProps", "className"];
 var TextArea = _antd.Input.TextArea;
 var TextAreaDef = function TextAreaDef(props) {
   var placeholder = props.placeholder,
     otherProps = props.otherProps,
+    className = props.className,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},
     label = _ref.label,
     isView = _ref.isView,
     viewEmpty = _ref.viewEmpty;
-  var initialConfig = (0, _sisyphusReact.useProConfig)('TextArea');
+  var initialConfig = (0, _ProConfigProvider.useProConfig)('TextArea');
+  var disabled = (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.disabled) || rest.disabled;
   if (isView) {
-    return /*#__PURE__*/_react.default.createElement(_Container.default, {
-      tooltip: true,
-      viewEmpty: viewEmpty
-    }, rest.value);
+    disabled = true;
   }
-  return /*#__PURE__*/_react.default.createElement(TextArea, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-    className: props.disabled ? 'disabled' : '',
+  var _className = (0, _classnames.default)({
+    'pro-textarea': true,
+    disabled: disabled,
+    'pro-textarea-view': isView,
+    className: className
+  });
+  return (0, _jsxRuntime.jsx)(TextArea, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     showCount: true,
     autoComplete: "off",
     placeholder: placeholder || "\u8BF7\u8F93\u5165".concat(label || ''),
     autoSize: {
       minRows: 4
     }
-  }, initialConfig), rest));
+  }, initialConfig), rest), {}, {
+    disabled: disabled,
+    className: _className
+  }));
 };
-var _default = TextAreaDef;
-exports.default = _default;
+var _default = exports.default = TextAreaDef;

package/lib/ProForm/components/base/TextArea/index.less

@@ -0,0 +1,11 @@
+.pro-textarea {
+}
+div.pro-textarea-view {
+  .ant-input-disabled {
+    background: transparent !important;
+  }
+  &::after {
+    display: none;
+    padding-bottom: 11px;
+  }
+}

package/lib/ProForm/components/base/TimePicker/index.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+import type { TimePickerProps } from 'antd/es/time-picker';
+import { ProFormOtherProps } from '../../../propsType';
+import './style/index.less';
+export interface Props {
+    valueType?: string;
+    format?: string;
+    onChange?: (value: string) => void;
+    value?: string;
+    otherProps?: ProFormOtherProps;
+}
+declare const TimePicker: React.FC<Props & TimePickerProps>;
+export default TimePicker;

package/lib/ProForm/components/base/TimePicker/index.js

@@ -0,0 +1,48 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
+var _moment = _interopRequireDefault(require("moment"));
+var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _Container = _interopRequireDefault(require("../../Container"));
+require("./style/index.less");
+var _excluded = ["format", "onChange", "value", "otherProps"];
+var TimePicker = function TimePicker(props) {
+  var _props$format = props.format,
+    format = _props$format === void 0 ? 'HH:mm:ss' : _props$format,
+    onChange = props.onChange,
+    value = props.value,
+    otherProps = props.otherProps,
+    rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _ref = otherProps || {},
+    isView = _ref.isView,
+    viewEmpty = _ref.viewEmpty,
+    _ref$valueType = _ref.valueType,
+    valueType = _ref$valueType === void 0 ? 'dateTime' : _ref$valueType;
+  var initialConfig = (0, _ProConfigProvider.useProConfig)('AntTimePicker');
+  var handleChange = function handleChange(value) {
+    if (valueType === 'dateTime') {
+      onChange && onChange(value ? (0, _moment.default)(value).format(format) : undefined);
+    }
+  };
+  if (isView) {
+    return (0, _jsxRuntime.jsx)(_Container.default, {
+      viewEmpty: viewEmpty,
+      children: value
+    });
+  }
+  return (0, _jsxRuntime.jsx)(_antd.TimePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+    value: value ? (0, _moment.default)(value, format) : undefined
+  }, initialConfig), rest), {}, {
+    format: format,
+    onChange: handleChange
+  }));
+};
+var _default = exports.default = TimePicker;

package/lib/ProForm/components/base/TimePicker/style/index.less

@@ -0,0 +1,3 @@
+.ant-picker {
+  display: flex;
+}

package/lib/ProForm/components/combination/Container/index.d.ts

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

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

@@ -0,0 +1,65 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _react = require("react");
+var _lodash = require("lodash");
+var _classnames2 = _interopRequireDefault(require("classnames"));
+var _RenderFields = _interopRequireDefault(require("../../render/RenderFields"));
+var _ProCollapse = _interopRequireDefault(require("../../../../ProLayout/components/ProCollapse"));
+var Container = function Container(props) {
+  var children = props.children,
+    otherProps = props.otherProps,
+    className = props.className,
+    container = props.container;
+  var type = otherProps.type,
+    form = otherProps.form,
+    show = otherProps.show,
+    required = otherProps.required,
+    disabled = otherProps.disabled;
+  var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
+    'pro-container': true,
+    'pro-container-diy': type === 'Container'
+  }, "".concat(className), className));
+  var _children = (0, _react.useMemo)(function () {
+    var result = children.map(function (item) {
+      return (0, _objectSpread2.default)({
+        show: show,
+        required: required,
+        disabled: disabled
+      }, item);
+    });
+    return result;
+  }, [children]);
+  var childRender = function childRender() {
+    var child = (0, _jsxRuntime.jsx)(_RenderFields.default, (0, _objectSpread2.default)({
+      columns: _children,
+      form: form
+    }, otherProps));
+    if (type === 'ProCollapse') {
+      return (0, _jsxRuntime.jsx)(_ProCollapse.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(props, ['otherProps', 'children', 'onBlur', 'onChange', 'placeholder', 'className'])), {}, {
+        children: child
+      }));
+    }
+    if (type === 'Container') {
+      return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        children: [container, (0, _jsxRuntime.jsx)("div", {
+          className: "pro-container-content",
+          children: child
+        })]
+      });
+    }
+    return child;
+  };
+  return (0, _jsxRuntime.jsx)("div", {
+    className: _className,
+    children: childRender()
+  });
+};
+var _default = exports.default = Container;

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

@@ -0,0 +1,10 @@
+import React from 'react';
+import { RowProps } from 'antd';
+import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
+export interface ContainerProps {
+    children?: ProColumnProps[];
+    otherProps?: ProFormOtherProps;
+    rowProps?: RowProps;
+    className?: string;
+    container?: string | React.ReactNode;
+}

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

@@ -0,0 +1,37 @@
+.pro-container {
+
+  &.pro-container-diy {
+    .pro-container-content {
+      display      : flex;
+      flex-flow    : row wrap;
+      min-width    : 0;
+      margin-left  : -12px;
+      margin-right : -12px;
+      margin-bottom: -22px;
+
+      &>.ant-col {
+        padding-left : 12px;
+        padding-right: 12px;
+      }
+    }
+
+  }
+
+  .pro-collapse-content {
+    display         : flex;
+    flex-flow       : row wrap;
+    min-width       : 0;
+    margin-left     : -12px;
+    margin-right    : -12px;
+    // margin-bottom: -22px;
+
+    &>.ant-col {
+      padding-left : 12px;
+      padding-right: 12px;
+    }
+  }
+
+  .pro-collapse.ant-collapse .pro-collapse-panel {
+    margin-bottom: 0;
+  }
+}

package/{es/ProForm/components/base → lib/ProForm/components/combination}/FormList/components/ActionButton.d.ts

@@ -1,19 +1,22 @@
 import { FormInstance, FormListFieldData, FormListOperation } from 'antd';
-import { InternalNamePath } from 'antd/lib/form/interface';
+import { InternalNamePath } from 'antd/es/form/interface';
 import React from 'react';
-import { Props as FormListProps, ActionProps, FormListMode } from '../index';
+import { FormListProps, ActionProps, FormListMode } from '../propsType';
 export interface Props {
     min?: FormListProps['min'];
     max?: FormListProps['max'];
     actionProps: ActionProps[];
     namePath: InternalNamePath;
     form: FormInstance;
-    field: FormListFieldData;
+    field: Omit<FormListFieldData, 'key'> & {
+        key: string;
+    };
     operation: FormListOperation;
     index: number;
     length: number;
     fields: FormListFieldData[];
     mode: FormListMode;
+    disabled?: boolean;
 }
 declare const ActionButton: React.FC<Props>;
 export default ActionButton;

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

@@ -0,0 +1,243 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _react = require("react");
+var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
+var _lodash = require("lodash");
+var _icons = require("@ant-design/icons");
+var _ProIcon = _interopRequireDefault(require("../../../../../ProIcon"));
+var _excluded = ["label", "onClick", "onHandle", "actionType", "needConfirm", "confirmProps", "title"],
+  _excluded2 = ["onClick", "label"];
+var getDefaultActions = function getDefaultActions(mode) {
+  var originActions = {
+    add: {
+      onClick: function onClick(record, _ref) {
+        var namePath = _ref.namePath,
+          index = _ref.index,
+          operation = _ref.operation,
+          form = _ref.form;
+        var add = operation.add;
+        add(undefined, index + 1);
+      },
+      type: 'text',
+      label: '新增',
+      icon: (0, _jsxRuntime.jsx)(_icons.PlusSquareOutlined, {})
+    },
+    delete: {
+      onClick: function onClick(record, _ref2) {
+        var namePath = _ref2.namePath,
+          index = _ref2.index,
+          operation = _ref2.operation,
+          form = _ref2.form;
+        var remove = operation.remove;
+        remove(index);
+      },
+      type: 'text',
+      label: '删除',
+      icon: mode === 'less' ? (0, _jsxRuntime.jsx)(_ProIcon.default, {
+        type: "solid-close",
+        className: "single-delete"
+      }) : (0, _jsxRuntime.jsx)(_ProIcon.default, {
+        type: "delete"
+      })
+    },
+    copy: {
+      onClick: function onClick(record, _ref3) {
+        var namePath = _ref3.namePath,
+          index = _ref3.index,
+          operation = _ref3.operation,
+          form = _ref3.form;
+        var add = operation.add;
+        add(record, index + 1);
+      },
+      type: 'text',
+      label: '复制',
+      icon: (0, _jsxRuntime.jsx)(_icons.CopyOutlined, {})
+    },
+    moveUp: {
+      onClick: function onClick(record, _ref4) {
+        var namePath = _ref4.namePath,
+          index = _ref4.index,
+          operation = _ref4.operation,
+          form = _ref4.form;
+        var move = operation.move;
+        move(index, index - 1);
+      },
+      type: 'text',
+      label: '上移',
+      icon: (0, _jsxRuntime.jsx)(_icons.UpSquareOutlined, {})
+    },
+    moveDown: {
+      onClick: function onClick(record, _ref5) {
+        var namePath = _ref5.namePath,
+          index = _ref5.index,
+          operation = _ref5.operation,
+          form = _ref5.form;
+        var move = operation.move;
+        move(index, index + 1);
+      },
+      type: 'text',
+      label: '下移',
+      icon: (0, _jsxRuntime.jsx)(_icons.DownSquareOutlined, {})
+    }
+  };
+  if (mode === 'block') {
+    Object.keys(originActions).forEach(function (key) {
+      originActions[key].type = 'default';
+    });
+  }
+  if (mode === 'line') {
+    Object.keys(originActions).forEach(function (key) {
+      delete originActions[key].label;
+    });
+  }
+  if (mode === 'less') {
+    Object.keys(originActions).forEach(function (key) {
+      delete originActions[key].label;
+    });
+  }
+  return originActions;
+};
+var defaultActionProps = [{
+  actionType: 'delete'
+}];
+var ActionButton = function ActionButton(props) {
+  var namePath = props.namePath,
+    form = props.form,
+    field = props.field,
+    operation = props.operation,
+    index = props.index,
+    length = props.length,
+    disabled = props.disabled,
+    fields = props.fields,
+    min = props.min,
+    max = props.max,
+    mode = props.mode;
+  // 默认显示一个delete
+  var actionProps = (0, _react.useMemo)(function () {
+    var _props$actionProps;
+    if (!((_props$actionProps = props.actionProps) === null || _props$actionProps === void 0 ? void 0 : _props$actionProps.find(function (item) {
+      return item.actionType === 'delete';
+    }))) {
+      return (props === null || props === void 0 ? void 0 : props.actionProps) ? [].concat((0, _toConsumableArray2.default)(props.actionProps), defaultActionProps) : defaultActionProps;
+    }
+    return props.actionProps;
+  }, [props.actionProps]);
+  var handleClick = function handleClick(callback, index, item) {
+    var value = form.getFieldValue(namePath);
+    var data = callback === null || callback === void 0 ? void 0 : callback(value, {
+      namePath: namePath,
+      index: index,
+      operation: operation,
+      form: form
+    });
+    if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add') {
+      operation.add(data, index !== undefined ? index + 1 : undefined);
+    }
+  };
+  var defaultActions = (0, _react.useMemo)(function () {
+    return getDefaultActions(mode);
+  }, [mode]);
+  return (0, _jsxRuntime.jsx)(_antd.Space, {
+    align: "start",
+    className: "pro-form-list-action",
+    children: actionProps === null || actionProps === void 0 ? void 0 : actionProps.map(function (item) {
+      if (item.show === false) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+      if ((0, _lodash.isFunction)(item.show) && !item.show(form.getFieldValue(namePath), {
+        namePath: namePath,
+        index: index,
+        form: form
+      })) {
+        return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+      }
+      var label = item.label,
+        onClick = item.onClick,
+        onHandle = item.onHandle,
+        actionType = item.actionType,
+        needConfirm = item.needConfirm,
+        confirmProps = item.confirmProps,
+        title = item.title,
+        rest = (0, _objectWithoutProperties2.default)(item, _excluded);
+      var _needConfirm = needConfirm || confirmProps;
+      var _confirmProps = !confirmProps || confirmProps === true ? {} : confirmProps;
+      var _onClick = onClick || onHandle;
+      if (['add', 'delete', 'copy', 'moveUp', 'moveDown'].includes(actionType)) {
+        // 禁用状态默认隐藏内置操作按钮
+        if (disabled) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+        var _defaultActions$actio = defaultActions[actionType],
+          internalOnClick = _defaultActions$actio.onClick,
+          defaultLabel = _defaultActions$actio.label,
+          defaultRest = (0, _objectWithoutProperties2.default)(_defaultActions$actio, _excluded2);
+        // 小于min不可删除
+        if (min && min >= fields.length && ['delete'].includes(actionType)) {
+          return false;
+        }
+        // 大于等于max不可新增和复制
+        if (max && max <= fields.length && ['add', 'copy'].includes(actionType)) {
+          return false;
+        }
+        // 下标为零 不可向上移动
+        if (index === 0 && ['moveUp'].includes(actionType)) {
+          return false;
+        }
+        // 下标最大 不可向下移动
+        if (index + 1 === fields.length && ['moveDown'].includes(actionType)) {
+          return false;
+        }
+        return _needConfirm ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+          title: title !== null && title !== void 0 ? title : '您确定要删除该条数据吗?',
+          onCancel: function onCancel(e) {
+            return e.stopPropagation();
+          },
+          onConfirm: function onConfirm(e) {
+            handleClick(_onClick || internalOnClick, index, item);
+          }
+        }, _confirmProps), {}, {
+          children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), rest), {}, {
+            onClick: function onClick(e) {
+              return e.stopPropagation();
+            },
+            children: label || defaultLabel
+          }))
+        }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), rest), {}, {
+          onClick: function onClick(e) {
+            e.stopPropagation();
+            handleClick(_onClick || internalOnClick, index, item);
+          },
+          children: label || defaultLabel
+        }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
+      }
+      return needConfirm ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        title: title !== null && title !== void 0 ? title : '您确定要删除该条数据吗?',
+        onCancel: function onCancel(e) {
+          return e.stopPropagation();
+        },
+        onConfirm: function onConfirm() {
+          return handleClick(_onClick, index);
+        }
+      }, _confirmProps), {}, {
+        children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+          onClick: function onClick(e) {
+            return e.stopPropagation();
+          },
+          children: label
+        }))
+      }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : /*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+        key: "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index),
+        onClick: function onClick(e) {
+          e.stopPropagation();
+          handleClick(_onClick, index);
+        }
+      }), label);
+    })
+  });
+};
+var _default = exports.default = ActionButton;

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

@@ -0,0 +1,19 @@
+import { ColProps, FormListFieldData } from 'antd';
+import React from 'react';
+import { InternalNamePath } from 'antd/es/form/interface';
+import type { levelType } from '@/ProLayout/components/ProCollapse/PropTypes';
+import type { FormListProps } from '../propsType';
+interface Props extends Omit<FormListProps, 'toolbarProps'> {
+    index: number;
+    namePath: InternalNamePath;
+    disabled?: boolean;
+    isView?: boolean;
+    colProps: ColProps;
+    field: Omit<FormListFieldData, 'key'> & {
+        key: string;
+    };
+    level?: levelType;
+    towCollapse?: boolean;
+}
+declare const BlockFields: React.FC<Props>;
+export default BlockFields;

package/lib/ProForm/components/{base → combination}/FormList/components/BlockFields.js

@@ -1,13 +1,13 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("react");
 var _lodash = require("lodash");
 var _ActionButton = _interopRequireDefault(require("./ActionButton"));
 var _RenderFields = _interopRequireDefault(require("../../../render/RenderFields"));
@@ -38,38 +38,40 @@ var BlockFields = function BlockFields(props) {
     }
     return title;
   }, [title, index]);
-  return /*#__PURE__*/_react.default.createElement(_antd.Space, {
-    direction: "vertical"
-  }, /*#__PURE__*/_react.default.createElement(_ProCollapse.default, {
-    title: _title,
-    index: index,
-    form: form,
-    // namePath={namePath}
-    level: level,
-    towCollapse: towCollapse,
-    extra: /*#__PURE__*/_react.default.createElement(_ActionButton.default, {
-      min: min,
-      max: max,
+  return (0, _jsxRuntime.jsx)(_antd.Space, {
+    direction: "vertical",
+    children: (0, _jsxRuntime.jsx)(_ProCollapse.default, {
+      title: _title,
       index: index,
-      length: fields.length,
-      operation: operation,
-      namePath: namePath,
       form: form,
-      field: field,
-      fields: fields,
-      actionProps: actionProps,
-      mode: mode
+      // namePath={namePath}
+      level: level,
+      towCollapse: towCollapse,
+      extra: actionProps !== false && (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
+      }),
+      children: (0, _jsxRuntime.jsx)(_antd.Row, {
+        gutter: 24,
+        children: (0, _jsxRuntime.jsx)(_RenderFields.default, {
+          columns: columns,
+          form: form,
+          colProps: colProps,
+          disabled: disabled,
+          isView: isView
+        })
+      }, field.key)
     })
-  }, /*#__PURE__*/_react.default.createElement(_antd.Row, {
-    key: field.key,
-    gutter: 24
-  }, /*#__PURE__*/_react.default.createElement(_RenderFields.default, {
-    columns: columns,
-    form: form,
-    colProps: colProps,
-    disabled: disabled,
-    isView: isView
-  }))));
+  });
 };
-var _default = BlockFields;
-exports.default = _default;
+var _default = exports.default = BlockFields;

package/lib/ProForm/components/{base → combination}/FormList/components/BlockTitle.d.ts

@@ -1,9 +1,7 @@
 import React from 'react';
-import { NamePath } from 'antd/lib/form/interface';
+import { NamePath } from 'antd/es/form/interface';
 import { FormInstance } from 'antd';
-import { FormListMode } from '../index';
-export type TitleRender = (record: Record<string, any>, index: number, form: FormInstance) => any;
-export type TitleType = string | React.ReactNode | TitleRender;
+import type { FormListMode, TitleType } from '../propsType';
 interface Props {
     mode: FormListMode;
     namePath: NamePath;