@zat-design/sisyphus-react 3.2.2 → 3.3.0-beta.2

package/lib/ProForm/components/combination/ProAddressBar/style/index.less

@@ -1,8 +1,11 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-address {
   display: flex;
   width: 100%;
 
-  .ant-cascader {
+  .@{ant-prefix}-cascader {
     width: 50% !important;
 
     &.no-detail {
@@ -14,12 +17,12 @@
     width: 50%;
     margin-left: 2px;
 
-    .ant-input-affix-wrapper {
+    .@{ant-prefix}-input-affix-wrapper {
       width: 100%;
     }
   }
 
-  .ant-input-affix-wrapper {
+  .@{ant-prefix}-input-affix-wrapper {
     width: 50%;
     margin-left: 2px;
   }

package/lib/ProForm/components/combination/ProCombination/style/index.less

@@ -1,4 +1,7 @@
-.pro-combination.ant-input-group.ant-input-group-compact {
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
+.pro-combination.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact {
   display: flex;
 
   & > * {
@@ -9,7 +12,7 @@
     flex: none;
   }
 
-  & > *:not(.ant-btn) {
+  & > *:not(.@{ant-prefix}-btn) {
     flex: 1;
   }
 }

package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -13,6 +14,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _ahooks = require("ahooks");
 var _lodash = require("lodash");
 var _react = require("react");
+var _locale = _interopRequireWildcard(require("../../../../../locale"));
 var defaultPage = {
   pageNum: 1,
   pageSize: 10
@@ -136,7 +138,11 @@ function useRequestList(service, options, useRequestOptions) {
       onShowSizeChange: onChange,
       hideOnSinglePage: page.pageSize === 10,
       showTotal: function showTotal(total) {
-        return "\u5171".concat(total, "\u6761");
+        var _locale$ProEditTable;
+        if (!total) return;
+        return (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEditTable = _locale.default.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+          total: total
+        });
       }
     } : false
   });

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

@@ -420,19 +420,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               useRequest.initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField = contentForm.getFieldsValue) === null || _contentForm$getField === void 0 ? void 0 : _contentForm$getField.call(contentForm));
             }
             if (!((useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || defaultOne)) {
-              _context4.next = 13;
+              _context4.next = 10;
               break;
             }
-            if (readOnly) {
-              _context4.next = 5;
-              break;
-            }
-            setState({
-              _value: value,
-              isInit: false
-            });
-            return _context4.abrupt("return");
-          case 5:
             queryBean = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || {});
             page = (0, _objectSpread2.default)({
               pageNum: 1,
@@ -442,9 +432,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
             params = transformParams ? transformParams(params) : params;
-            _context4.next = 11;
+            _context4.next = 8;
             return runAsync(params);
-          case 11:
+          case 8:
             res = _context4.sent;
             if (res === null || res === void 0 ? void 0 : res.data) {
               list = [];
@@ -454,19 +444,27 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list : res === null || res === void 0 ? void 0 : res.data;
               }
               _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
-              nextSelectRowKeys = isMultiple ? value : [value];
-              if (labelInValue) {
-                onChange(_data2);
+              if (_data2) {
+                nextSelectRowKeys = isMultiple ? value : [value];
+                if (labelInValue) {
+                  onChange(_data2);
+                }
+                // 更新内部展示值
+                setState({
+                  _value: _data2,
+                  isInit: false,
+                  selectedRows: list,
+                  selectedRowKeys: nextSelectRowKeys
+                });
+              } else if (!readOnly) {
+                // 当传入initParams且文本框非只读时，不调用接口获取初始化数据
+                setState({
+                  _value: value,
+                  isInit: false
+                });
               }
-              // 更新内部展示值
-              setState({
-                _value: _data2,
-                isInit: false,
-                selectedRows: list,
-                selectedRowKeys: nextSelectRowKeys
-              });
             }
-          case 13:
+          case 10:
           case "end":
             return _context4.stop();
         }

package/lib/ProForm/components/combination/ProModalSelect/style/index.less

@@ -1,6 +1,9 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-modal-select,
 .pro-tree-modal {
-  .ant-input-group-wrapper {
+  .@{ant-prefix}-input-group-wrapper {
     .close-icon {
       display: none;
     }
@@ -32,31 +35,49 @@
       }
     }
     &:hover {
-      .ant-input,
-      .ant-input-group-addon {
+      .@{ant-prefix}-input,
+      .@{ant-prefix}-input-group-addon {
         border-color: var(--zaui-brand-hover, #3387ff);
       }
+
+      .@{ant-prefix}-input-disabled {
+        border-color: #d9d9d9;
+      }
+
+      .@{ant-prefix}-input-disabled + span {
+        border-color: #d9d9d9;
+        .close-icon {
+          display: none;
+        }
+      }
+    }
+  }
+
+  .pro-tree-modal-input-appoint {
+    .@{ant-prefix}-input {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
     }
   }
 
-  .ant-input-group-wrapper-status-error {
+  .@{ant-prefix}-input-group-wrapper-status-error {
     &:hover {
-      .ant-input,
-      .ant-input-group-addon {
+      .@{ant-prefix}-input,
+      .@{ant-prefix}-input-group-addon {
         border-color: var(--ant-error-color, #ff4d4f);
       }
     }
   }
-  .ant-input-group {
-    .ant-input {
+  .@{ant-prefix}-input-group {
+    .@{ant-prefix}-input {
       padding-right: 26px;
     }
   }
 
   .trigger-no-hover {
     &:hover {
-      .ant-input,
-      .ant-input-group-addon {
+      .@{ant-prefix}-input,
+      .@{ant-prefix}-input-group-addon {
         border-color: @zaui-form-control-line;
       }
     }
@@ -72,7 +93,7 @@
     fill: #c5c7cd;
   }
 
-  .ant-input-group-addon {
+  .@{ant-prefix}-input-group-addon {
     padding: 0px var(--zaui-space-size-sm, 8px);
     background-color: var(--zaui-base-bg, #ffffff);
     cursor: pointer;

package/lib/ProForm/components/combination/ProNumberRange/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-number-range {
 
   .range-split {
@@ -8,7 +11,7 @@
     text-align    : center !important;
   }
 
-  .ant-input-status-error {
+  .@{ant-prefix}-input-status-error {
     &.range-split {
       border-color: @zaui-danger;
     }
@@ -16,16 +19,16 @@
 
 
 
-  & .ant-input-rtl.range-right {
+  & .@{ant-prefix}-input-rtl.range-right {
     border-right-width: 0;
   }
 
-  & .ant-input-rtl.range-right:hover,
-  & .ant-input-rtl.range-right:focus {
+  & .@{ant-prefix}-input-rtl.range-right:hover,
+  & .@{ant-prefix}-input-rtl.range-right:focus {
     border-right-width: 1px;
   }
 
-  .ant-form-item {
+  .@{ant-prefix}-form-item {
     margin-bottom: 0;
   }
 
@@ -36,13 +39,13 @@
   }
 
   .range-left {
-    .ant-input-number {
+    .@{ant-prefix}-input-number {
       border-right: none;
     }
   }
 
   .range-right {
-    .ant-input-number {
+    .@{ant-prefix}-input-number {
       border-left: none;
     }
 
@@ -53,7 +56,7 @@
     }
   }
 
-  &.ant-input-group.ant-input-group-compact>*:not(:last-child) {
+  &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact>*:not(:last-child) {
     margin-right: 0;
   }
 
@@ -61,7 +64,7 @@
     border-top-right-radius   : 0 !important;
     border-bottom-right-radius: 0 !important;
 
-    >.ant-select-selector {
+    >.@{ant-prefix}-select-selector {
       border-top-right-radius   : 0 !important;
       border-bottom-right-radius: 0 !important;
     }
@@ -71,7 +74,7 @@
     border-top-left-radius   : 0 !important;
     border-bottom-left-radius: 0 !important;
 
-    >.ant-select-selector {
+    >.@{ant-prefix}-select-selector {
       border-top-left-radius   : 0 !important;
       border-bottom-left-radius: 0 !important;
     }

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 { Moment } from 'moment';
+import { Dayjs } from 'dayjs';
 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 = [Moment?, Moment?, boolean?];
+type Value = [Dayjs?, Dayjs?, 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 _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
 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, _moment.default)(), (0, _moment.default)()];
+var defaultPickerValue = [(0, _dayjs.default)(), (0, _dayjs.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, _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 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 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, _moment.default)(foreverDate, format).isSame(endDate);
+    return (0, _dayjs.default)(foreverDate, format).isSame(endDate);
   }, [value]);
   var foreverMoment = (0, _react.useMemo)(function () {
-    return (0, _moment.default)(foreverDate, format);
+    return (0, _dayjs.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, _moment.default)().startOf('day');
+      start = start || (0, _dayjs.default)().startOf('day');
       end = foreverMoment;
     } else {
       start = undefined;

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

@@ -1,8 +1,8 @@
-import moment, { Moment } from 'moment';
+import dayjs, { Dayjs } from 'dayjs';
 interface Props<T = any> {
     value?: T;
     onChange?: (value: T, ...rest: any[]) => void;
     format?: string;
 }
-declare const useControlled: (props: Props) => [moment.Moment, (value: Moment | undefined) => void];
+declare const useControlled: (props: Props) => [dayjs.Dayjs, (value: Dayjs | 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 _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
 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, _moment.default)(value, format).startOf('day'), handleChange];
+    return [value && (0, _dayjs.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 { Moment } from 'moment';
+import { Dayjs } from 'dayjs';
 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: Moment) => void;
+    onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Dayjs) => void;
     disabled?: boolean;
     foreverTime?: string;
     foreverText?: string;

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

@@ -13,7 +13,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
-var _moment = _interopRequireWildcard(require("moment"));
+var _dayjs = _interopRequireWildcard(require("dayjs"));
 var _react = require("react");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -40,7 +40,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     viewEmpty = _ref.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var _useMemo = (0, _react.useMemo)(function () {
-      var foreverMoment = foreverTime ? (0, _moment.default)(foreverTime, format) : (0, _moment.default)('9999-01-01', 'YYYY-MM-DD');
+      var foreverMoment = foreverTime ? (0, _dayjs.default)(foreverTime, format) : (0, _dayjs.default)('9999-01-01', 'YYYY-MM-DD');
       var foreverString = foreverTime || foreverMoment.format(format);
       return [foreverString, foreverMoment];
     }, [format, foreverTime]),
@@ -56,7 +56,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     onChange = _useControlled2[1];
   var initialConfig = (0, _ProConfigProvider.useProConfig)('ProTimeLimit');
   var isForever = (0, _react.useMemo)(function () {
-    if ((0, _moment.isMoment)(value)) {
+    if ((0, _dayjs.isDayjs)(value)) {
       return foreverMoment.format(format) === value.format(format);
     }
     return false;
@@ -64,7 +64,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
   var foreverChange = function foreverChange(e) {
     var checkedForever = e.target.checked;
     if (checkedForever) {
-      onChange((0, _moment.default)(foreverString, format));
+      onChange((0, _dayjs.default)(foreverString, format));
     } else {
       onChange(null);
     }

package/lib/ProForm/components/combination/ProTimeLimit/style/index.less

@@ -1,10 +1,13 @@
-.ant-form-item-has-error {
-  .ant-picker-status-error
-    ~ .forever-checkbox:not(.ant-input-disabled):not(.ant-input-borderless).ant-input {
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
+.@{ant-prefix}-form-item-has-error {
+  .@{ant-prefix}-picker-status-error
+    ~ .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(.@{ant-prefix}-input-borderless).@{ant-prefix}-input {
     background: @zaui-base-bg;
     border-color: var(--ant-error-color);
   }
-  .forever-checkbox:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus {
+  .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(.@{ant-prefix}-input-borderless).@{ant-prefix}-input:focus {
     border-color: var(--ant-error-color-hover);
     border-right-width: 1px;
     outline: 0;
@@ -12,12 +15,12 @@
   }
 }
 
-span.ant-input-group-compact {
+span.@{ant-prefix}-input-group-compact {
   &.pro-time-limit,
   &.pro-range-limit {
     display: flex;
 
-    .ant-picker {
+    .@{ant-prefix}-picker {
       flex: 1;
     }
 

package/lib/ProForm/components/old/ProCertValidity/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 _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _react = require("react");
 var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"]; // @ts-nocheck
 var RangePicker = _antd.DatePicker.RangePicker;
@@ -50,37 +50,37 @@ var ProCertValidity = exports.ProCertValidity = /*#__PURE__*/(0, _react.forwardR
         forever = _value2.forever;
       if (forever === 'Y') {
         return {
-          range: [(0, _moment.default)('9999-01-01'), (0, _moment.default)('9999-01-01')],
+          range: [(0, _dayjs.default)('9999-01-01'), (0, _dayjs.default)('9999-01-01')],
           forever: true
         };
       }
       if (startTime && endTime) {
-        var tempStartDate = (0, _moment.default)(startTime).format(defaultFormatDate);
-        var tempEndDate = (0, _moment.default)(endTime).format(defaultFormatDate);
+        var tempStartDate = (0, _dayjs.default)(startTime).format(defaultFormatDate);
+        var tempEndDate = (0, _dayjs.default)(endTime).format(defaultFormatDate);
         if ((!forever || forever === 'N') && !checkIsForever(tempStartDate) && !checkIsForever(tempEndDate)) {
           return {
-            range: [(0, _moment.default)(startTime), (0, _moment.default)(endTime)],
+            range: [(0, _dayjs.default)(startTime), (0, _dayjs.default)(endTime)],
             forever: false
           };
         }
         if (checkIsForever(tempStartDate) && checkIsForever(tempEndDate) && !isChange.current) {
           return {
-            range: [(0, _moment.default)('9999-01-01'), (0, _moment.default)('9999-01-01')],
+            range: [(0, _dayjs.default)('9999-01-01'), (0, _dayjs.default)('9999-01-01')],
             forever: true
           };
         }
       }
     } else {
       if (typeof value === 'string' || value._isAMomentObject) {
-        var tempDate = (0, _moment.default)(value).format(defaultFormatDate);
+        var tempDate = (0, _dayjs.default)(value).format(defaultFormatDate);
         if (tempDate && tempDate === '9999-01-01') {
           return {
-            range: (0, _moment.default)('9999-01-01'),
+            range: (0, _dayjs.default)('9999-01-01'),
             forever: true
           };
         }
         return {
-          range: (0, _moment.default)(value),
+          range: (0, _dayjs.default)(value),
           forever: false
         };
       }
@@ -89,21 +89,21 @@ var ProCertValidity = exports.ProCertValidity = /*#__PURE__*/(0, _react.forwardR
         _forever = _value3.forever;
       if (_forever === 'Y') {
         return {
-          range: (0, _moment.default)('9999-01-01'),
+          range: (0, _dayjs.default)('9999-01-01'),
           forever: true
         };
       }
       if (dateTime) {
-        var _tempDate = (0, _moment.default)(dateTime).format(defaultFormatDate);
+        var _tempDate = (0, _dayjs.default)(dateTime).format(defaultFormatDate);
         if ((!_forever || _forever === 'N') && _tempDate !== '9999-01-01') {
           return {
-            range: (0, _moment.default)(dateTime),
+            range: (0, _dayjs.default)(dateTime),
             forever: false
           };
         }
         if (_tempDate && _tempDate === '9999-01-01' && !isChange.current) {
           return {
-            range: (0, _moment.default)('9999-01-01'),
+            range: (0, _dayjs.default)('9999-01-01'),
             forever: true
           };
         }
@@ -113,8 +113,8 @@ var ProCertValidity = exports.ProCertValidity = /*#__PURE__*/(0, _react.forwardR
   }, [value, (_value4 = value) === null || _value4 === void 0 ? void 0 : _value4.dateTime]);
   var changeRangeTime = function changeRangeTime(values) {
     onChange({
-      startTime: values ? (0, _moment.default)(values === null || values === void 0 ? void 0 : values[0]).format(defaultFormatDate) : null,
-      endTime: values ? (0, _moment.default)(values === null || values === void 0 ? void 0 : values[1]).format(defaultFormatDate) : null,
+      startTime: values ? (0, _dayjs.default)(values === null || values === void 0 ? void 0 : values[0]).format(defaultFormatDate) : null,
+      endTime: values ? (0, _dayjs.default)(values === null || values === void 0 ? void 0 : values[1]).format(defaultFormatDate) : null,
       forever: 'N'
     });
   };
@@ -142,7 +142,7 @@ var ProCertValidity = exports.ProCertValidity = /*#__PURE__*/(0, _react.forwardR
     if (rangeTime.forever) {
       _value = '长期';
     } else {
-      _value = rangeTime.range ? (0, _moment.default)(rangeTime.range).format(defaultFormatDate) : null;
+      _value = rangeTime.range ? (0, _dayjs.default)(rangeTime.range).format(defaultFormatDate) : null;
     }
     return (0, _jsxRuntime.jsx)(_antd.Input, {
       value: _value,

package/lib/ProForm/components/old/ProCertValidity/propsType.d.ts

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

package/lib/ProForm/components/render/RenderFields.js

@@ -74,8 +74,7 @@ var RenderFields = function RenderFields(props) {
       formItemChildProps = _column$formItemChild === void 0 ? {} : _column$formItemChild,
       _column$fieldProps = column.fieldProps,
       fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
-      _column$disabled = column.disabled,
-      disabled = _column$disabled === void 0 ? false : _column$disabled,
+      disabled = column.disabled,
       equalWith = column.equalWith,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
@@ -145,10 +144,10 @@ var RenderFields = function RenderFields(props) {
       _fieldProps.disabled = formDisabled;
     }
     var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      disabledStrictly: true
-    }, _fieldProps), {}, {
-      disabled: _disabled,
+      disabledStrictly: true,
       placeholder: _placeholder
+    }, _fieldProps), {}, {
+      disabled: _disabled
     });
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {