@zat-design/sisyphus-react 3.13.13-beta.6 → 4.0.0-beta.2

package/es/ProEnum/index.js

@@ -1,11 +1,3 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import "antd/es/checkbox/style";
-import _Checkbox from "antd/es/checkbox";
-import "antd/es/radio/style";
-import _Radio from "antd/es/radio";
-import "antd/es/message/style";
-import _message from "antd/es/message";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
@@ -21,6 +13,7 @@ var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component
   _excluded2 = ["fieldNames", "clear", "cacheKey", "showCodeName"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
+import { message, Radio, Checkbox, Space } from 'antd';
 import React, { useState, useEffect, useMemo } from 'react';
 import ProSelect from '../ProSelect';
 import { useProConfig } from '../ProConfigProvider';
@@ -102,7 +95,7 @@ var ProEnum = function ProEnum(props) {
           var responseData = transformResponse(res);
           if (_typeof(responseData) !== 'object') {
             var _locale$ProEnum;
-            return _message.error((_locale$ProEnum = locale.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorMessage);
+            return message.error((_locale$ProEnum = locale.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorMessage);
           }
           setData(responseData);
         } else {
@@ -113,7 +106,7 @@ var ProEnum = function ProEnum(props) {
           if (status === 200) {
             if (_typeof(data) !== 'object') {
               var _locale$ProEnum2;
-              return _message.error((_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
+              return message.error((_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
             }
             if (Array.isArray(data)) {
               setData(_toConsumableArray(data));
@@ -122,7 +115,7 @@ var ProEnum = function ProEnum(props) {
               setData(data[code]);
             }
           } else {
-            _message.error(msg);
+            message.error(msg);
           }
         }
       }
@@ -188,12 +181,12 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange
         }));
       case 'Radio':
-        return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, _omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
+        return _jsx(Radio.Group, _objectSpread(_objectSpread({}, _omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
           children: list.map(function (item) {
-            return _jsx(_Radio, {
+            return _jsx(Radio, {
               value: item[fieldValue],
               disabled: !!item.disabled,
               children: item[label]
@@ -201,12 +194,12 @@ var ProEnum = function ProEnum(props) {
           })
         }));
       case 'Checkbox':
-        return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, _omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
+        return _jsx(Checkbox.Group, _objectSpread(_objectSpread({}, _omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
           children: list.map(function (item) {
-            return _jsx(_Checkbox, {
+            return _jsx(Checkbox, {
               value: item[fieldValue],
               disabled: !!item.disabled,
               children: item[label]
@@ -236,7 +229,7 @@ var ProEnum = function ProEnum(props) {
   };
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
-    _message.error("".concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.label, "-").concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name, "-").concat(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType));
+    message.error("".concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.label, "-").concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name, "-").concat(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType));
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;
@@ -269,7 +262,7 @@ var ProEnum = function ProEnum(props) {
       record.forEach(function (item) {
         arr.push(props.optionRender(item));
       });
-      return _jsx(_Space, {
+      return _jsx(Space, {
         direction: "vertical",
         size: 4,
         children: arr.map(function (item) {

package/es/ProEnum/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 @zaui-disabled-bg: var(--zaui-disabled-bg);
 

package/es/ProEnum/utils/index.d.ts

@@ -1,5 +1,6 @@
 import { DataOption } from '../propsType';
 type StorageType = 'localStorage' | 'sessionStorage';
+export declare const baseCacheKey = "zat-design-pro-component-cacheKey";
 interface EnumRes {
     data: Record<string, DataOption[]>;
     [key: string]: any;

package/es/ProEnum/utils/index.js

@@ -2,6 +2,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _isUndefined from "lodash/isUndefined";
 import _isNull from "lodash/isNull";
 var _excluded = ["children"];
+export var baseCacheKey = 'zat-design-pro-component-cacheKey';
 /**
  * 获取枚举数据
  * @param storage
@@ -10,7 +11,7 @@ var _excluded = ["children"];
  * @returns
  */
 export function getEnumData(storage, cacheKey, baseEnumStorage) {
-  if (baseEnumStorage && window.localStorage.getItem(cacheKey)) {
+  if (baseEnumStorage && window.localStorage.getItem(cacheKey) && cacheKey === baseCacheKey) {
     return baseEnumStorage;
   }
   if (storage === 'localStorage') {

package/es/ProForm/components/Container.d.ts

@@ -3,6 +3,7 @@ interface Props {
     tooltip?: boolean;
     nowrap?: boolean;
     viewEmpty?: React.ReactNode;
+    children?: React.ReactNode;
 }
 declare const Container: React.FC<Props>;
 export default Container;

package/es/ProForm/components/Container.js

@@ -1,6 +1,5 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Tooltip } from 'antd';
 import classNames from 'classnames';
 import { isEmptyArray } from '../utils';
 var Container = function Container(props) {
@@ -15,7 +14,7 @@ var Container = function Container(props) {
     'pro-form-view-container_nowrap': nowrap !== null && nowrap !== void 0 ? nowrap : tooltip
   });
   if (tooltip && !nullValue) {
-    return _jsx(_Tooltip, {
+    return _jsx(Tooltip, {
       placement: "topLeft",
       title: children,
       children: _jsx("div", {

package/es/ProForm/components/FormFooter/index.js

@@ -1,9 +1,6 @@
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Space, Button } from 'antd';
 import { useEffect, useMemo } from 'react';
 import { useProConfig } from '../../../ProConfigProvider';
 import locale from '../../../locale';
@@ -21,12 +18,15 @@ var FormFooter = function FormFooter(props) {
     confirmLoading = _initialConfig$props.confirmLoading,
     formId = _initialConfig$props.formId,
     form = _initialConfig$props.form;
-  var _footer$okButtonProps = footer.okButtonProps,
-    okButtonProps = _footer$okButtonProps === void 0 ? {} : _footer$okButtonProps,
-    _footer$cancelButtonP = footer.cancelButtonProps,
-    cancelButtonProps = _footer$cancelButtonP === void 0 ? {} : _footer$cancelButtonP;
-  var okChildren = okButtonProps.children;
-  var cancelChildren = cancelButtonProps.children;
+  var _ref = footer || {},
+    _ref$okButtonProps = _ref.okButtonProps,
+    okButtonProps = _ref$okButtonProps === void 0 ? {} : _ref$okButtonProps,
+    _ref$cancelButtonProp = _ref.cancelButtonProps,
+    cancelButtonProps = _ref$cancelButtonProp === void 0 ? {} : _ref$cancelButtonProp;
+  var _ref2 = okButtonProps || {},
+    okChildren = _ref2.children;
+  var _ref3 = cancelButtonProps || {},
+    cancelChildren = _ref3.children;
   var searchCache = useMemo(function () {
     var cacheStr = window.sessionStorage.getItem(PRO_FORM_CACHE);
     var cache = JSON.parse(cacheStr || '{}');
@@ -65,8 +65,8 @@ var FormFooter = function FormFooter(props) {
     }
     onCancel();
   };
-  return _jsxs(_Space, {
-    children: [_jsx(_Button, _objectSpread(_objectSpread({
+  return _jsxs(Space, {
+    children: [_jsx(Button, _objectSpread(_objectSpread({
       type: "primary",
       htmlType: onOk ? 'button' : 'submit',
       onClick: _onOk,
@@ -74,7 +74,7 @@ var FormFooter = function FormFooter(props) {
       loading: confirmLoading
     }, okButtonProps), {}, {
       children: okChildren || okText || "".concat(locale.ProForm.search)
-    })), _jsx(_Button, _objectSpread(_objectSpread({
+    })), _jsx(Button, _objectSpread(_objectSpread({
       onClick: _onCancel
     }, cancelButtonProps), {}, {
       children: cancelChildren || cancelText || "".concat(locale.ProForm.reset)

package/es/ProForm/components/FormFooter/propsType.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ButtonProps, ColProps, FormInstance } from 'antd';
 import { ModifiedFormInstanceType } from '../../utils/useForm';
 export interface ButtonItem extends ButtonProps {
@@ -17,6 +18,7 @@ export interface FooterRenderType {
     confirmLoading?: boolean;
     formId?: string;
     form: FormInstance | ModifiedFormInstanceType<any>;
+    children?: React.ReactNode;
 }
 /**
  * 兼容旧命名导出

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

@@ -1,10 +1,9 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/checkbox/style";
-import _Checkbox from "antd/es/checkbox";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["dataSource", "otherProps", "fieldNames"];
 import { createElement as _createElement } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Checkbox as AntCheckbox } from 'antd';
 import Container from '../../Container';
 import { useProConfig } from '../../../../ProConfigProvider';
 import ProForm from '../../../index';
@@ -58,13 +57,13 @@ var Checkbox = function Checkbox(props) {
       };
     }
   }
-  return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({
+  return _jsx(AntCheckbox.Group, _objectSpread(_objectSpread({
     style: {
       width: '100%'
     }
   }, rest), {}, {
     children: !!dataSource.length && dataSource.map(function (item) {
-      return /*#__PURE__*/_createElement(_Checkbox, _objectSpread(_objectSpread({}, item), {}, {
+      return /*#__PURE__*/_createElement(AntCheckbox, _objectSpread(_objectSpread({}, item), {}, {
         key: item[_fieldNames.value],
         value: item[_fieldNames.value]
       }), item[_fieldNames.label]);

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

@@ -1,5 +1,3 @@
-import "antd/es/date-picker/style";
-import _DatePicker from "antd/es/date-picker";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
@@ -10,8 +8,9 @@ import _isString from "lodash/isString";
 import _isFunction from "lodash/isFunction";
 var _excluded = ["className", "format"];
 import { jsx as _jsx } from "react/jsx-runtime";
+import { DatePicker as AntDatePicker } from 'antd';
 import classNames from 'classnames';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { useProConfig } from '../../../../ProConfigProvider';
 import ProForm from '../../../../ProForm';
 import Container from '../../Container';
@@ -43,11 +42,12 @@ var DatePicker = function DatePicker(props) {
     if (!value) {
       viewChildren = null;
     } else if (typeof format === 'string' && _isObject(value)) {
-      viewChildren = value.format(format);
+      var _value$format;
+      viewChildren = ((_value$format = value.format) === null || _value$format === void 0 ? void 0 : _value$format.call(value, format)) || value;
     } else if (_isFunction(format)) {
       viewChildren = format(value);
     } else if (_isString(value)) {
-      viewChildren = moment(value).format(_viewFormat);
+      viewChildren = dayjs(value).format(_viewFormat);
     }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
@@ -67,7 +67,7 @@ var DatePicker = function DatePicker(props) {
   }
   // 字符串时间格式兼容
   if (_isString(_rest.value)) {
-    _rest.value = moment(_rest.value);
+    _rest.value = dayjs(_rest.value);
   }
   if (_rest.showTime === true) {
     _rest.showTime = _objectSpread({}, _defaultShowTime);
@@ -75,7 +75,7 @@ var DatePicker = function DatePicker(props) {
   if (_isObject(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
+  return _jsx(AntDatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
     format: _format
   }, _rest), {}, {
     className: _className

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

@@ -1,9 +1,3 @@
-import { DurationInputArg1, DurationInputArg2, Moment } from 'moment';
-interface Props {
-    range?: [Moment?, Moment?];
-    limit?: [DurationInputArg1, DurationInputArg2];
-}
-export declare const useDateLimit: (props: Props) => {
+export declare const useDateLimit: () => {
     onCalendarChange: (val: any) => void;
 };
-export {};

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

@@ -1,8 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useState } from 'react';
-export var useDateLimit = function useDateLimit(props) {
-  var range = props.range,
-    limit = props.limit;
+export var useDateLimit = function useDateLimit() {
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     dates = _useState2[0],

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

@@ -1,11 +1,10 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/input/style";
-import _Input from "antd/es/input";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _omit from "lodash/omit";
 var _excluded = ["label", "form", "placeholder", "fieldName", "otherProps", "desensitization"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
+import { Input as AntInput } from 'antd';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
 import locale from '../../../../locale';
@@ -26,14 +25,14 @@ var Input = function Input(props) {
     viewEmpty = _ref.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var initialConfig = useProConfig('Input');
+  if (typeof rest.value === 'number') {
+    var _rest$value, _rest$value$toString;
+    rest.value = rest === null || rest === void 0 ? void 0 : (_rest$value = rest.value) === null || _rest$value === void 0 ? 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 ((desensitization === null || desensitization === void 0 ? void 0 : desensitization.length) && (props === null || props === void 0 ? void 0 : props.disabled)) {
       var isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
       if (isDesensit === 'ON') {
-        if (typeof rest.value === 'number') {
-          var _rest$value, _rest$value$toString;
-          rest.value = rest === null || rest === void 0 ? void 0 : (_rest$value = rest.value) === null || _rest$value === void 0 ? void 0 : (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
-        }
         return _jsx(Container, {
           viewEmpty: viewEmpty,
           children: maskStringRangeWithRegex(rest.value, desensitization)
@@ -45,8 +44,7 @@ var Input = function Input(props) {
       children: rest.value
     });
   }
-  var ComInput = _jsx(_Input, _objectSpread(_objectSpread({
-    allowClear: true,
+  var ComInput = _jsx(AntInput, _objectSpread(_objectSpread({
     autoComplete: "off",
     placeholder: placeholder || "".concat(locale.ProForm.inputPlaceholder)
   }, _omit(initialConfig, ['trim', 'upperCase'])), rest));
@@ -54,12 +52,7 @@ var Input = function Input(props) {
   if ((desensitization === null || desensitization === void 0 ? void 0 : desensitization.length) && (props === null || props === void 0 ? void 0 : props.disabled)) {
     var _isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
     if (_isDesensit === 'ON') {
-      if (typeof rest.value === 'number') {
-        var _rest$value2, _rest$value2$toString;
-        rest.value = rest === null || rest === void 0 ? void 0 : (_rest$value2 = rest.value) === null || _rest$value2 === void 0 ? void 0 : (_rest$value2$toString = _rest$value2.toString) === null || _rest$value2$toString === void 0 ? void 0 : _rest$value2$toString.call(_rest$value2);
-      }
       return /*#__PURE__*/React.cloneElement(ComInput, _objectSpread(_objectSpread(_objectSpread({
-        allowClear: true,
         autoComplete: 'off',
         placeholder: placeholder || "".concat(locale.ProForm.inputPlaceholder)
       }, _omit(initialConfig, ['trim', 'upperCase'])), rest), {}, {

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

@@ -1,8 +1,4 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/input-number/style";
-import _InputNumber from "antd/es/input-number";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -12,6 +8,7 @@ import _isNull from "lodash/isNull";
 var _excluded = ["placeholder", "className", "otherProps", "range", "min", "max", "onBlur", "onFocus"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useMemo, useRef } from 'react';
+import { InputNumber as AntInputNumber, Space } from 'antd';
 import classNames from 'classnames';
 import Big from 'big.js';
 import { tools } from '@zat-design/utils';
@@ -229,7 +226,7 @@ var InputNumber = function InputNumber(props) {
       case 'thousandthCNY':
         return _jsx(Container, {
           viewEmpty: viewEmpty,
-          children: _jsxs(_Space, {
+          children: _jsxs(Space, {
             size: 4,
             children: [value || value === 0 ? 'CNY' : '', tools.formatAmount(value, precision)]
           })
@@ -285,7 +282,7 @@ var InputNumber = function InputNumber(props) {
     activateRef.current = true;
     onFocus === null || onFocus === void 0 ? void 0 : onFocus(e);
   };
-  return _jsx(_InputNumber, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  return _jsx(AntInputNumber, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     autoComplete: "off",
     placeholder: placeholder || "".concat(locale.ProForm.inputPlaceholder).concat(label !== null && label !== void 0 ? label : ''),
     className: _className

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

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

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

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

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

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

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

@@ -1,10 +1,9 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/select/style";
-import _Select from "antd/es/select";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _isNumber from "lodash/isNumber";
 var _excluded = ["dataSource", "fieldNames", "otherProps", "scrollFollowParent"];
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Select as AntSelect } from 'antd';
 import Container from '../../Container';
 import { useProConfig } from '../../../../ProConfigProvider';
 import locale from '../../../../locale';
@@ -49,7 +48,7 @@ var Select = function Select(props) {
       children: value || _isNumber(value) ? transToLabel([value]) : null
     });
   }
-  return _jsx(_Select, _objectSpread(_objectSpread(_objectSpread({
+  return _jsx(AntSelect, _objectSpread(_objectSpread(_objectSpread({
     placeholder: "".concat(locale.ProForm.selectPlaceHolder),
     allowClear: true,
     getPopupContainer: function getPopupContainer(trigger) {

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

@@ -1,11 +1,10 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/switch/style";
-import _Switch from "antd/es/switch";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _isUndefined from "lodash/isUndefined";
 import _isNull from "lodash/isNull";
 var _excluded = ["disabled", "otherProps"];
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import { Switch as AntSwitch } from 'antd';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
 import locale from '../../../../locale';
@@ -31,7 +30,7 @@ var Switch = function Switch(props) {
       children: res.checked === true ? "".concat(locale.ProForm.switchText[0]) : "".concat(locale.ProForm.switchText[1])
     });
   }
-  return _jsx(_Switch, _objectSpread(_objectSpread(_objectSpread({
+  return _jsx(AntSwitch, _objectSpread(_objectSpread(_objectSpread({
     disabled: disabled,
     checkedChildren: "".concat(locale.ProForm.switchText[0]),
     unCheckedChildren: "".concat(locale.ProForm.switchText[1])

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

@@ -1,11 +1,10 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/checkbox/style";
-import _Checkbox from "antd/es/checkbox";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _isUndefined from "lodash/isUndefined";
 import _isNull from "lodash/isNull";
 var _excluded = ["onChange", "disabled", "value", "otherProps", "className"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Checkbox } from 'antd';
 import classnames from 'classnames';
 import { useProConfig } from '../../../../ProConfigProvider';
 import locale from '../../../../locale';
@@ -54,7 +53,7 @@ var SwitchCheckbox = function SwitchCheckbox(props) {
     'pro-switch-checkbox': true,
     className: className
   });
-  return _jsx(_Checkbox, _objectSpread(_objectSpread(_objectSpread({
+  return _jsx(Checkbox, _objectSpread(_objectSpread(_objectSpread({
     disabled: disabled,
     onChange: changeVal,
     className: classNames

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

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

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

@@ -1,18 +1,17 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import "antd/es/input/style";
-import _Input from "antd/es/input";
 import _omit from "lodash/omit";
 var _excluded = ["placeholder", "otherProps", "className", "tooltip"];
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Input } from 'antd';
 import classnames from 'classnames';
 import { useProConfig } from '../../../../ProConfigProvider';
 import locale from '../../../../locale';
 import ProForm from '../../../../ProForm';
 import Container from '../../Container';
 import './index.less';
-var TextArea = _Input.TextArea;
+var TextArea = Input.TextArea;
 var TextAreaDef = function TextAreaDef(props) {
   var _props$style;
   var placeholder = props.placeholder,
@@ -38,7 +37,7 @@ var TextAreaDef = function TextAreaDef(props) {
   var _className = classnames(_defineProperty({
     'pro-textarea': true,
     'pro-textarea-view': isView
-  }, className, true));
+  }, className, className));
   return _jsx(TextArea, _objectSpread(_objectSpread(_objectSpread({
     showCount: true,
     autoComplete: "off",