@zat-design/sisyphus-react 3.14.0-beta.2 → 4.0.0-beta.10

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

@@ -1,11 +1,10 @@
-import "antd/es/date-picker/style";
-import _DatePicker from "antd/es/date-picker";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["className", "format"];
+import { DatePicker as AntDatePicker } from 'antd';
 import { isFunction, isString, isObject, omit } from 'lodash';
 import classNames from 'classnames';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import React from 'react';
 import { useProConfig } from "../../../../ProConfigProvider";
 import ProForm from "../../../../ProForm";
@@ -34,11 +33,12 @@ var DatePicker = props => {
     if (!value) {
       viewChildren = null;
     } else if (typeof format === 'string' && isObject(value)) {
-      viewChildren = value.format(format);
+      var _format, _ref2;
+      viewChildren = ((_format = (_ref2 = value).format) === null || _format === void 0 ? void 0 : _format.call(_ref2, format)) || value;
     } else if (isFunction(format)) {
       viewChildren = format(value);
     } else if (isString(value)) {
-      viewChildren = moment(value).format(format);
+      viewChildren = dayjs(value).format(format);
     }
     return /*#__PURE__*/_jsx(Container, {
       viewEmpty: viewEmpty,
@@ -60,9 +60,9 @@ var DatePicker = props => {
 
   // 字符串时间格式兼容
   if (isString(restProps.value)) {
-    restProps.value = moment(restProps.value);
+    restProps.value = dayjs(restProps.value);
   }
-  return /*#__PURE__*/_jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
+  return /*#__PURE__*/_jsx(AntDatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
     format: nextFormat
   }, omit(restProps, ['otherProps'])), {}, {
     className: nextClassName

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

@@ -0,0 +1,3 @@
+export declare const useDateLimit: () => {
+    onCalendarChange: (val: any) => void;
+};

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

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

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

@@ -1,9 +1,8 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/input/style";
-import _Input from "antd/es/input";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["label", "form", "placeholder", "fieldName", "otherProps", "desensitization"];
 import React from 'react';
+import { Input as AntInput } from 'antd';
 import { isFunction, omit } from 'lodash';
 import { useProConfig } from "../../../../ProConfigProvider";
 import Container from "../../Container";
@@ -27,11 +26,15 @@ var Input = function Input(props) {
     viewEmpty = _ref.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = useProConfig('Input');
+  if (typeof rest.value === 'number') {
+    var _rest$value, _rest$value$toString;
+    rest.value = rest === null || rest === void 0 || (_rest$value = rest.value) === null || _rest$value === void 0 || (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
+  }
   if (isView) {
     if ((Array.isArray(desensitization) || isFunction(desensitization)) && props !== null && props !== void 0 && props.disabled) {
       if (typeof rest.value === 'number') {
-        var _rest$value, _rest$value$toString;
-        rest.value = rest === null || rest === void 0 || (_rest$value = rest.value) === null || _rest$value === void 0 || (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
+        var _rest$value2, _rest$value2$toString;
+        rest.value = rest === null || rest === void 0 || (_rest$value2 = rest.value) === null || _rest$value2 === void 0 || (_rest$value2$toString = _rest$value2.toString) === null || _rest$value2$toString === void 0 ? void 0 : _rest$value2$toString.call(_rest$value2);
       }
       return /*#__PURE__*/_jsx(Container, {
         viewEmpty: viewEmpty,
@@ -43,8 +46,7 @@ var Input = function Input(props) {
       children: rest.value
     });
   }
-  var ComInput = /*#__PURE__*/_jsx(_Input, _objectSpread(_objectSpread({
-    allowClear: true,
+  var ComInput = /*#__PURE__*/_jsx(AntInput, _objectSpread(_objectSpread({
     autoComplete: "off",
     placeholder: placeholder || `${locale.ProForm.inputPlaceholder}`
   }, omit(initialConfig, ['trim', 'upperCase'])), rest));
@@ -52,8 +54,8 @@ var Input = function Input(props) {
   // 仅查看模式下进行数据脱敏
   if ((Array.isArray(desensitization) || isFunction(desensitization)) && props !== null && props !== void 0 && props.disabled) {
     if (typeof rest.value === 'number') {
-      var _rest$value2, _rest$value2$toString;
-      rest.value = rest === null || rest === void 0 || (_rest$value2 = rest.value) === null || _rest$value2 === void 0 || (_rest$value2$toString = _rest$value2.toString) === null || _rest$value2$toString === void 0 ? void 0 : _rest$value2$toString.call(_rest$value2);
+      var _rest$value3, _rest$value3$toString;
+      rest.value = rest === null || rest === void 0 || (_rest$value3 = rest.value) === null || _rest$value3 === void 0 || (_rest$value3$toString = _rest$value3.toString) === null || _rest$value3$toString === void 0 ? void 0 : _rest$value3$toString.call(_rest$value3);
     }
     return /*#__PURE__*/React.cloneElement(ComInput, _objectSpread(_objectSpread(_objectSpread({
       allowClear: true,

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

@@ -1,12 +1,9 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/input-number/style";
-import _InputNumber from "antd/es/input-number";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 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", "onFocus"];
 import React, { useMemo, useRef } from 'react';
+import { InputNumber as AntInputNumber, Space } from 'antd';
 import classNames from 'classnames';
 import Big from 'big.js';
 import { tools } from '@zat-design/utils';
@@ -231,7 +228,7 @@ var InputNumber = props => {
       case 'thousandthCNY':
         return /*#__PURE__*/_jsx(Container, {
           viewEmpty: viewEmpty,
-          children: /*#__PURE__*/_jsxs(_Space, {
+          children: /*#__PURE__*/_jsxs(Space, {
             size: 4,
             children: [_value || _value === 0 ? 'CNY' : '', tools.formatAmount(_value, precision)]
           })
@@ -289,7 +286,7 @@ var InputNumber = props => {
     activateRef.current = true;
     onFocus === null || onFocus === void 0 || onFocus(e);
   };
-  return /*#__PURE__*/_jsx(_InputNumber, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(AntInputNumber, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     autoComplete: "off",
     placeholder: placeholder || `${locale.ProForm.inputPlaceholder}${label !== null && label !== void 0 ? label : ''}`,
     className: _className

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

@@ -1,8 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/radio/style";
-import _Radio from "antd/es/radio";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["dataSource", "fieldNames", "onChange", "value", "otherProps"];
+import { Radio as AntRadio } from 'antd';
 import React from 'react';
 import { useProConfig } from "../../../../ProConfigProvider";
 import Container from "../../Container";
@@ -51,13 +50,13 @@ var Radio = props => {
       };
     }
   }
-  return /*#__PURE__*/_jsx(_Radio.Group, _objectSpread(_objectSpread({}, rest), {}, {
+  return /*#__PURE__*/_jsx(AntRadio.Group, _objectSpread(_objectSpread({}, rest), {}, {
     value: value,
     onChange: e => {
       _onChange(e, e.target.value);
     },
     children: !!(dataSource !== null && dataSource !== void 0 && dataSource.length) && dataSource.map(radioItem => {
-      return /*#__PURE__*/_jsx(_Radio, {
+      return /*#__PURE__*/_jsx(AntRadio, {
         value: radioItem[_fieldNames.value],
         children: radioItem[_fieldNames.label]
       }, radioItem[_fieldNames.value]);

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

@@ -1,17 +1,17 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import "antd/es/date-picker/style";
-import _DatePicker from "antd/es/date-picker"; // @ts-check
 var _excluded = ["format", "otherProps", "separator", "range"];
+// @ts-check
+import { DatePicker } from 'antd';
 import { isFunction, isObject, isString, omit, uniq } from 'lodash';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import React from 'react';
 import { useProConfig } from "../../../../ProConfigProvider";
 import ProForm from "../../../../ProForm";
 import Container from "../../Container";
 import { useDateRange } from "./useDateRange";
 import { jsx as _jsx } from "react/jsx-runtime";
-var AntRangePicker = _DatePicker.RangePicker;
+var AntRangePicker = DatePicker.RangePicker;
 var RangePicker = props => {
   var _props$format = props.format,
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
@@ -46,7 +46,7 @@ var RangePicker = props => {
 
   // 字符串时间格式兼容
   if (Array.isArray(_rest.value) && isString(_rest.value[0]) && isString(_rest.value[1])) {
-    _rest.value = [moment(_rest.value[0]), moment(_rest.value[1])];
+    _rest.value = [dayjs(_rest.value[0]), dayjs(_rest.value[1])];
   }
   var _viewFormat = Array.isArray(format) ? format[0] : format;
   var tempFormat = Array.isArray(format) ? format : [format];
@@ -65,10 +65,11 @@ var RangePicker = props => {
       viewChildren = null;
     } else if (Array.isArray(format)) {
       var formattedList = format.map((formatItem, index) => {
+        var _format2, _ref2;
         if (isFunction(formatItem)) {
           return formatItem(value[index]);
         }
-        return value[index].format(formatItem);
+        return ((_format2 = (_ref2 = value[index]).format) === null || _format2 === void 0 ? void 0 : _format2.call(_ref2, formatItem)) || value[index];
       });
       viewChildren = formattedList.join(separator);
     } else if (isFunction(format)) {

package/es/ProForm/components/base/RangePicker/useDateRange.d.ts

@@ -1,15 +1,15 @@
-import { Moment } from 'moment';
+import type { Dayjs } from 'dayjs';
 type unitOfTime = 'year' | 'years' | 'y' | 'month' | 'months' | 'M' | 'week' | 'weeks' | 'w' | 'day' | 'days' | 'd';
 export interface Props {
-    value?: [Moment?, Moment?];
+    value?: [Dayjs?, Dayjs?];
     range: [number, unitOfTime];
-    disabledDate?: (date: Moment) => boolean;
+    disabledDate?: (date: Dayjs) => boolean;
 }
 /**
  * 支持传入时间范围作为起止期的间隔时间
  */
 export declare const useDateRange: (props: Props) => {
-    onCalendarChange: (val?: [Moment?, Moment?]) => void;
-    disabledDate: (current: Moment) => boolean;
+    onCalendarChange: (val?: [Dayjs?, Dayjs?]) => void;
+    disabledDate: (current: Dayjs) => boolean;
 };
 export {};

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

@@ -1,8 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/select/style";
-import _Select from "antd/es/select";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["dataSource", "fieldNames", "otherProps", "scrollFollowParent"];
+import { Select as AntSelect } from 'antd';
 import React from 'react';
 import { isNumber } from 'lodash';
 import Container from "../../Container";
@@ -51,7 +50,7 @@ var Select = props => {
       children: value || isNumber(value) ? transToLabel([value]) : null
     });
   }
-  return /*#__PURE__*/_jsx(_Select, _objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(AntSelect, _objectSpread(_objectSpread(_objectSpread({
     placeholder: `${locale.ProForm.selectPlaceHolder}`,
     allowClear: true,
     getPopupContainer: trigger => {

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

@@ -1,8 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/switch/style";
-import _Switch from "antd/es/switch";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["disabled", "otherProps"];
+import { Switch as AntSwitch } from 'antd';
 import React from 'react';
 import { isNull, isUndefined } from 'lodash';
 import { useProConfig } from "../../../../ProConfigProvider";
@@ -32,7 +31,7 @@ var Switch = props => {
       children: res.checked === true ? `${locale.ProForm.switchText[0]}` : `${locale.ProForm.switchText[1]}`
     });
   }
-  return /*#__PURE__*/_jsx(_Switch, _objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(AntSwitch, _objectSpread(_objectSpread(_objectSpread({
     disabled: disabled,
     checkedChildren: `${locale.ProForm.switchText[0]}`,
     unCheckedChildren: `${locale.ProForm.switchText[1]}`

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

@@ -1,9 +1,8 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/checkbox/style";
-import _Checkbox from "antd/es/checkbox";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["onChange", "disabled", "value", "otherProps", "className"];
 import * as React from 'react';
+import { Checkbox } from 'antd';
 import { isNull, isUndefined } from 'lodash';
 import classnames from 'classnames';
 import { useProConfig } from "../../../../ProConfigProvider";
@@ -55,7 +54,7 @@ var SwitchCheckbox = props => {
     'pro-switch-checkbox': true,
     className
   });
-  return /*#__PURE__*/_jsx(_Checkbox, _objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(Checkbox, _objectSpread(_objectSpread(_objectSpread({
     disabled: disabled,
     onChange: changeVal,
     className: classNames

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

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .switch-checkbox-view {
   display    : flex;

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

@@ -1,8 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import "antd/es/input/style";
-import _Input from "antd/es/input";
 var _excluded = ["placeholder", "otherProps", "className", "tooltip"];
+import { Input } from 'antd';
 import { omit } from 'lodash';
 import React from 'react';
 import classnames from 'classnames';
@@ -12,7 +11,7 @@ import ProForm from "../../../../ProForm";
 import Container from "../../Container";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
-var TextArea = _Input.TextArea;
+var TextArea = Input.TextArea;
 var TextAreaDef = props => {
   var _props$style;
   var placeholder = props.placeholder,
@@ -38,7 +37,7 @@ var TextAreaDef = props => {
   var _className = classnames({
     'pro-textarea': true,
     'pro-textarea-view': isView,
-    [className]: true
+    [className]: className
   });
   return /*#__PURE__*/_jsx(TextArea, _objectSpread(_objectSpread(_objectSpread({
     showCount: true,

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

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 div.pro-textarea-view {
   .@{ant-prefix}-input-disabled {
@@ -13,7 +11,17 @@ div.pro-textarea-view {
 
 // input-textarea级联选择
 .pro-textarea {
+  position: relative;
   .@{ant-prefix}-input {
     resize: auto !important;
+    padding-bottom: 20px;
+  }
+  .@{ant-prefix}-input-suffix {
+    position: absolute;
+    right: 16px;
+    bottom: 22px;
+    // width: calc(100% - 18px);
+    text-align: right;
+    background: rgba(255, 255, 255, 0.6);
   }
 }

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

@@ -1,7 +1,6 @@
 import React from 'react';
-import type { TimePickerProps } from 'antd/es/time-picker';
+import type { TimePickerProps } from 'antd';
 import type { ProFormOtherType } from '../../../propsType';
-import './style/index.less';
 export interface Props {
     valueType?: string;
     format?: string;

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

@@ -1,15 +1,14 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/time-picker/style";
-import _TimePicker from "antd/es/time-picker";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["format", "onChange", "value", "otherProps"];
 import React from 'react';
-import moment from 'moment';
+import { DatePicker } from 'antd';
+import dayjs from 'dayjs';
 import { useProConfig } from "../../../../ProConfigProvider";
 import Container from "../../Container";
 import ProForm from "../../../../ProForm";
-import "./style/index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
+var AntTimePicker = DatePicker.TimePicker;
 var TimePicker = props => {
   var _props$format = props.format,
     format = _props$format === void 0 ? 'HH:mm:ss' : _props$format,
@@ -26,7 +25,7 @@ var TimePicker = props => {
   var initialConfig = useProConfig('AntTimePicker');
   var handleChange = value => {
     if (valueType === 'dateTime') {
-      onChange && onChange(value ? moment(value).format(format) : undefined);
+      onChange && onChange(value ? dayjs(value).format(format) : undefined);
     }
   };
   if (isView) {
@@ -35,8 +34,8 @@ var TimePicker = props => {
       children: value
     });
   }
-  return /*#__PURE__*/_jsx(_TimePicker, _objectSpread(_objectSpread(_objectSpread({
-    value: value ? moment(value, format) : undefined
+  return /*#__PURE__*/_jsx(AntTimePicker, _objectSpread(_objectSpread(_objectSpread({
+    value: value ? dayjs(value, format) : undefined
   }, initialConfig), rest), {}, {
     format: format,
     onChange: handleChange

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

@@ -1,6 +1,6 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
-.@{ant-prefix}-picker {
+/* 适配antd 5.x，不再导入antd样式 */
+
+.ant-picker-time {
   display: flex;
 }

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

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-container {
   &.pro-container-empty{

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

@@ -1,16 +1,12 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import "antd/es/popconfirm/style";
-import _Popconfirm from "antd/es/popconfirm";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["label", "onClick", "onHandle", "type", "needConfirm", "confirmProps", "title"],
   _excluded2 = ["onClick", "label"];
+import { Button, Popconfirm, Space } from 'antd';
 import { isFunction, omit } from 'lodash';
+import classNames from 'classnames';
 import React, { useMemo } from 'react';
 import { CopyOutlined, PlusSquareOutlined, ArrowUpOutlined, ArrowDownOutlined } from '@ant-design/icons';
 import ProIcon from "../../../../../ProIcon";
@@ -190,7 +186,7 @@ var ActionButton = props => {
   // 整体隐藏首尾 ActionButton
   if (hideStartEndActionProps !== null && hideStartEndActionProps !== void 0 && hideStartEndActionProps[0] && index === 0) return null;
   if (hideStartEndActionProps !== null && hideStartEndActionProps !== void 0 && hideStartEndActionProps[1] && index === fields.length - 1) return null;
-  return /*#__PURE__*/_jsx(_Space, {
+  return /*#__PURE__*/_jsx(Space, {
     align: "start",
     className: "pro-form-list-action",
     children: actionProps === null || actionProps === void 0 ? void 0 : actionProps.map(item => {
@@ -306,7 +302,7 @@ var ActionButton = props => {
             return _ref7.apply(this, arguments);
           };
         }();
-        return _needConfirm ? /*#__PURE__*/_jsx(_Popconfirm, _objectSpread(_objectSpread({
+        return _needConfirm ? /*#__PURE__*/_jsx(Popconfirm, _objectSpread(_objectSpread({
           title: title !== null && title !== void 0 ? title : `${locale.ProForm.formListConfirmMessage}`,
           onCancel: e => e.stopPropagation(),
           onConfirm: e => {
@@ -317,12 +313,18 @@ var ActionButton = props => {
             }
           }
         }, _confirmProps), {}, {
-          children: /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), omit(rest, filterKeys)), {}, {
+          children: /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), omit(rest, filterKeys)), {}, {
             type: "text",
             onClick: e => e.stopPropagation(),
             children: label || defaultLabel
           }))
-        }), `${item === null || item === void 0 ? void 0 : item.type}${index}`) : /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), omit(rest, filterKeys)), {}, {
+        }), `${item === null || item === void 0 ? void 0 : item.type}${index}`) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread(_objectSpread({
+          className: classNames({
+            'pro-form-list-tool-btn': mode === 'line',
+            'pro-form-list-tool-btn-block': mode === 'block',
+            'pro-form-list-tool-btn-less': mode === 'less'
+          })
+        }, defaultRest), omit(rest, filterKeys)), {}, {
           type: "text",
           onClick: e => {
             e.stopPropagation();
@@ -335,17 +337,17 @@ var ActionButton = props => {
           children: label || defaultLabel
         }), `${item === null || item === void 0 ? void 0 : item.type}${index}`);
       }
-      return needConfirm ? /*#__PURE__*/_jsx(_Popconfirm, _objectSpread(_objectSpread({
+      return needConfirm ? /*#__PURE__*/_jsx(Popconfirm, _objectSpread(_objectSpread({
         title: title !== null && title !== void 0 ? title : `${locale.ProForm.formListConfirmMessage}`,
         onCancel: e => e.stopPropagation(),
         onConfirm: () => customClick(_onClick, index)
       }, _confirmProps), {}, {
-        children: /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread({}, omit(rest, filterKeys)), {}, {
+        children: /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, omit(rest, filterKeys)), {}, {
           type: "text",
           onClick: e => e.stopPropagation(),
           children: label
         }))
-      }), `${item === null || item === void 0 ? void 0 : item.type}${index}`) : /*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, omit(rest, filterKeys)), {}, {
+      }), `${item === null || item === void 0 ? void 0 : item.type}${index}`) : /*#__PURE__*/_createElement(Button, _objectSpread(_objectSpread({}, omit(rest, filterKeys)), {}, {
         key: `${item === null || item === void 0 ? void 0 : item.type}${index}`,
         type: "text",
         onClick: e => {

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

@@ -1,7 +1,4 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import "antd/es/row/style";
-import _Row from "antd/es/row";
+import { Row, Space } from 'antd';
 import React, { useMemo } from 'react';
 import { isFunction } from 'lodash';
 import classNames from 'classnames';
@@ -49,7 +46,7 @@ var BlockFields = props => {
 
   // 左侧标题布局
   if (titlePosition === 'left') {
-    return /*#__PURE__*/_jsx(_Space, {
+    return /*#__PURE__*/_jsx(Space, {
       direction: "vertical",
       className: cls,
       id: id,
@@ -82,7 +79,7 @@ var BlockFields = props => {
               isView: isView,
               hideStartEndActionProps: hideStartEndActionProps
             }),
-            children: /*#__PURE__*/_jsx(_Row, {
+            children: /*#__PURE__*/_jsx(Row, {
               gutter: 24,
               children: /*#__PURE__*/_jsx(MemoRenderFields, {
                 columns: columns,
@@ -100,7 +97,7 @@ var BlockFields = props => {
   }
 
   // 默认顶部标题布局
-  return /*#__PURE__*/_jsx(_Space, {
+  return /*#__PURE__*/_jsx(Space, {
     direction: "vertical",
     className: cls,
     id: id,
@@ -126,7 +123,7 @@ var BlockFields = props => {
         isView: isView,
         hideStartEndActionProps: hideStartEndActionProps
       }),
-      children: /*#__PURE__*/_jsx(_Row, {
+      children: /*#__PURE__*/_jsx(Row, {
         gutter: 24,
         children: /*#__PURE__*/_jsx(MemoRenderFields, {
           columns: columns,

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

@@ -1,7 +1,6 @@
-import "antd/es/button/style";
-import _Button from "antd/es/button";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import { Button } from 'antd';
 import { isFunction } from 'lodash';
 import EmptyImg from "../../../../../assets/empty.png";
 import locale from "../../../../../locale";
@@ -83,7 +82,7 @@ var Empty = _ref => {
       className: "pro-form-list-empty-content",
       children: disabled || !show ? locale.ProForm.noData : /*#__PURE__*/_jsxs(_Fragment, {
         children: [locale.ProForm.noData, !disabled && /*#__PURE__*/_jsxs(_Fragment, {
-          children: ["\uFF0C", /*#__PURE__*/_jsx(_Button, {
+          children: ["\uFF0C", /*#__PURE__*/_jsx(Button, {
             type: "link",
             onClick: handleAddClick,
             style: {

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

@@ -1,6 +1,5 @@
-import "antd/es/row/style";
-import _Row from "antd/es/row";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { Row } from 'antd';
 import React from 'react';
 import classNames from 'classnames';
 import { useSortable } from '@dnd-kit/sortable';
@@ -67,7 +66,7 @@ var LineFields = props => {
         type: "drag",
         buttonIcon: false
       })
-    })), /*#__PURE__*/_jsx(_Row, {
+    })), /*#__PURE__*/_jsx(Row, {
       gutter: isLess ? 0 : 24,
       children: /*#__PURE__*/_jsx(MemoRenderFields, {
         columns: columns,

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

@@ -1,14 +1,11 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-/* eslint-disable react/no-array-index-key */
 var _excluded = ["label", "onClick", "onHandle", "type"],
   _excluded2 = ["onClick", "label"];
+/* eslint-disable react/no-array-index-key */
+import { Space, Button } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { isFunction, omit } from 'lodash';
 import React, { useMemo } from 'react';
@@ -132,7 +129,7 @@ var ToolbarButton = props => {
       index: 0
     });
   };
-  return /*#__PURE__*/_jsx(_Space, {
+  return /*#__PURE__*/_jsx(Space, {
     align: "start",
     className: "pro-form-list-toolbar",
     children: toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.map((item, index) => {
@@ -159,13 +156,13 @@ var ToolbarButton = props => {
         if (max && max <= fields.length && type === 'add') {
           return false;
         }
-        return /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, actions[type]), omit(rest, filterKeys)), {}, {
+        return /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread(_objectSpread({}, actions[type]), omit(rest, filterKeys)), {}, {
           type: "link",
           onClick: () => handleClick(internalOnClick, _onClick, item),
           children: label || defaultLabel
         }), `${type}${index}`);
       }
-      return /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread({}, omit(rest, filterKeys)), {}, {
+      return /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, omit(rest, filterKeys)), {}, {
         type: "link",
         onClick: () => customClick(_onClick2, item),
         children: label

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

@@ -1,7 +1,6 @@
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { forwardRef, useCallback, useImperativeHandle } from 'react';
+import { Form } from 'antd';
 import { DndContext } from '@dnd-kit/core';
 import { get } from 'lodash';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
@@ -135,7 +134,7 @@ var FormList = (props, ref) => {
           form: form,
           namePath: _namePath,
           emptyBtnText: emptyBtnText
-        }), /*#__PURE__*/_jsx(_Form.ErrorList, {
+        }), /*#__PURE__*/_jsx(Form.ErrorList, {
           errors: errors
         }), toolbarProps !== false && _fields.length > 0 && /*#__PURE__*/_jsx(ToolbarButton, {
           disabled: disabled,