@zat-design/sisyphus-react 3.3.0 → 3.3.1-beta.1

package/es/ProTable/style/index.less

@@ -64,13 +64,13 @@
   }
 
   .@{ant-prefix}-table-body {
-    // .@{ant-prefix}-table-tbody .@{ant-prefix}-table-row:nth-child(odd).new-cell {
-    //   background: #00ae4d !important;
+    .@{ant-prefix}-table-tbody .@{ant-prefix}-table-row:nth-child(odd).new-cell {
+      background: #d2fff4 !important;
 
-    //   td {
-    //     background: #00ae4d !important;
-    //   }
-    // }
+      td {
+        background: #d2fff4 !important;
+      }
+    }
 
     .@{ant-prefix}-table-cell .varied-cell {
       margin-left: -8px;

package/es/ProTreeModal/components/Trigger.js

@@ -79,6 +79,8 @@ function Trigger(props) {
       return _jsxs(_Space.Compact, {
         block: true,
         children: [_jsxs(_Select, {
+          disabled: disabled,
+          className: classNames(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
           defaultValue: "appoint",
           value: state.mode,
           onChange: onAppointChange,

package/es/ProTreeModal/index.js

@@ -65,9 +65,9 @@ var ProTreeModal = function ProTreeModal(props) {
       children: 'children'
     } : _props$fieldNames,
     _props$disabled = props.disabled,
-    disabled = _props$disabled === void 0 ? props.disabled || (props === null || props === void 0 ? void 0 : (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.isView) || false : _props$disabled,
+    disabled = _props$disabled === void 0 ? props.disabled || props.isView || (props === null || props === void 0 ? void 0 : (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.isView) || false : _props$disabled,
     _props$isView = props.isView,
-    isView = _props$isView === void 0 ? (props === null || props === void 0 ? void 0 : (_props$otherProps2 = props.otherProps) === null || _props$otherProps2 === void 0 ? void 0 : _props$otherProps2.isView) || false : _props$isView,
+    isView = _props$isView === void 0 ? props.isView || (props === null || props === void 0 ? void 0 : (_props$otherProps2 = props.otherProps) === null || _props$otherProps2 === void 0 ? void 0 : _props$otherProps2.isView) || false : _props$isView,
     transformResponse = props.transformResponse,
     optionRender = props.optionRender,
     openChange = props.openChange,
@@ -169,7 +169,7 @@ var ProTreeModal = function ProTreeModal(props) {
         allKeys = state.allKeys,
         originalTreeData = state.originalTreeData;
       var treeViewData = [];
-      if (allValue && typeof value === 'string') {
+      if (allValue && typeof value === 'string' && allValue === value) {
         if (modeType === LIST) {
           checkedValues = treeData.map(function (item) {
             return item[fieldNameValue];

package/es/ProTreeModal/style/index.less

@@ -11,31 +11,31 @@
   }
 
   &-content {
-    display       : flex;
+    display: flex;
     flex-direction: row;
-    height        : 482px;
-    margin-bottom : calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
+    height: 482px;
+    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
 
     .@{ant-prefix}-tree-checkbox {
       margin-top: 2px;
     }
 
     .@{ant-prefix}-tree-switcher {
-      width      : 20px;
+      width: 20px;
       line-height: 20px;
     }
 
     .@{ant-prefix}-tree-treenode {
-      width         : 100%;
-      padding       : 0;
+      width: 100%;
+      padding: 0;
       padding-bottom: var(--zaui-font-size-sm, 12px);
-      color         : var(--zaui-text);
-      font-size     : var(--zaui-font-size, 14px);
-      line-height   : 20px;
+      color: var(--zaui-text);
+      font-size: var(--zaui-font-size, 14px);
+      line-height: 20px;
     }
 
     .@{ant-prefix}-tree-node-content-wrapper {
-      min-height : 20px;
+      min-height: 20px;
       line-height: 20px;
     }
 
@@ -45,27 +45,27 @@
   }
 
   &-box {
-    display       : flex;
+    display: flex;
     flex-direction: column;
-    width         : 456px;
-    height        : 100%;
-    color         : var(--zaui-text);
-    font-size     : var(--zaui-font-size, 14px);
-    line-height   : 20px;
-    border        : 1px solid #e6e6e6;
-    border-radius : var(--zaui-border-radius, 4px);
+    width: 456px;
+    height: 100%;
+    color: var(--zaui-text);
+    font-size: var(--zaui-font-size, 14px);
+    line-height: 20px;
+    border: 1px solid #e6e6e6;
+    border-radius: var(--zaui-border-radius, 4px);
 
     &:first-child {
       margin-right: var(--zaui-space-size-md, 16px);
     }
 
-    .viewSvg>div {
+    .viewSvg > div {
       display: flex;
     }
 
     /* 修改滚动条样式 */
     ::-webkit-scrollbar {
-      width : 0;
+      width: 0;
       height: 0;
     }
   }
@@ -79,38 +79,38 @@
   }
 
   &-search {
-    width : auto;
+    width: auto;
     margin: var(--zaui-space-size-sm, 8px) var(--zaui-space-size-md, 16px) 0;
   }
 
   &-cascader-flex {
-    display       : flex;
+    display: flex;
     flex-direction: row;
-    height        : 100%;
-    overflow      : hidden;
+    height: 100%;
+    overflow: hidden;
   }
 
   &-cascader-warp {
-    display       : flex;
+    display: flex;
     flex-direction: column;
-    width         : 350px;
-    margin-left   : var(--zaui-space-size-md, 16px);
-    overflow      : auto;
+    width: 350px;
+    margin-left: var(--zaui-space-size-md, 16px);
+    overflow: auto;
 
     &:first-child {
-      width       : 192px;
-      margin-left : 0;
+      width: 192px;
+      margin-left: 0;
       border-right: 1px solid #e6e6e6;
     }
   }
 
   &-box-header {
-    display        : flex;
-    align-items    : center;
+    display: flex;
+    align-items: center;
     justify-content: space-between;
-    height         : 40px;
-    padding        : 0 var(--zaui-space-size-md, 16px);
-    background     : #fafafa;
+    height: 40px;
+    padding: 0 var(--zaui-space-size-md, 16px);
+    background: #fafafa;
 
     &:first-child {
       color: #616161;
@@ -122,20 +122,20 @@
   }
 
   &-tree-warp {
-    flex       : 1;
-    margin     : 0 var(--zaui-space-size-md, 16px);
+    flex: 1;
+    margin: 0 var(--zaui-space-size-md, 16px);
     padding-top: var(--zaui-space-size-sm, 8px);
-    overflow-y : auto;
+    overflow-y: auto;
   }
 
   &-checkbox-content {
-    display        : flex;
-    flex-direction : row;
-    align-items    : center;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
     justify-content: space-between;
-    margin-bottom  : calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-    line-height    : 20px;
-    cursor         : pointer;
+    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
+    line-height: 20px;
+    cursor: pointer;
 
     &-look {
       color: #333;
@@ -148,16 +148,16 @@
 
   &-cascader-content {
     margin-bottom: 0;
-    padding      : 6px;
+    padding: 6px;
   }
 
   &-check-cascader-content {
-    color     : var(--zaui-brand);
+    color: var(--zaui-brand);
     background: rgba(0, 106, 255, 0.1);
   }
 
   &-isView {
-    display    : flex;
+    display: flex;
     align-items: center;
 
     .viewSvg {
@@ -175,11 +175,12 @@
 
   &-checkbox-close {
     padding-left: var(--zaui-space-size-sm, 8px);
-    font-size   : var(--zaui-font-size-sm, 12px);
+    color: #c5c7cd;
+    font-size: var(--zaui-font-size-sm, 12px);
   }
 
   &-tree-node {
-    display       : flex;
+    display: flex;
     flex-direction: row;
 
     &:last-child {
@@ -188,34 +189,34 @@
   }
 
   &-tree-node-tag {
-    display        : flex;
-    align-items    : center;
+    display: flex;
+    align-items: center;
     justify-content: center;
-    height         : 20px;
-    margin-right   : var(--zaui-space-size-sm, 8px);
-    padding        : 0 var(--zaui-space-size-xs);
-    font-weight    : 400;
-    line-height    : 24px;
-    white-space    : nowrap;
-    border-radius  : var(--zaui-border-radius-card);
+    height: 20px;
+    margin-right: var(--zaui-space-size-sm, 8px);
+    padding: 0 var(--zaui-space-size-xs);
+    font-weight: 400;
+    line-height: 24px;
+    white-space: nowrap;
+    border-radius: var(--zaui-border-radius-card);
 
     span {
-      font-size  : var(--zaui-font-size-sm, 12px);
+      font-size: var(--zaui-font-size-sm, 12px);
       line-height: 20px;
-      text-align : center;
-      transform  : scale(0.83, 0.83);
+      text-align: center;
+      transform: scale(0.83, 0.83);
     }
   }
 }
 
 .pro-tree-modal-no-checks {
-  display        : flex;
-  align-items    : center;
+  display: flex;
+  align-items: center;
   justify-content: center;
-  height         : 100%;
-  color          : #939599;
-  font-weight    : 400;
-  font-size      : var(--zaui-font-size, 14px);
+  height: 100%;
+  color: #939599;
+  font-weight: 400;
+  font-size: var(--zaui-font-size, 14px);
 }
 
 .pro-transfer-right {
@@ -227,37 +228,37 @@
     }
 
     .@{ant-prefix}-tag {
-      display        : flex;
-      align-items    : center;
+      display: flex;
+      align-items: center;
       justify-content: space-between;
-      width          : 100%;
-      height         : 32px;
-      padding        : 2px var(--zaui-space-size-sm, 8px);
-      color          : var(--zaui-text, #343434);
-      font-size      : var(--zaui-font-size, 14px);
-      background     : #f2f2f2;
-      border         : none;
-      border-radius  : var(--zaui-border-radius, 4px);
+      width: 100%;
+      height: 32px;
+      padding: 2px var(--zaui-space-size-sm, 8px);
+      color: var(--zaui-text, #343434);
+      font-size: var(--zaui-font-size, 14px);
+      background: #f2f2f2;
+      border: none;
+      border-radius: var(--zaui-border-radius, 4px);
 
       .drag-icon {
-        height      : 20px;
+        height: 20px;
         margin-right: var(--zaui-space-size-xs, 4px);
-        cursor      : move;
+        cursor: move;
       }
 
       .pro-tooltip {
-        flex     : 1;
+        flex: 1;
         max-width: calc(100% - 42px);
       }
 
       .disabled-icon {
-        height      : 20px;
+        height: 20px;
         margin-right: var(--zaui-space-size-xs, 4px);
       }
 
       .anticon-close {
-        margin   : 0;
-        color    : #999;
+        margin: 0;
+        color: #999;
         font-size: var(--zaui-font-size-sm, 12px);
       }
     }
@@ -265,7 +266,7 @@
     &.dragable {
       .anticon-close {
         position: relative;
-        left    : -4px;
+        left: -4px;
       }
     }
 

package/es/ProUpload/components/DragRender.js

@@ -52,7 +52,8 @@ var DragRender = function DragRender(props) {
    */
   var handleReSelect = function handleReSelect(file) {
     if (disabled) return;
-    handleDelFile(file);
+    // handleDelFile(file);
+    setFileList([]);
     setTimeout(function () {
       refReSelect.current.click();
     }, 1);

package/es/ProUpload/components/ImageRender.js

@@ -17,7 +17,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * @Author: wangshengqiang
  * @Date: 2023-07-27 20:13:07
  * @LastEditors: wangshengqiang
- * @LastEditTime: 2023-11-15 17:57:53
+ * @LastEditTime: 2023-11-21 15:24:56
  * @Description: 图片类型
  *
  */
@@ -97,11 +97,11 @@ var ImageRender = function ImageRender(props) {
     disabled: disabled || isView,
     itemRender: function itemRender(originNode, file, fileList, actions) {
       var _file$url, _locale$ProUpload, _locale$ProUpload2, _locale$ProUpload3;
-      var _showPreview = file.status === 'done';
       var _isShowDownload = !!onDownload && file.status === 'done';
       var _fileExt = getFileExt(file.name || (file === null || file === void 0 ? void 0 : (_file$url = file.url) === null || _file$url === void 0 ? void 0 : _file$url.split('?')[0]));
       var _fileIcon = getFileIcon(_fileExt);
       var isImg = ['.PNG', '.JPG', '.JPEG', '.GIF', '.BMP', '.JPE'].includes(_fileExt.toLocaleUpperCase());
+      var _showPreview = isImg;
       return _jsx(DraggableUploadListItem, {
         file: file,
         children: _jsxs("div", {
@@ -255,8 +255,7 @@ var ImageRender = function ImageRender(props) {
       style: {
         width: '400px'
       },
-      open: !!(previewImg === null || previewImg === void 0 ? void 0 : previewImg.url),
-      // showType="Modal"
+      open: (previewImg === null || previewImg === void 0 ? void 0 : previewImg.url) || (previewImg === null || previewImg === void 0 ? void 0 : previewImg.thumbUrl),
       wrapClassName: "proupload-modal-preview",
       onCancel: handlePreviewCancel,
       footer: false,
@@ -265,7 +264,7 @@ var ImageRender = function ImageRender(props) {
         style: {
           width: '100%'
         },
-        src: previewImg === null || previewImg === void 0 ? void 0 : previewImg.url
+        src: (previewImg === null || previewImg === void 0 ? void 0 : previewImg.url) || previewImg.thumbUrl
       })
     })]
   });

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

@@ -509,7 +509,7 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, className, className), (0, _defineProperty2.default)(_classNames, 'pro-form-item-changed', changed), _classNames));
-  var originalTitle = (0, _jsxRuntime.jsxs)(_antd.Space, {
+  var originalTitle = originalTip ? (0, _jsxRuntime.jsxs)(_antd.Space, {
     children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
@@ -519,14 +519,16 @@ var RenderField = function RenderField(_ref) {
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
     }))]
-  });
-  var FormItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  }) : null;
+  var FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     validateFirst: true
   }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: cellName,
     children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange']))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))
-  }));
+  })) : (0, _jsxRuntime.jsx)(_Container.default, {
+    viewEmpty: viewEmpty
+  });
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
     children: !originalTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {

package/lib/ProEditTable/index.js

@@ -23,7 +23,7 @@ var _tools = require("./utils/tools");
 var _components = require("./components");
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip", "rowKey"];
 var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _value$2;
   var value = _ref.value,
@@ -53,6 +53,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     pagination = _ref.pagination,
     originalValues = _ref.originalValues,
     originalTip = _ref.originalTip,
+    rowKey = _ref.rowKey,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   // 上下文form
   var contentForm = _antd.Form.useFormInstance();
@@ -100,21 +101,14 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     'pro-table-no-stripe': !stripe,
     className: className
   });
-  // 编辑行设置下样式
-  var _rowClassName = function _rowClassName(record) {
-    return !virtualKey || editingKeys.includes(record.rowKey) ? 'is-editing' : '';
-  };
-  // 复选框
-  var _rowSelection = (0, _objectSpread2.default)({
-    fixed: true,
-    selectedRowKeys: selectedRowKeys,
-    onChange: function onChange(selectedRowKeys, selectedRows) {
-      setState({
-        selectedRowKeys: selectedRowKeys,
-        selectedRows: selectedRows
-      });
+  var getRowKey = function getRowKey(record) {
+    var key = record.rowKey || (0, _tools.getRandom)();
+    if (rowKey) {
+      var _ref2;
+      key = (_ref2 = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref2 !== void 0 ? _ref2 : key;
     }
-  }, rowSelection);
+    return key;
+  };
   var config = {
     form: form,
     mode: mode,
@@ -147,6 +141,23 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     originalTip: originalTip,
     prefixCls: prefixCls
   };
+  // 编辑行设置下样式
+  var _rowClassName = function _rowClassName(record) {
+    var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
+    var className = isEdit ? 'is-editing' : '';
+    return className;
+  };
+  // 复选框
+  var _rowSelection = (0, _objectSpread2.default)({
+    fixed: true,
+    selectedRowKeys: selectedRowKeys,
+    onChange: function onChange(selectedRowKeys, selectedRows) {
+      setState({
+        selectedRowKeys: selectedRowKeys,
+        selectedRows: selectedRows
+      });
+    }
+  }, rowSelection);
   // 判断是否禁止添加、批量删除
   var isForbiddenBtn = (0, _react.useCallback)(function (type) {
     // 当工具栏不渲染时，都不渲染
@@ -205,7 +216,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return isForbiddenBtn('mulDelete') ? rowSelection : _rowSelection;
   };
   var setColumns = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var nextColumns;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -224,7 +235,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       }, _callee);
     }));
     return function setColumns() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   (0, _ahooks.useDebounceEffect)(function () {
@@ -240,7 +251,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     if ((value === null || value === void 0 ? void 0 : value.length) && !(value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey)) {
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
-          rowKey: (0, _tools.getRandom)()
+          rowKey: getRowKey(item)
         });
       });
       onChange(nextValues);

package/lib/ProEnum/index.js

@@ -80,7 +80,6 @@ var ProEnum = function ProEnum(props) {
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProEnum'),
     _useProConfig$dics = _useProConfig.dics,
     dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
-  // const enumList = dics?.[code] || [];
   var _useRequestFunc = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       manual: true,
       cacheTime: -1
@@ -174,26 +173,16 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange
         }));
       case 'Radio':
-        return (0, _jsxRuntime.jsx)(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
+        return (0, _jsxRuntime.jsx)(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames'])), {}, {
+          options: list,
           value: value,
-          onChange: onChange,
-          children: list.map(function (item) {
-            return (0, _jsxRuntime.jsx)(_antd.Radio, {
-              value: item[fieldValue],
-              children: item[label]
-            }, item[fieldValue]);
-          })
+          onChange: onChange
         }));
       case 'Checkbox':
-        return (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
+        return (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames'])), {}, {
+          options: list,
           value: value,
-          onChange: onChange,
-          children: list.map(function (item) {
-            return (0, _jsxRuntime.jsx)(_antd.Checkbox, {
-              value: item[fieldValue],
-              children: item[label]
-            }, item[fieldValue]);
-          })
+          onChange: onChange
         }));
       case 'Tag':
         return (0, _jsxRuntime.jsx)(_Tag.default, {

package/lib/ProEnum/propsType.d.ts

@@ -6,6 +6,7 @@ import { PropSelectProps } from '../ProSelect/propsType';
 export interface DataOption {
     label?: string;
     value?: string;
+    disabled?: boolean;
     [key: string]: any;
 }
 export interface ProEnumConfig {

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

@@ -146,13 +146,13 @@ 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 (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+      if (item.show === false) return (0, _jsxRuntime.jsx)("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       if ((0, _lodash.isFunction)(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath: namePath,
         index: index,
         form: form
       })) {
-        return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+        return (0, _jsxRuntime.jsx)("span", {}, "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       }
       var label = item.label,
         onClick = item.onClick,

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

@@ -68,7 +68,7 @@ var FormList = function FormList(props, ref) {
   var handleDragEnd = function handleDragEnd(drag) {
     var active = drag.active,
       over = drag.over;
-    if (active.id !== over.id) {
+    if (_fields.length > 1 && active.id !== over.id) {
       var activeIndex = _fields.findIndex(function (item) {
         return item.key === active.id;
       });