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

package/es/ProLayout/components/ProHeader/index.js

@@ -17,7 +17,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { memo, useEffect, useState } from 'react';
 import { tools } from '@zat-design/utils';
 import classnames from 'classnames';
-import dayjs from 'dayjs';
+import moment from 'moment';
 import { useToggle } from 'ahooks';
 import { isFunction, isEmpty, isNumber, isString } from 'lodash';
 import { ReactSVG } from 'react-svg';
@@ -157,7 +157,7 @@ var ProHeader = function ProHeader(props) {
    * 次级描述数据渲染
    */
   var subDescribeRender = function subDescribeRender(describeData) {
-    var _dayjs, _dayjs2;
+    var _moment, _moment2;
     var value = describeData.value,
       type = describeData.type,
       valueType = describeData.valueType,
@@ -188,11 +188,11 @@ var ProHeader = function ProHeader(props) {
         break;
       case 'date':
         // 年月日
-        result = value ? (_dayjs = dayjs(value)) === null || _dayjs === void 0 ? void 0 : _dayjs.format('YYYY-MM-DD') : '-';
+        result = value ? (_moment = moment(value)) === null || _moment === void 0 ? void 0 : _moment.format('YYYY-MM-DD') : '-';
         break;
       case 'dateTime':
         // 年月日 时分秒
-        result = value ? (_dayjs2 = dayjs(value)) === null || _dayjs2 === void 0 ? void 0 : _dayjs2.format('YYYY-MM-DD HH:mm:ss') : '-';
+        result = value ? (_moment2 = moment(value)) === null || _moment2 === void 0 ? void 0 : _moment2.format('YYYY-MM-DD HH:mm:ss') : '-';
         break;
       default:
         result = String(value).includes('undefined') || !value ? '-' : value;

package/es/ProTable/utils.js

@@ -3,7 +3,7 @@ import _Space from "antd/es/space";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /* eslint-disable react-hooks/rules-of-hooks */
 import { isValidElement } from 'react';
-import dayjs from 'dayjs';
+import moment from 'moment';
 import { get, isEqual, isFunction, isString } from 'lodash';
 import { tools } from '@zat-design/utils';
 import classnames from 'classnames';
@@ -156,30 +156,30 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
     column.render = function (value, record, index) {
-      var _dayjs, _dayjs2, _dayjs3, _dayjs4, _dayjs5, _dayjs6, _dayjs7, _dayjs8, _dayjs9, _dayjs10, _dayjs11, _dayjs12, _dayjs13, _dayjs14;
-      var renderValue = (_dayjs = dayjs(value)) === null || _dayjs === void 0 ? void 0 : _dayjs.format(format);
+      var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
+      var renderValue = (_moment = moment(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
       var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
-      var originalRenderValue = (_dayjs2 = dayjs(originalValue)) === null || _dayjs2 === void 0 ? void 0 : _dayjs2.format(format);
+      var originalRenderValue = (_moment2 = moment(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
       switch (valueType) {
         case 'date':
-          renderValue = (_dayjs3 = dayjs(value)) === null || _dayjs3 === void 0 ? void 0 : _dayjs3.format('YYYY-MM-DD');
-          originalRenderValue = (_dayjs4 = dayjs(originalValue)) === null || _dayjs4 === void 0 ? void 0 : _dayjs4.format('YYYY-MM-DD');
+          renderValue = (_moment3 = moment(value)) === null || _moment3 === void 0 ? void 0 : _moment3.format('YYYY-MM-DD');
+          originalRenderValue = (_moment4 = moment(originalValue)) === null || _moment4 === void 0 ? void 0 : _moment4.format('YYYY-MM-DD');
           break;
         case 'dateTime':
-          renderValue = (_dayjs5 = dayjs(value)) === null || _dayjs5 === void 0 ? void 0 : _dayjs5.format('YYYY-MM-DD HH:mm:ss');
-          originalRenderValue = (_dayjs6 = dayjs(originalValue)) === null || _dayjs6 === void 0 ? void 0 : _dayjs6.format('YYYY-MM-DD HH:mm:ss');
+          renderValue = (_moment5 = moment(value)) === null || _moment5 === void 0 ? void 0 : _moment5.format('YYYY-MM-DD HH:mm:ss');
+          originalRenderValue = (_moment6 = moment(originalValue)) === null || _moment6 === void 0 ? void 0 : _moment6.format('YYYY-MM-DD HH:mm:ss');
           break;
         case 'dateStartTime':
-          renderValue = "".concat((_dayjs7 = dayjs(value)) === null || _dayjs7 === void 0 ? void 0 : _dayjs7.format('YYYY-MM-DD'), " 00:00:00");
-          originalRenderValue = "".concat((_dayjs8 = dayjs(originalValue)) === null || _dayjs8 === void 0 ? void 0 : _dayjs8.format('YYYY-MM-DD'), " 00:00:00");
+          renderValue = "".concat((_moment7 = moment(value)) === null || _moment7 === void 0 ? void 0 : _moment7.format('YYYY-MM-DD'), " 00:00:00");
+          originalRenderValue = "".concat((_moment8 = moment(originalValue)) === null || _moment8 === void 0 ? void 0 : _moment8.format('YYYY-MM-DD'), " 00:00:00");
           break;
         case 'dateEndTime':
-          renderValue = "".concat((_dayjs9 = dayjs(value)) === null || _dayjs9 === void 0 ? void 0 : _dayjs9.format('YYYY-MM-DD'), " 23:59:59");
-          originalRenderValue = "".concat((_dayjs10 = dayjs(originalValue)) === null || _dayjs10 === void 0 ? void 0 : _dayjs10.format('YYYY-MM-DD'), " 23:59:59");
+          renderValue = "".concat((_moment9 = moment(value)) === null || _moment9 === void 0 ? void 0 : _moment9.format('YYYY-MM-DD'), " 23:59:59");
+          originalRenderValue = "".concat((_moment10 = moment(originalValue)) === null || _moment10 === void 0 ? void 0 : _moment10.format('YYYY-MM-DD'), " 23:59:59");
           break;
         case 'dateStartEndTime':
-          renderValue = "".concat((_dayjs11 = dayjs(value === null || value === void 0 ? void 0 : value[0])) === null || _dayjs11 === void 0 ? void 0 : _dayjs11.format('YYYY-MM-DD'), " 00:00:00~").concat((_dayjs12 = dayjs(value === null || value === void 0 ? void 0 : value[1])) === null || _dayjs12 === void 0 ? void 0 : _dayjs12.format('YYYY-MM-DD'), " 23:59:59");
-          originalRenderValue = "".concat((_dayjs13 = dayjs(originalValue === null || originalValue === void 0 ? void 0 : originalValue[0])) === null || _dayjs13 === void 0 ? void 0 : _dayjs13.format('YYYY-MM-DD'), " 00:00:00~").concat((_dayjs14 = dayjs(originalValue === null || originalValue === void 0 ? void 0 : originalValue[1])) === null || _dayjs14 === void 0 ? void 0 : _dayjs14.format('YYYY-MM-DD'), " 23:59:59");
+          renderValue = "".concat((_moment11 = moment(value === null || value === void 0 ? void 0 : value[0])) === null || _moment11 === void 0 ? void 0 : _moment11.format('YYYY-MM-DD'), " 00:00:00~").concat((_moment12 = moment(value === null || value === void 0 ? void 0 : value[1])) === null || _moment12 === void 0 ? void 0 : _moment12.format('YYYY-MM-DD'), " 23:59:59");
+          originalRenderValue = "".concat((_moment13 = moment(originalValue === null || originalValue === void 0 ? void 0 : originalValue[0])) === null || _moment13 === void 0 ? void 0 : _moment13.format('YYYY-MM-DD'), " 00:00:00~").concat((_moment14 = moment(originalValue === null || originalValue === void 0 ? void 0 : originalValue[1])) === null || _moment14 === void 0 ? void 0 : _moment14.format('YYYY-MM-DD'), " 23:59:59");
           break;
       }
       if (!value) {

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/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/locale/index.js

@@ -1,4 +1,4 @@
-import dayjs from 'dayjs';
+import moment from 'moment';
 import zhCN from './zh_CN';
 import enUS from './en_US';
 var activeLang = localStorage.getItem('locale') || 'zh-CN';
@@ -13,7 +13,7 @@ var langMap = {
 export var setLanguage = function setLanguage(lang, isReload) {
   activeLang = lang;
   localStorage.setItem('locale', lang);
-  dayjs.locale(lang.toLowerCase());
+  moment.locale(lang.toLowerCase());
   if (isReload) {
     window.location.reload();
   }

package/es/old/ProCertValidity/index.js

@@ -10,7 +10,7 @@ var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer"
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // @ts-nocheck
 
-import dayjs from 'dayjs';
+import moment from 'moment';
 import { forwardRef, useMemo, useRef } from 'react';
 var RangePicker = _DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
@@ -50,37 +50,37 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
         forever = _value.forever;
       if (forever === 'Y') {
         return {
-          range: [dayjs('9999-01-01'), dayjs('9999-01-01')],
+          range: [moment('9999-01-01'), moment('9999-01-01')],
           forever: true
         };
       }
       if (startTime && endTime) {
-        var tempStartDate = dayjs(startTime).format(defaultFormatDate);
-        var tempEndDate = dayjs(endTime).format(defaultFormatDate);
+        var tempStartDate = moment(startTime).format(defaultFormatDate);
+        var tempEndDate = moment(endTime).format(defaultFormatDate);
         if ((!forever || forever === 'N') && !checkIsForever(tempStartDate) && !checkIsForever(tempEndDate)) {
           return {
-            range: [dayjs(startTime), dayjs(endTime)],
+            range: [moment(startTime), moment(endTime)],
             forever: false
           };
         }
         if (checkIsForever(tempStartDate) && checkIsForever(tempEndDate) && !isChange.current) {
           return {
-            range: [dayjs('9999-01-01'), dayjs('9999-01-01')],
+            range: [moment('9999-01-01'), moment('9999-01-01')],
             forever: true
           };
         }
       }
     } else {
       if (typeof value === 'string' || value._isAMomentObject) {
-        var tempDate = dayjs(value).format(defaultFormatDate);
+        var tempDate = moment(value).format(defaultFormatDate);
         if (tempDate && tempDate === '9999-01-01') {
           return {
-            range: dayjs('9999-01-01'),
+            range: moment('9999-01-01'),
             forever: true
           };
         }
         return {
-          range: dayjs(value),
+          range: moment(value),
           forever: false
         };
       }
@@ -89,21 +89,21 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
         _forever = _value2.forever;
       if (_forever === 'Y') {
         return {
-          range: dayjs('9999-01-01'),
+          range: moment('9999-01-01'),
           forever: true
         };
       }
       if (dateTime) {
-        var _tempDate = dayjs(dateTime).format(defaultFormatDate);
+        var _tempDate = moment(dateTime).format(defaultFormatDate);
         if ((!_forever || _forever === 'N') && _tempDate !== '9999-01-01') {
           return {
-            range: dayjs(dateTime),
+            range: moment(dateTime),
             forever: false
           };
         }
         if (_tempDate && _tempDate === '9999-01-01' && !isChange.current) {
           return {
-            range: dayjs('9999-01-01'),
+            range: moment('9999-01-01'),
             forever: true
           };
         }
@@ -113,8 +113,8 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, [value, (_value3 = value) === null || _value3 === void 0 ? void 0 : _value3.dateTime]);
   var changeRangeTime = function changeRangeTime(values) {
     onChange({
-      startTime: values ? dayjs(values === null || values === void 0 ? void 0 : values[0]).format(defaultFormatDate) : null,
-      endTime: values ? dayjs(values === null || values === void 0 ? void 0 : values[1]).format(defaultFormatDate) : null,
+      startTime: values ? moment(values === null || values === void 0 ? void 0 : values[0]).format(defaultFormatDate) : null,
+      endTime: values ? moment(values === null || values === void 0 ? void 0 : values[1]).format(defaultFormatDate) : null,
       forever: 'N'
     });
   };
@@ -142,7 +142,7 @@ export var ProCertValidity = /*#__PURE__*/forwardRef(function (_ref, ref) {
     if (rangeTime.forever) {
       _value4 = '长期';
     } else {
-      _value4 = rangeTime.range ? dayjs(rangeTime.range).format(defaultFormatDate) : null;
+      _value4 = rangeTime.range ? moment(rangeTime.range).format(defaultFormatDate) : null;
     }
     return _jsx(_Input, {
       value: _value4,

package/es/old/ProCertValidity/propsType.d.ts

@@ -1,12 +1,12 @@
 import { DatePickerProps, RangePickerProps } from 'antd/es/date-picker';
-import dayjs from 'dayjs';
+import moment from 'moment';
 interface ICertValidityValuePropsType {
-    dateTime?: dayjs.Dayjs | string;
+    dateTime?: moment.Moment | string;
     forever?: string;
 }
 interface ICertValidityRangeValuePropsType {
-    startTime?: dayjs.Dayjs | string;
-    endTime?: dayjs.Dayjs | string;
+    startTime?: moment.Moment | string;
+    endTime?: moment.Moment | string;
     forever?: string;
 }
 interface IProCertValidityExtraPropsType {

package/es/old/ProEditableTable/utils.d.ts

@@ -1,7 +1,7 @@
-import type { Dayjs } from 'dayjs';
+import type { Moment } from 'moment';
 import { IRowDataPropsType } from './propsType';
 export declare const rangePickerTransform: (formatter?: string) => {
-    normalize: (value: [Dayjs, Dayjs]) => {
+    normalize: (value: [Moment, Moment]) => {
         from?: undefined;
         to?: undefined;
     } | {
@@ -13,15 +13,15 @@ export declare const rangePickerTransform: (formatter?: string) => {
         to: string;
     }) => {
         format: string;
-        value: Dayjs[];
+        value: Moment[];
     };
     getValueFromEvent: (rawDate?: any) => any;
 };
 export declare const datePickerTransform: (formatter?: string) => {
-    normalize: (value: Dayjs) => string;
+    normalize: (value: Moment) => string;
     getValueProps: (value: string) => {
         format: string;
-        value: Dayjs;
+        value: Moment;
     };
 };
 export declare const transformColumns: (columns: any[], form: any, disabled: Boolean) => any[];

package/es/old/ProEditableTable/utils.js

@@ -20,7 +20,7 @@ import "antd/es/select/style";
 import _Select from "antd/es/select";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { cloneDeep } from 'lodash';
-import dayjs from 'dayjs';
+import moment from 'moment';
 import { InputRange } from '../../ProForm/components';
 var Option = _Select.Option;
 var RangePicker = _DatePicker.RangePicker;
@@ -47,7 +47,7 @@ export var rangePickerTransform = function rangePickerTransform() {
         to = _ref.to;
       return {
         format: formatter,
-        value: [from ? dayjs(from) : null, to ? dayjs(to) : null]
+        value: [from ? moment(from) : null, to ? moment(to) : null]
       };
     },
     getValueFromEvent: function getValueFromEvent() {
@@ -61,13 +61,13 @@ export var datePickerTransform = function datePickerTransform() {
   var formatter = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'YYYY-MM-DD';
   return {
     normalize: function normalize(value) {
-      var _dayjs;
-      return value ? (_dayjs = dayjs(value)) === null || _dayjs === void 0 ? void 0 : _dayjs.format(formatter) : null;
+      var _moment;
+      return value ? (_moment = moment(value)) === null || _moment === void 0 ? void 0 : _moment.format(formatter) : null;
     },
     getValueProps: function getValueProps(value) {
       return {
         format: formatter,
-        value: value ? dayjs(value) : null
+        value: value ? moment(value) : null
       };
     }
   };

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

@@ -30,8 +30,6 @@ var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"
 var _utils = require("../../../ProForm/utils");
 var _locale = _interopRequireDefault(require("../../../locale"));
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className"];
-/* eslint-disable prefer-destructuring */
-/* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
   var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4, _classNames;
   var value = _ref.text,

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

@@ -1,12 +1,12 @@
 import { DatePickerProps, TimePickerProps } from 'antd';
-import { Dayjs } from 'dayjs';
+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<Dayjs>['showTime'];
+    showTime?: PickerPanelDateProps<Moment>['showTime'];
     showNow?: boolean;
 };
 declare const DatePicker: React.FC<Props>;

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

@@ -12,7 +12,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _dayjs = _interopRequireDefault(require("dayjs"));
+var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -36,12 +36,12 @@ var DatePicker = function DatePicker(props) {
     var viewChildren = null;
     if (!value) {
       viewChildren = null;
-    } else if (typeof format === 'string' && _dayjs.default.isDayjs(value)) {
+    } else if (typeof format === 'string' && _moment.default.isMoment(value)) {
       viewChildren = value.format(format);
     } else if ((0, _lodash.isFunction)(format)) {
       viewChildren = format(value);
     } else if ((0, _lodash.isString)(value)) {
-      viewChildren = (0, _dayjs.default)(value).format(format);
+      viewChildren = (0, _moment.default)(value).format(format);
     }
     return (0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
@@ -54,11 +54,11 @@ var DatePicker = function DatePicker(props) {
   });
   // 字符串时间格式兼容
   if ((0, _lodash.isString)(_rest.value)) {
-    _rest.value = (0, _dayjs.default)(_rest.value);
+    _rest.value = (0, _moment.default)(_rest.value);
   }
   if (['dateStartTime', 'dateEndTime'].includes(valueType) && rest.showTime === undefined) {
     _rest.showTime = {
-      value: (0, _dayjs.default)(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
+      value: (0, _moment.default)(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
       disabled: true
     };
   }

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

@@ -1,12 +1,11 @@
+import type { RangePickerProps } from 'antd/es/date-picker';
 import React from 'react';
-import { Dayjs } from 'dayjs';
-import { RangePickerProps } from 'antd/lib/date-picker/generatePicker';
 import { ProFormOtherProps } from '../../../propsType';
 export type Props = {
     otherProps?: ProFormOtherProps;
     separator?: any;
     showTime?: any;
     isView?: boolean;
-} & Omit<RangePickerProps<Dayjs>, 'separator'>;
+} & Omit<RangePickerProps, 'separator'>;
 declare const RangePicker: React.FC<Props>;
 export default RangePicker;

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

@@ -10,7 +10,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _lodash = require("lodash");
-var _dayjs = _interopRequireDefault(require("dayjs"));
+var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -56,9 +56,9 @@ var RangePicker = function RangePicker(props) {
   var _res = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
     showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
   });
-  // // 字符串时间格式兼容
+  // 字符串时间格式兼容
   if (Array.isArray(_res.value) && (0, _lodash.isString)(_res.value[0]) && (0, _lodash.isString)(_res.value[1])) {
-    _res.value = [(0, _dayjs.default)(_res.value[0]), (0, _dayjs.default)(_res.value[1])];
+    _res.value = [(0, _moment.default)(_res.value[0]), (0, _moment.default)(_res.value[1])];
   }
   return (0, _jsxRuntime.jsx)(AntRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), (0, _lodash.omit)(_res, ['separator'])));
 };

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

@@ -9,7 +9,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
-var _dayjs = _interopRequireDefault(require("dayjs"));
+var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
@@ -31,7 +31,7 @@ var TimePicker = function TimePicker(props) {
   var initialConfig = (0, _ProConfigProvider.useProConfig)('AntTimePicker');
   var handleChange = function handleChange(value) {
     if (valueType === 'dateTime') {
-      onChange && onChange(value ? (0, _dayjs.default)(value).format(format) : undefined);
+      onChange && onChange(value ? (0, _moment.default)(value).format(format) : undefined);
     }
   };
   if (isView) {
@@ -41,7 +41,7 @@ var TimePicker = function TimePicker(props) {
     });
   }
   return (0, _jsxRuntime.jsx)(_antd.TimePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-    value: value ? (0, _dayjs.default)(value, format) : undefined
+    value: value ? (0, _moment.default)(value, format) : undefined
   }, initialConfig), rest), {}, {
     format: format,
     onChange: handleChange

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;
       });

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

@@ -643,7 +643,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
     return defaultAddonAfter;
   };
-  console.log(_locale.default.ProModalSelect.select);
   // 加个中间状态Input
   var initRender = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [(0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread2.default)({

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RangePickerProps } from 'antd/es/date-picker';
-import { Dayjs } from 'dayjs';
+import { Moment } from 'moment';
 export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'separator' | 'mode'> & {
     disabled?: boolean;
     foreverText?: string;
@@ -12,7 +12,7 @@ export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'se
     separator?: any;
     isView?: boolean;
 };
-type Value = [Dayjs?, Dayjs?, boolean?];
+type Value = [Moment?, Moment?, boolean?];
 type ValueStr = [string?, string?, string?];
 type HandleChange = (value: ValueStr | null, valueStr: Value | null) => void;
 declare const ProRangeLimit: React.FC<Props>;

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

@@ -13,13 +13,13 @@ var _react = require("react");
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _dayjs = _interopRequireDefault(require("dayjs"));
+var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator"];
-var defaultPickerValue = [(0, _dayjs.default)(), (0, _dayjs.default)()];
+var defaultPickerValue = [(0, _moment.default)(), (0, _moment.default)()];
 var useControlled = function useControlled(props) {
   var _useState = (0, _react.useState)(),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -27,7 +27,7 @@ var useControlled = function useControlled(props) {
     setValue = _useState2[1];
   if ('value' in props) {
     var _props$value, _props$value2;
-    var internalValue = [((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value[0]) && (0, _dayjs.default)(props.value[0], props.format), ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2[1]) && (0, _dayjs.default)(props.value[1], props.format)];
+    var internalValue = [((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value[0]) && (0, _moment.default)(props.value[0], props.format), ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2[1]) && (0, _moment.default)(props.value[1], props.format)];
     var handleChange = function handleChange(value, other) {
       var _value = (0, _slicedToArray2.default)(value, 2),
         start = _value[0],
@@ -76,10 +76,10 @@ var ProRangeLimit = function ProRangeLimit(props) {
     'forever-checkbox': true
   });
   var _isForever = (0, _react.useMemo)(function () {
-    return (0, _dayjs.default)(foreverDate, format).isSame(endDate);
+    return (0, _moment.default)(foreverDate, format).isSame(endDate);
   }, [value]);
   var foreverMoment = (0, _react.useMemo)(function () {
-    return (0, _dayjs.default)(foreverDate, format);
+    return (0, _moment.default)(foreverDate, format);
   }, [foreverDate, format]);
   if (isView) {
     var _props$value3, _props$value4;
@@ -117,7 +117,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
       start = _ref9[0],
       end = _ref9[1];
     if (e.target.checked) {
-      start = start || (0, _dayjs.default)().startOf('day');
+      start = start || (0, _moment.default)().startOf('day');
       end = foreverMoment;
     } else {
       start = undefined;

package/lib/ProForm/components/combination/ProTimeLimit/hooks/useControlled.d.ts

@@ -1,8 +1,8 @@
-import dayjs, { Dayjs } from 'dayjs';
+import moment, { Moment } from 'moment';
 interface Props<T = any> {
     value?: T;
     onChange?: (value: T, ...rest: any[]) => void;
     format?: string;
 }
-declare const useControlled: (props: Props) => [dayjs.Dayjs, (value: Dayjs | undefined) => void];
+declare const useControlled: (props: Props) => [moment.Moment, (value: Moment | undefined) => void];
 export default useControlled;

package/lib/ProForm/components/combination/ProTimeLimit/hooks/useControlled.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _dayjs = _interopRequireDefault(require("dayjs"));
+var _moment = _interopRequireDefault(require("moment"));
 var _react = require("react");
 var useControlled = function useControlled(props) {
   var value = props.value,
@@ -25,7 +25,7 @@ var useControlled = function useControlled(props) {
     onChange(_value, value);
   };
   if ('value' in props) {
-    return [value && (0, _dayjs.default)(value, format).startOf('day'), handleChange];
+    return [value && (0, _moment.default)(value, format).startOf('day'), handleChange];
   }
   return [valueState, handleChange];
 };

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

@@ -1,12 +1,12 @@
 import { DatePickerProps } from 'antd';
-import { Dayjs } from 'dayjs';
+import { Moment } from 'moment';
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
 import { Props as ProRangeLimitProps } from '../ProRangeLimit';
 export type DateType = DatePickerProps['value'];
 export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onChange' | 'mode'> & {
     value?: string;
-    onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Dayjs) => void;
+    onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Moment) => void;
     disabled?: boolean;
     foreverTime?: string;
     foreverText?: string;