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

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

@@ -1,12 +1,10 @@
 import { DatePickerProps, TimePickerProps } from 'antd';
-import { Moment } from 'moment';
 import React from 'react';
-import { PickerPanelDateProps } from 'antd/lib/calendar/generateCalendar';
 export type Props = DatePickerProps & TimePickerProps & {
     isView?: boolean;
     viewEmpty?: React.ReactNode;
     format?: string;
-    showTime?: PickerPanelDateProps<Moment>['showTime'];
+    showTime?: boolean | Record<string, any>;
     showNow?: boolean;
 };
 declare const DatePicker: React.FC<Props>;

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

@@ -5,13 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/date-picker/style");
-var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _antd = require("antd");
 var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _react = _interopRequireDefault(require("react"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
@@ -41,11 +40,12 @@ var DatePicker = props => {
     if (!value) {
       viewChildren = null;
     } else if (typeof format === 'string' && (0, _lodash.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 ((0, _lodash.isFunction)(format)) {
       viewChildren = format(value);
     } else if ((0, _lodash.isString)(value)) {
-      viewChildren = (0, _moment.default)(value).format(format);
+      viewChildren = (0, _dayjs.default)(value).format(format);
     }
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
@@ -67,9 +67,9 @@ var DatePicker = props => {
 
   // 字符串时间格式兼容
   if ((0, _lodash.isString)(restProps.value)) {
-    restProps.value = (0, _moment.default)(restProps.value);
+    restProps.value = (0, _dayjs.default)(restProps.value);
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_datePicker.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), {}, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), {}, {
     format: nextFormat
   }, (0, _lodash.omit)(restProps, ['otherProps'])), {}, {
     className: nextClassName

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

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

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

@@ -0,0 +1,19 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useDateLimit = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var useDateLimit = () => {
+  var _useState = (0, _react.useState)(),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    dates = _useState2[0],
+    setDates = _useState2[1];
+  return {
+    onCalendarChange: val => setDates(val)
+  };
+};
+exports.useDateLimit = useDateLimit;

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

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
+var _antd = require("antd");
 var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -32,11 +31,15 @@ var Input = function Input(props) {
     viewEmpty = _ref.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = (0, _ProConfigProvider.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) || (0, _lodash.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__*/(0, _jsxRuntime.jsx)(_Container.default, {
         viewEmpty: viewEmpty,
@@ -48,8 +51,7 @@ var Input = function Input(props) {
       children: rest.value
     });
   }
-  var ComInput = /*#__PURE__*/(0, _jsxRuntime.jsx)(_input.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-    allowClear: true,
+  var ComInput = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     autoComplete: "off",
     placeholder: placeholder || `${_locale.default.ProForm.inputPlaceholder}`
   }, (0, _lodash.omit)(initialConfig, ['trim', 'upperCase'])), rest));
@@ -57,8 +59,8 @@ var Input = function Input(props) {
   // 仅查看模式下进行数据脱敏
   if ((Array.isArray(desensitization) || (0, _lodash.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.default.cloneElement(ComInput, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
       allowClear: true,

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

@@ -7,13 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/input-number/style");
-var _inputNumber = _interopRequireDefault(require("antd/es/input-number"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _big = _interopRequireDefault(require("big.js"));
 var _utils = require("@zat-design/utils");
@@ -237,7 +234,7 @@ var InputNumber = props => {
       case 'thousandthCNY':
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
             size: 4,
             children: [_value || _value === 0 ? 'CNY' : '', _utils.tools.formatAmount(_value, precision)]
           })
@@ -295,7 +292,7 @@ var InputNumber = props => {
     activateRef.current = true;
     onFocus === null || onFocus === void 0 || onFocus(e);
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_inputNumber.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     autoComplete: "off",
     placeholder: placeholder || `${_locale.default.ProForm.inputPlaceholder}${label !== null && label !== void 0 ? label : ''}`,
     className: _className

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

@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/radio/style");
-var _radio = _interopRequireDefault(require("antd/es/radio"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -58,13 +57,13 @@ var Radio = props => {
       };
     }
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_radio.default.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
     value: value,
     onChange: e => {
       _onChange(e, e.target.value);
     },
     children: !!(dataSource !== null && dataSource !== void 0 && dataSource.length) && dataSource.map(radioItem => {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_radio.default, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Radio, {
         value: radioItem[_fieldNames.value],
         children: radioItem[_fieldNames.label]
       }, radioItem[_fieldNames.value]);

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

@@ -7,10 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-require("antd/es/date-picker/style");
-var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
+var _antd = require("antd");
 var _lodash = require("lodash");
-var _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _react = _interopRequireDefault(require("react"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
@@ -18,7 +17,7 @@ var _Container = _interopRequireDefault(require("../../Container"));
 var _useDateRange = require("./useDateRange");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["format", "otherProps", "separator", "range"]; // @ts-check
-var AntRangePicker = _datePicker.default.RangePicker;
+var AntRangePicker = _antd.DatePicker.RangePicker;
 var RangePicker = props => {
   var _props$format = props.format,
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
@@ -53,7 +52,7 @@ var RangePicker = props => {
 
   // 字符串时间格式兼容
   if (Array.isArray(_rest.value) && (0, _lodash.isString)(_rest.value[0]) && (0, _lodash.isString)(_rest.value[1])) {
-    _rest.value = [(0, _moment.default)(_rest.value[0]), (0, _moment.default)(_rest.value[1])];
+    _rest.value = [(0, _dayjs.default)(_rest.value[0]), (0, _dayjs.default)(_rest.value[1])];
   }
   var _viewFormat = Array.isArray(format) ? format[0] : format;
   var tempFormat = Array.isArray(format) ? format : [format];
@@ -72,10 +71,11 @@ var RangePicker = props => {
       viewChildren = null;
     } else if (Array.isArray(format)) {
       var formattedList = format.map((formatItem, index) => {
+        var _format2, _ref2;
         if ((0, _lodash.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 ((0, _lodash.isFunction)(format)) {

package/lib/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/lib/ProForm/components/base/Select/index.js

@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/select/style");
-var _select = _interopRequireDefault(require("antd/es/select"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
 var _lodash = require("lodash");
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -58,7 +57,7 @@ var Select = props => {
       children: value || (0, _lodash.isNumber)(value) ? transToLabel([value]) : null
     });
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_select.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     placeholder: `${_locale.default.ProForm.selectPlaceHolder}`,
     allowClear: true,
     getPopupContainer: trigger => {

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

@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/switch/style");
-var _switch = _interopRequireDefault(require("antd/es/switch"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
 var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
@@ -38,7 +37,7 @@ var Switch = props => {
       children: res.checked === true ? `${_locale.default.ProForm.switchText[0]}` : `${_locale.default.ProForm.switchText[1]}`
     });
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_switch.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Switch, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     disabled: disabled,
     checkedChildren: `${_locale.default.ProForm.switchText[0]}`,
     unCheckedChildren: `${_locale.default.ProForm.switchText[1]}`

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

@@ -7,10 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/checkbox/style");
-var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var React = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
 var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
@@ -62,7 +61,7 @@ var SwitchCheckbox = props => {
     'pro-switch-checkbox': true,
     className
   });
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Checkbox, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     disabled: disabled,
     onChange: changeVal,
     className: classNames

package/lib/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/lib/ProForm/components/base/TextArea/index.js

@@ -7,8 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
+var _antd = require("antd");
 var _lodash = require("lodash");
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -19,7 +18,7 @@ var _Container = _interopRequireDefault(require("../../Container"));
 require("./index.less");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["placeholder", "otherProps", "className", "tooltip"];
-var TextArea = _input.default.TextArea;
+var TextArea = _antd.Input.TextArea;
 var TextAreaDef = props => {
   var _props$style;
   var placeholder = props.placeholder,
@@ -45,7 +44,7 @@ var TextAreaDef = props => {
   var _className = (0, _classnames.default)({
     'pro-textarea': true,
     'pro-textarea-view': isView,
-    [className]: true
+    [className]: className
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(TextArea, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     showCount: true,

package/lib/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/lib/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/lib/ProForm/components/base/TimePicker/index.js

@@ -6,17 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/time-picker/style");
-var _timePicker = _interopRequireDefault(require("antd/es/time-picker"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
-var _moment = _interopRequireDefault(require("moment"));
+var _antd = require("antd");
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
-require("./style/index.less");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["format", "onChange", "value", "otherProps"];
+var AntTimePicker = _antd.DatePicker.TimePicker;
 var TimePicker = props => {
   var _props$format = props.format,
     format = _props$format === void 0 ? 'HH:mm:ss' : _props$format,
@@ -33,7 +32,7 @@ var TimePicker = props => {
   var initialConfig = (0, _ProConfigProvider.useProConfig)('AntTimePicker');
   var handleChange = value => {
     if (valueType === 'dateTime') {
-      onChange && onChange(value ? (0, _moment.default)(value).format(format) : undefined);
+      onChange && onChange(value ? (0, _dayjs.default)(value).format(format) : undefined);
     }
   };
   if (isView) {
@@ -42,8 +41,8 @@ var TimePicker = props => {
       children: value
     });
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_timePicker.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-    value: value ? (0, _moment.default)(value, format) : undefined
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(AntTimePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+    value: value ? (0, _dayjs.default)(value, format) : undefined
   }, initialConfig), rest), {}, {
     format: format,
     onChange: handleChange

package/lib/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/lib/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/lib/ProForm/components/combination/FormList/components/ActionButton.js

@@ -6,17 +6,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-require("antd/es/popconfirm/style");
-var _popconfirm = _interopRequireDefault(require("antd/es/popconfirm"));
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _antd = require("antd");
 var _lodash = require("lodash");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
 var _icons = require("@ant-design/icons");
 var _ProIcon = _interopRequireDefault(require("../../../../../ProIcon"));
@@ -196,7 +192,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__*/(0, _jsxRuntime.jsx)(_space.default, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
     align: "start",
     className: "pro-form-list-action",
     children: actionProps === null || actionProps === void 0 ? void 0 : actionProps.map(item => {
@@ -312,7 +308,7 @@ var ActionButton = props => {
             return _ref7.apply(this, arguments);
           };
         }();
-        return _needConfirm ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_popconfirm.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        return _needConfirm ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           title: title !== null && title !== void 0 ? title : `${_locale.default.ProForm.formListConfirmMessage}`,
           onCancel: e => e.stopPropagation(),
           onConfirm: e => {
@@ -323,12 +319,18 @@ var ActionButton = props => {
             }
           }
         }, _confirmProps), {}, {
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), (0, _lodash.omit)(rest, filterKeys)), {}, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), (0, _lodash.omit)(rest, filterKeys)), {}, {
             type: "text",
             onClick: e => e.stopPropagation(),
             children: label || defaultLabel
           }))
-        }), `${item === null || item === void 0 ? void 0 : item.type}${index}`) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), (0, _lodash.omit)(rest, filterKeys)), {}, {
+        }), `${item === null || item === void 0 ? void 0 : item.type}${index}`) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+          className: (0, _classnames.default)({
+            'pro-form-list-tool-btn': mode === 'line',
+            'pro-form-list-tool-btn-block': mode === 'block',
+            'pro-form-list-tool-btn-less': mode === 'less'
+          })
+        }, defaultRest), (0, _lodash.omit)(rest, filterKeys)), {}, {
           type: "text",
           onClick: e => {
             e.stopPropagation();
@@ -341,17 +343,17 @@ var ActionButton = props => {
           children: label || defaultLabel
         }), `${item === null || item === void 0 ? void 0 : item.type}${index}`);
       }
-      return needConfirm ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_popconfirm.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      return needConfirm ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         title: title !== null && title !== void 0 ? title : `${_locale.default.ProForm.formListConfirmMessage}`,
         onCancel: e => e.stopPropagation(),
         onConfirm: () => customClick(_onClick, index)
       }, _confirmProps), {}, {
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
           type: "text",
           onClick: e => e.stopPropagation(),
           children: label
         }))
-      }), `${item === null || item === void 0 ? void 0 : item.type}${index}`) : /*#__PURE__*/(0, _react.createElement)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
+      }), `${item === null || item === void 0 ? void 0 : item.type}${index}`) : /*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
         key: `${item === null || item === void 0 ? void 0 : item.type}${index}`,
         type: "text",
         onClick: e => {

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

@@ -1,15 +1,12 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 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;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-require("antd/es/row/style");
-var _row = _interopRequireDefault(require("antd/es/row"));
+var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -56,7 +53,7 @@ var BlockFields = props => {
 
   // 左侧标题布局
   if (titlePosition === 'left') {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
       direction: "vertical",
       className: cls,
       id: id,
@@ -89,7 +86,7 @@ var BlockFields = props => {
               isView: isView,
               hideStartEndActionProps: hideStartEndActionProps
             }),
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_row.default, {
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Row, {
               gutter: 24,
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(MemoRenderFields, {
                 columns: columns,
@@ -107,7 +104,7 @@ var BlockFields = props => {
   }
 
   // 默认顶部标题布局
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
     direction: "vertical",
     className: cls,
     id: id,
@@ -133,7 +130,7 @@ var BlockFields = props => {
         isView: isView,
         hideStartEndActionProps: hideStartEndActionProps
       }),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_row.default, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Row, {
         gutter: 24,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(MemoRenderFields, {
           columns: columns,

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

@@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _antd = require("antd");
 var _lodash = require("lodash");
 var _empty = _interopRequireDefault(require("../../../../../assets/empty.png"));
 var _locale = _interopRequireDefault(require("../../../../../locale"));
@@ -88,7 +87,7 @@ var Empty = _ref => {
       className: "pro-form-list-empty-content",
       children: disabled || !show ? _locale.default.ProForm.noData : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [_locale.default.ProForm.noData, !disabled && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-          children: ["\uFF0C", /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
+          children: ["\uFF0C", /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
             type: "link",
             onClick: handleAddClick,
             style: {

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

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/row/style");
-var _row = _interopRequireDefault(require("antd/es/row"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _sortable = require("@dnd-kit/sortable");
@@ -73,7 +72,7 @@ var LineFields = props => {
         type: "drag",
         buttonIcon: false
       })
-    })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_row.default, {
+    })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Row, {
       gutter: isLess ? 0 : 24,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(MemoRenderFields, {
         columns: columns,