@zat-design/sisyphus-react 3.4.10 → 3.4.11-beta.2

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

@@ -160,11 +160,6 @@ var RenderField = function RenderField(_ref) {
     _formItemProps.valuePropName = 'checked';
     valueType = 'switch';
   }
-  // 针对Percentage特殊处理
-  if (type === 'Percentage') {
-    type = 'InputNumber';
-    valueType = 'percentage';
-  }
   /**
    * 针对一些特殊类型，基于formItem的normalize与getValueProps进行默认值类型转换
    * @returns {}
@@ -292,7 +287,7 @@ var RenderField = function RenderField(_ref) {
     return nextArgs;
   };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
-  var _onchange = debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var _onChange = debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _len2,
       args,
       _key2,
@@ -319,7 +314,7 @@ var RenderField = function RenderField(_ref) {
           }
           _args = [].concat(args);
           rowPath = [].concat(_toConsumableArray(namePath), [index]);
-          row = form.getFieldValue(rowPath, true);
+          row = form.getFieldValue(rowPath, true); // if (type === 'InputNumber' && column.name) row[column.name] = args[0];
           orgRow = cloneDeep(row);
           if (!onFieldChange) {
             _context.next = 18;
@@ -372,7 +367,7 @@ var RenderField = function RenderField(_ref) {
             });
             if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
               setTimeout(function () {
-                form.validateFields(validateFieldKeys);
+                form.validateFields([name].concat(_toConsumableArray(validateFieldKeys)));
               }, 100);
             }
           }
@@ -410,7 +405,7 @@ var RenderField = function RenderField(_ref) {
             }
             _args = formatArgs([].concat(args));
             rowPath = [].concat(_toConsumableArray(namePath), [index]);
-            row = form.getFieldValue(rowPath, true);
+            row = form.getFieldValue(rowPath, true); // if (type === 'InputNumber' && column.name) row[column.name] = args[0];
             orgRow = cloneDeep(row);
             _args[1] = row;
             _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;
@@ -488,12 +483,13 @@ var RenderField = function RenderField(_ref) {
   }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
     namePath: [].concat(_toConsumableArray(namePath), [index]),
     disabled: _disabled,
-    onChange: _onchange,
+    onChange: _onChange,
     onBlur: _onblur,
     index: index,
     otherProps: {
       form: form,
       names: names,
+      namePath: [].concat(_toConsumableArray(namePath), [index]),
       name: cellName,
       listName: cellName,
       viewEmpty: viewEmpty,

package/es/ProEditTable/index.js

@@ -1,8 +1,6 @@
 import "antd/es/table/style";
 import _Table from "antd/es/table";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/config-provider/style";
@@ -11,11 +9,11 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "footerRender"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray } from 'lodash';
-import { useDebounceEffect, useLocalStorageState, useSetState } from 'ahooks';
+import { useLocalStorageState, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { transformColumns } from './utils';
 import { getRandom, getNamePath } from './utils/tools';
@@ -52,6 +50,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     originalDiffTip = _ref.originalDiffTip,
     rowKey = _ref.rowKey,
     rowDisabled = _ref.rowDisabled,
+    footerRender = _ref.footerRender,
     resetProps = _objectWithoutProperties(_ref, _excluded);
   // 上下文form
   var contentForm = _Form.useFormInstance();
@@ -95,8 +94,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     _useSetState2 = _slicedToArray(_useSetState, 2),
     state = _useSetState2[0],
     setState = _useSetState2[1];
-  var _columns = state._columns,
-    cellNamePath = state.cellNamePath,
+  var cellNamePath = state.cellNamePath,
     forceUpdate = state.forceUpdate,
     editingKeys = state.editingKeys,
     virtualKey = state.virtualKey,
@@ -173,6 +171,25 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     }
     return className;
   };
+  // 判断是否禁止添加、批量删除
+  var isForbiddenBtn = useCallback(function (type) {
+    // 当工具栏不渲染时，都不渲染
+    if (toolbarProps === false) {
+      return true;
+    }
+    // 通过配置项配置show 为 false 开启关闭添加与批量删除
+    if (Array.isArray(toolbarProps)) {
+      var addBtnConfig = toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.find(function (item) {
+        return item.type === type;
+      });
+      if (typeof (addBtnConfig === null || addBtnConfig === void 0 ? void 0 : addBtnConfig.show) === 'function') {
+        addBtnConfig.show = addBtnConfig.show();
+      }
+      return (addBtnConfig === null || addBtnConfig === void 0 ? void 0 : addBtnConfig.show) === false;
+    }
+  }, [toolbarProps]);
+  // 是否隐藏勾选框
+  var isHideCheckBox = isForbiddenBtn('mulDelete');
   // 复选框
   var _rowSelection = _objectSpread({
     fixed: true,
@@ -191,25 +208,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         };
       }
       return {};
-    }
+    },
+    hideSelectAll: isHideCheckBox
   }, rowSelection);
-  // 判断是否禁止添加、批量删除
-  var isForbiddenBtn = useCallback(function (type) {
-    // 当工具栏不渲染时，都不渲染
-    if (toolbarProps === false) {
-      return true;
-    }
-    // 通过配置项配置show 为 false 开启关闭添加与批量删除
-    if (Array.isArray(toolbarProps)) {
-      var addBtnConfig = toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.find(function (item) {
-        return item.type === type;
-      });
-      if (typeof (addBtnConfig === null || addBtnConfig === void 0 ? void 0 : addBtnConfig.show) === 'function') {
-        addBtnConfig.show = addBtnConfig.show();
-      }
-      return (addBtnConfig === null || addBtnConfig === void 0 ? void 0 : addBtnConfig.show) === false;
-    }
-  }, [toolbarProps]);
   // 分页变更
   var handlePageChange = useCallback(function (current, pageSize) {
     setState({
@@ -245,41 +246,29 @@ var ProEditTable = function ProEditTable(_ref, ref) {
    * @returns rowSelection
    */
   var renderRowSelection = function renderRowSelection() {
-    if (disabled || isView) {
+    if (disabled || isView || isHideCheckBox) {
       return null;
     }
-    return isForbiddenBtn('mulDelete') ? rowSelection : _rowSelection;
+    return _rowSelection;
   };
-  var setColumns = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var nextColumns;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return transformColumns(columns, config);
-          case 2:
-            nextColumns = _context.sent;
-            setState({
-              _columns: nextColumns
-            });
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function setColumns() {
-      return _ref4.apply(this, arguments);
-    };
-  }();
-  useDebounceEffect(function () {
-    setColumns();
-  }, [value, cellNamePath, forceUpdate, editingKeys, disabled, actionProps, columns, page],
-  // columns更新修复外部表单无法控制内部表单的问题
-  {
-    wait: 60
-  });
+  var _columns = useMemo(function () {
+    return transformColumns(columns, config);
+  }, [value, cellNamePath, forceUpdate, editingKeys, disabled, actionProps, columns, page, config.name]);
+  // const setColumns = async () => {
+  //   const nextColumns = transformColumns(columns, config);
+  //   setState({
+  //     _columns: nextColumns,
+  //   });
+  // };
+  // useDebounceEffect(
+  //   () => {
+  //     setColumns();
+  //   },
+  //   [value, cellNamePath, forceUpdate, editingKeys, disabled, actionProps, columns, page], // columns更新修复外部表单无法控制内部表单的问题
+  //   {
+  //     wait: 60,
+  //   },
+  // );
   useEffect(function () {
     var _value$;
     // 初始化默认生成row-key
@@ -341,6 +330,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
           onRow: function onRow() {
             return {
               disabled: disabled || virtualKey && !!editingKeys.length,
+              isHideCheckBox: isHideCheckBox,
               onClick: function onClick() {}
             };
           }
@@ -366,6 +356,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       }), !isView && (value === null || value === void 0 ? void 0 : value.length) ? _jsx("div", {
         className: "pro-edit-table-toolbar".concat(pagination ? ' pro-edit-table-toolbar-fixed' : ''),
         children: _jsx(RenderToolbar, _objectSpread({}, config))
+      }) : null, footerRender ? _jsx("div", {
+        className: "pro-edit-table-footer",
+        children: footerRender
       }) : null]
     }), _jsx(Validator, {
       name: name,

package/es/ProEditTable/propsType.d.ts

@@ -217,6 +217,11 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @default           -
      */
     actionProps?: BaseActionProps<T>[] | boolean;
+    /**
+     * @description       自定义 table footer 左侧渲染, 配置后toolbarProps会失效
+     * @default           -
+     */
+    footerRender?: ReactNode;
     /**
      * @description       自定义底部操作栏 默认为添加、删除（批量）
      * @default           -

package/es/ProEditTable/style/index.less

@@ -5,6 +5,7 @@
   td[rowspan]{
     vertical-align: middle !important;
   }
+
   .pro-edit-table-tooltip {
     display    : inline-flex;
     align-items: center;
@@ -71,6 +72,11 @@
       cursor: pointer;
     }
   }
+  .drag-wrapper.no-check {
+    .anticon {
+      margin-right: 0;
+    }
+  }
 
   &.pro-table-no-stripe {
     .@{ant-prefix}-table-tbody tr:nth-child(n)>td {
@@ -282,6 +288,10 @@
   }
 }
 
+.pro-edit-table-footer{
+  margin-top: 12px;
+}
+
 .pro-edit-table-header {
   margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
 }

package/es/ProForm/components/base/DatePicker/useDateLimit.d.ts

@@ -0,0 +1,9 @@
+import { DurationInputArg1, DurationInputArg2, Moment } from 'moment';
+interface Props {
+    range?: [Moment?, Moment?];
+    limit?: [DurationInputArg1, DurationInputArg2];
+}
+export declare const useDateLimit: (props: Props) => {
+    onCalendarChange: (val: any) => void;
+};
+export {};

package/es/ProForm/components/base/DatePicker/useDateLimit.js

@@ -0,0 +1,15 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useState } from 'react';
+export var useDateLimit = function useDateLimit(props) {
+  var range = props.range,
+    limit = props.limit;
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    dates = _useState2[0],
+    setDates = _useState2[1];
+  return {
+    onCalendarChange: function onCalendarChange(val) {
+      return setDates(val);
+    }
+  };
+};

package/es/ProForm/components/base/InputNumber/index.js

@@ -6,9 +6,9 @@ import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["placeholder", "className", "otherProps", "range", "min", "max", "onBlur"];
+var _excluded = ["placeholder", "className", "otherProps", "range", "min", "max", "onBlur", "onFocus"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useMemo } from 'react';
+import { useMemo, useRef } from 'react';
 import classNames from 'classnames';
 import Big from 'big.js';
 import { tools } from '@zat-design/utils';
@@ -42,6 +42,7 @@ var InputNumber = function InputNumber(props) {
     min = props.min,
     max = props.max,
     onBlur = props.onBlur,
+    onFocus = props.onFocus,
     rest = _objectWithoutProperties(props, _excluded);
   var _ref2 = ProForm.useFieldProps() || {},
     isViewCon = _ref2.isView,
@@ -49,34 +50,45 @@ var InputNumber = function InputNumber(props) {
     valueType = _ref2.valueType,
     viewType = _ref2.viewType,
     label = _ref2.label;
+  var initialConfig = useProConfig('InputNumber');
+  var activateRef = useRef(false);
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var valueProps = {};
+  var formatter = function formatter(value) {
+    if (value === '') return '';
+    var num = Number(value);
+    if (Number.isNaN(num)) {
+      return value;
+    }
+    var val = num.toLocaleString('en-US', {
+      maximumFractionDigits: (props === null || props === void 0 ? void 0 : props.precision) || 2
+    });
+    if (!activateRef.current) {
+      var _val$split = val.split('.'),
+        _val$split2 = _slicedToArray(_val$split, 2),
+        int = _val$split2[0],
+        _val$split2$ = _val$split2[1],
+        float = _val$split2$ === void 0 ? '' : _val$split2$;
+      return "".concat(int, ".").concat(float.padEnd((props === null || props === void 0 ? void 0 : props.precision) || 2, '0'));
+    }
+    return val;
+  };
+  var _parser = function parser(value, precision) {
+    var num = Number(value.replace(/[\s,]+/g, ''));
+    if (value === '') return value;
+    return Number.isNaN(num) || !precision ? value : num.toFixed(precision);
+  };
   if (valueType) {
     switch (valueType) {
-      // 千分比
+      // 千分位
       case 'thousandth':
       case 'thousandthCNY':
       case 'money':
       case 'amount':
         valueProps = {
-          formatter: function formatter(value) {
-            if (value === '') {
-              return '';
-            }
-            var num = Number(value);
-            if (Number.isNaN(num)) {
-              return value;
-            }
-            return num.toLocaleString('en-US', {
-              maximumFractionDigits: (props === null || props === void 0 ? void 0 : props.precision) || 2
-            });
-          },
-          parser: function parser(value) {
-            var num = Number(value.replace(/[\s,]+/g, ''));
-            if (value === '') {
-              return value;
-            }
-            return Number.isNaN(num) ? value : num.toFixed((props === null || props === void 0 ? void 0 : props.precision) || 2);
+          formatter: formatter,
+          parser: function parser(val) {
+            return _parser(val, (props === null || props === void 0 ? void 0 : props.precision) || 2);
           }
         };
         break;
@@ -144,7 +156,6 @@ var InputNumber = function InputNumber(props) {
     _useMemo2 = _slicedToArray(_useMemo, 2),
     _min = _useMemo2[0],
     _max = _useMemo2[1];
-  var initialConfig = useProConfig('InputNumber');
   var _className = classNames(_defineProperty({
     'full-form-item': true
   }, className, !!className));
@@ -222,15 +233,12 @@ var InputNumber = function InputNumber(props) {
   // 失去焦点时处理数字，
   var handleBlur = function handleBlur(e) {
     var _e$target, _e$target2;
-    var value = Number(e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value);
+    activateRef.current = false;
+    var value = _parser(e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value, props.precision);
     var limit = {
       min: Number(_min),
       max: Number(_max)
     };
-    // 截取数字指定精度
-    if (props.precision !== undefined) {
-      value = Number(value.toFixed(props.precision));
-    }
     switch (valueType || viewType) {
       // 百分比
       case 'percent':
@@ -245,7 +253,12 @@ var InputNumber = function InputNumber(props) {
         value = limitNumber(value, limit);
         break;
     }
-    onBlur(value, Number(e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value));
+    onBlur === null || onBlur === void 0 ? void 0 : onBlur(value, Number(e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value));
+  };
+  // 获得焦点
+  var handleFocus = function handleFocus(e) {
+    activateRef.current = true;
+    onFocus === null || onFocus === void 0 ? void 0 : onFocus(e);
   };
   return _jsx(_InputNumber, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     autoComplete: "off",
@@ -253,6 +266,7 @@ var InputNumber = function InputNumber(props) {
     className: _className
   }, valueProps), initialConfig), rest), {}, {
     onBlur: handleBlur,
+    onFocus: handleFocus,
     min: _min,
     max: _max
   }));

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

@@ -1,6 +1,5 @@
 import "antd/es/button/style";
 import _Button from "antd/es/button";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/popconfirm/style";
 import _Popconfirm from "antd/es/popconfirm";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -9,7 +8,8 @@ import _Space from "antd/es/space";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-var _excluded = ["label", "onClick", "onHandle", "actionType", "needConfirm", "confirmProps", "title"],
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+var _excluded = ["label", "onClick", "onHandle", "type", "needConfirm", "confirmProps", "title"],
   _excluded2 = ["onClick", "label"];
 import { createElement as _createElement } from "react";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
@@ -28,7 +28,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var add = operation.add;
         add(undefined, index + 1);
       },
-      type: 'text',
       label: "".concat(locale.ProForm.formListActions[0]),
       icon: _jsx(PlusSquareOutlined, {})
     },
@@ -40,7 +39,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var remove = operation.remove;
         remove(index);
       },
-      type: 'text',
       label: "".concat(locale.ProForm.formListActions[1]),
       icon: mode === 'less' ? _jsx(ProIcon, {
         type: "solid-close",
@@ -57,7 +55,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var add = operation.add;
         add(record, index + 1);
       },
-      type: 'text',
       label: "".concat(locale.ProForm.formListActions[2]),
       icon: _jsx(CopyOutlined, {})
     },
@@ -69,7 +66,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var move = operation.move;
         move(index, index - 1);
       },
-      type: 'text',
       label: "".concat(locale.ProForm.formListActions[3]),
       icon: _jsx(UpSquareOutlined, {})
     },
@@ -81,7 +77,6 @@ var getDefaultActions = function getDefaultActions(mode) {
         var move = operation.move;
         move(index, index + 1);
       },
-      type: 'text',
       label: "".concat(locale.ProForm.formListActions[4]),
       icon: _jsx(DownSquareOutlined, {})
     }
@@ -105,7 +100,7 @@ var getDefaultActions = function getDefaultActions(mode) {
   return originActions;
 };
 var defaultActionProps = [{
-  actionType: 'delete'
+  type: 'delete'
 }];
 var ActionButton = function ActionButton(props) {
   var namePath = props.namePath,
@@ -123,12 +118,19 @@ var ActionButton = function ActionButton(props) {
   // 默认显示一个delete
   var actionProps = 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';
+    // 兼容 actionType 和 type
+    var _actionProps = (_props$actionProps = props.actionProps) === null || _props$actionProps === void 0 ? void 0 : _props$actionProps.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        // @ts-ignore
+        type: item.actionType
+      });
+    });
+    if (!(_actionProps === null || _actionProps === void 0 ? void 0 : _actionProps.find(function (item) {
+      return item.type === 'delete';
     }))) {
-      return (props === null || props === void 0 ? void 0 : props.actionProps) ? [].concat(_toConsumableArray(props.actionProps), defaultActionProps) : defaultActionProps;
+      return _actionProps ? [].concat(_toConsumableArray(_actionProps), defaultActionProps) : defaultActionProps;
     }
-    return props.actionProps;
+    return _actionProps;
   }, [props.actionProps]);
   var handleClick = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
@@ -158,7 +160,7 @@ var ActionButton = function ActionButton(props) {
             });
             return _context.abrupt("return");
           case 7:
-            if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add') {
+            if ((item === null || item === void 0 ? void 0 : item.type) === 'add') {
               operation.add(data, index !== undefined ? index + 1 : undefined);
             }
           case 8:
@@ -187,18 +189,18 @@ var ActionButton = function ActionButton(props) {
     align: "start",
     className: "pro-form-list-action",
     children: actionProps === null || actionProps === void 0 ? void 0 : actionProps.map(function (item) {
-      if (item.show === false) return _jsx("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
+      if (item.show === false) return _jsx("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index));
       if (isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath: namePath,
         index: index,
         form: form
       })) {
-        return _jsx("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
+        return _jsx("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index));
       }
       var label = item.label,
         onClick = item.onClick,
         onHandle = item.onHandle,
-        actionType = item.actionType,
+        type = item.type,
         needConfirm = item.needConfirm,
         confirmProps = item.confirmProps,
         title = item.title,
@@ -206,27 +208,27 @@ var ActionButton = function ActionButton(props) {
       var _needConfirm = needConfirm || confirmProps;
       var _confirmProps = !confirmProps || confirmProps === true ? {} : confirmProps;
       var _onClick = onClick || onHandle;
-      if (['add', 'delete', 'copy', 'moveUp', 'moveDown'].includes(actionType)) {
+      if (['add', 'delete', 'copy', 'moveUp', 'moveDown'].includes(type)) {
         // 禁用状态默认隐藏内置操作按钮
         if (disabled || isView) return _jsx(_Fragment, {});
-        var _defaultActions$actio = defaultActions[actionType],
-          internalOnClick = _defaultActions$actio.onClick,
-          defaultLabel = _defaultActions$actio.label,
-          defaultRest = _objectWithoutProperties(_defaultActions$actio, _excluded2);
+        var _defaultActions$type = defaultActions[type],
+          internalOnClick = _defaultActions$type.onClick,
+          defaultLabel = _defaultActions$type.label,
+          defaultRest = _objectWithoutProperties(_defaultActions$type, _excluded2);
         // 小于min不可删除
-        if (min && min >= fields.length && ['delete'].includes(actionType)) {
+        if (min && min >= fields.length && ['delete'].includes(type)) {
           return false;
         }
         // 大于等于max不可新增和复制
-        if (max && max <= fields.length && ['add', 'copy'].includes(actionType)) {
+        if (max && max <= fields.length && ['add', 'copy'].includes(type)) {
           return false;
         }
         // 下标为零 不可向上移动
-        if (index === 0 && ['moveUp'].includes(actionType)) {
+        if (index === 0 && ['moveUp'].includes(type)) {
           return false;
         }
         // 下标最大 不可向下移动
-        if (index + 1 === fields.length && ['moveDown'].includes(actionType)) {
+        if (index + 1 === fields.length && type === 'moveDown') {
           return false;
         }
         return _needConfirm ? _jsx(_Popconfirm, _objectSpread(_objectSpread({
@@ -239,18 +241,20 @@ var ActionButton = function ActionButton(props) {
           }
         }, _confirmProps), {}, {
           children: _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), rest), {}, {
+            type: "text",
             onClick: function onClick(e) {
               return e.stopPropagation();
             },
             children: label || defaultLabel
           }))
-        }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), rest), {}, {
+        }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), rest), {}, {
+          type: "text",
           onClick: function onClick(e) {
             e.stopPropagation();
             handleClick(internalOnClick, _onClick, index, item);
           },
           children: label || defaultLabel
-        }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
+        }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index));
       }
       return needConfirm ? _jsx(_Popconfirm, _objectSpread(_objectSpread({
         title: title !== null && title !== void 0 ? title : "".concat(locale.ProForm.formListConfirmMessage),
@@ -262,13 +266,15 @@ var ActionButton = function ActionButton(props) {
         }
       }, _confirmProps), {}, {
         children: _jsx(_Button, _objectSpread(_objectSpread({}, rest), {}, {
+          type: "text",
           onClick: function onClick(e) {
             return e.stopPropagation();
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : ( /*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
-        key: "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index),
+      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : ( /*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
+        key: "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index),
+        type: "text",
         onClick: function onClick(e) {
           e.stopPropagation();
           customClick(_onClick, index);