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

package/lib/ProEnum/index.js

@@ -6,14 +6,6 @@ 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/checkbox/style");
-var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
-require("antd/es/radio/style");
-var _radio = _interopRequireDefault(require("antd/es/radio"));
-require("antd/es/message/style");
-var _message2 = _interopRequireDefault(require("antd/es/message"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -27,6 +19,7 @@ var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _ahooks = require("ahooks");
+var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _ProSelect = _interopRequireDefault(require("../ProSelect"));
 var _ProConfigProvider = require("../ProConfigProvider");
@@ -110,7 +103,7 @@ var ProEnum = function ProEnum(props) {
           var responseData = transformResponse(res);
           if ((0, _typeof2.default)(responseData) !== 'object') {
             var _locale$ProEnum;
-            return _message2.default.error((_locale$ProEnum = _locale.default.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorMessage);
+            return _antd.message.error((_locale$ProEnum = _locale.default.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorMessage);
           }
           setData(responseData);
         } else {
@@ -121,7 +114,7 @@ var ProEnum = function ProEnum(props) {
           if (status === 200) {
             if ((0, _typeof2.default)(data) !== 'object') {
               var _locale$ProEnum2;
-              return _message2.default.error((_locale$ProEnum2 = _locale.default.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
+              return _antd.message.error((_locale$ProEnum2 = _locale.default.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
             }
             if (Array.isArray(data)) {
               setData((0, _toConsumableArray2.default)(data));
@@ -130,7 +123,7 @@ var ProEnum = function ProEnum(props) {
               setData(data[code]);
             }
           } else {
-            _message2.default.error(msg);
+            _antd.message.error(msg);
           }
         }
       }
@@ -196,12 +189,12 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange
         }));
       case 'Radio':
-        return (0, _jsxRuntime.jsx)(_radio.default.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(enumProps, ['fieldNames', 'showCodeName'])), {}, {
+        return (0, _jsxRuntime.jsx)(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
           children: list.map(function (item) {
-            return (0, _jsxRuntime.jsx)(_radio.default, {
+            return (0, _jsxRuntime.jsx)(_antd.Radio, {
               value: item[fieldValue],
               disabled: !!item.disabled,
               children: item[label]
@@ -209,12 +202,12 @@ var ProEnum = function ProEnum(props) {
           })
         }));
       case 'Checkbox':
-        return (0, _jsxRuntime.jsx)(_checkbox.default.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(enumProps, ['fieldNames', 'showCodeName'])), {}, {
+        return (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
           children: list.map(function (item) {
-            return (0, _jsxRuntime.jsx)(_checkbox.default, {
+            return (0, _jsxRuntime.jsx)(_antd.Checkbox, {
               value: item[fieldValue],
               disabled: !!item.disabled,
               children: item[label]
@@ -244,7 +237,7 @@ var ProEnum = function ProEnum(props) {
   };
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
-    _message2.default.error("".concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.label, "-").concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name, "-").concat(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum4 = _locale.default.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType));
+    _antd.message.error("".concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.label, "-").concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name, "-").concat(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum4 = _locale.default.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType));
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;
@@ -277,7 +270,7 @@ var ProEnum = function ProEnum(props) {
       record.forEach(function (item) {
         arr.push(props.optionRender(item));
       });
-      return (0, _jsxRuntime.jsx)(_space.default, {
+      return (0, _jsxRuntime.jsx)(_antd.Space, {
         direction: "vertical",
         size: 4,
         children: arr.map(function (item) {

package/lib/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/lib/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/lib/ProEnum/utils/index.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.baseCacheKey = void 0;
 exports.cacheFieldNames = cacheFieldNames;
 exports.diffCode = diffCode;
 exports.getEnumData = getEnumData;
@@ -15,6 +16,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _isUndefined2 = _interopRequireDefault(require("lodash/isUndefined"));
 var _isNull2 = _interopRequireDefault(require("lodash/isNull"));
 var _excluded = ["children"];
+var baseCacheKey = exports.baseCacheKey = 'zat-design-pro-component-cacheKey';
 /**
  * 获取枚举数据
  * @param storage
@@ -23,7 +25,7 @@ var _excluded = ["children"];
  * @returns
  */
 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/lib/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/lib/ProForm/components/Container.js

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _utils = require("../utils");
 var Container = function Container(props) {
@@ -22,7 +21,7 @@ var Container = function Container(props) {
     'pro-form-view-container_nowrap': nowrap !== null && nowrap !== void 0 ? nowrap : tooltip
   });
   if (tooltip && !nullValue) {
-    return (0, _jsxRuntime.jsx)(_tooltip.default, {
+    return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       placement: "topLeft",
       title: children,
       children: (0, _jsxRuntime.jsx)("div", {

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

@@ -5,12 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.PRO_FORM_CACHE = void 0;
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _react = require("react");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../locale"));
@@ -28,12 +25,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 = (0, _react.useMemo)(function () {
     var cacheStr = window.sessionStorage.getItem(PRO_FORM_CACHE);
     var cache = JSON.parse(cacheStr || '{}');
@@ -72,8 +72,8 @@ var FormFooter = function FormFooter(props) {
     }
     onCancel();
   };
-  return (0, _jsxRuntime.jsxs)(_space.default, {
-    children: [(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsxs)(_antd.Space, {
+    children: [(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       type: "primary",
       htmlType: onOk ? 'button' : 'submit',
       onClick: _onOk,
@@ -81,7 +81,7 @@ var FormFooter = function FormFooter(props) {
       loading: confirmLoading
     }, okButtonProps), {}, {
       children: okChildren || okText || "".concat(_locale.default.ProForm.search)
-    })), (0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    })), (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       onClick: _onCancel
     }, cancelButtonProps), {}, {
       children: cancelChildren || cancelText || "".concat(_locale.default.ProForm.reset)

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

@@ -6,11 +6,10 @@ 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 = require("react");
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _index = _interopRequireDefault(require("../../../index"));
@@ -65,13 +64,13 @@ var Checkbox = function Checkbox(props) {
       };
     }
   }
-  return (0, _jsxRuntime.jsx)(_checkbox.default.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     style: {
       width: '100%'
     }
   }, rest), {}, {
     children: !!dataSource.length && dataSource.map(function (item) {
-      return /*#__PURE__*/(0, _react.createElement)(_checkbox.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+      return /*#__PURE__*/(0, _react.createElement)(_antd.Checkbox, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
         key: item[_fieldNames.value],
         value: item[_fieldNames.value]
       }), item[_fieldNames.label]);

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,8 +5,6 @@ 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 _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -16,8 +14,9 @@ var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
 var _isString2 = _interopRequireDefault(require("lodash/isString"));
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -50,11 +49,12 @@ var DatePicker = function DatePicker(props) {
     if (!value) {
       viewChildren = null;
     } else if (typeof format === 'string' && (0, _isObject2.default)(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 ((0, _isFunction2.default)(format)) {
       viewChildren = format(value);
     } else if ((0, _isString2.default)(value)) {
-      viewChildren = (0, _moment.default)(value).format(_viewFormat);
+      viewChildren = (0, _dayjs.default)(value).format(_viewFormat);
     }
     return (0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
@@ -74,7 +74,7 @@ var DatePicker = function DatePicker(props) {
   }
   // 字符串时间格式兼容
   if ((0, _isString2.default)(_rest.value)) {
-    _rest.value = (0, _moment.default)(_rest.value);
+    _rest.value = (0, _dayjs.default)(_rest.value);
   }
   if (_rest.showTime === true) {
     _rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
@@ -82,7 +82,7 @@ var DatePicker = function DatePicker(props) {
   if ((0, _isObject2.default)(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  return (0, _jsxRuntime.jsx)(_datePicker.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), {}, {
+  return (0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), {}, {
     format: _format
   }, _rest), {}, {
     className: _className

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

@@ -7,9 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useDateLimit = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
-var useDateLimit = exports.useDateLimit = function useDateLimit(props) {
-  var range = props.range,
-    limit = props.limit;
+var useDateLimit = exports.useDateLimit = function useDateLimit() {
   var _useState = (0, _react.useState)(),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     dates = _useState2[0],

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

@@ -6,12 +6,11 @@ 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 _omit2 = _interopRequireDefault(require("lodash/omit"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
+var _antd = require("antd");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
@@ -33,14 +32,14 @@ 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 ? 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 (0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
           children: (0, _valueType.maskStringRangeWithRegex)(rest.value, desensitization)
@@ -52,8 +51,7 @@ var Input = function Input(props) {
       children: rest.value
     });
   }
-  var ComInput = (0, _jsxRuntime.jsx)(_input.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-    allowClear: true,
+  var ComInput = (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     autoComplete: "off",
     placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder)
   }, (0, _omit2.default)(initialConfig, ['trim', 'upperCase'])), rest));
@@ -61,12 +59,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.default.cloneElement(ComInput, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-        allowClear: true,
         autoComplete: 'off',
         placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder)
       }, (0, _omit2.default)(initialConfig, ['trim', 'upperCase'])), rest), {}, {

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

@@ -6,10 +6,6 @@ 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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -18,6 +14,7 @@ var _isNumber2 = _interopRequireDefault(require("lodash/isNumber"));
 var _isNull2 = _interopRequireDefault(require("lodash/isNull"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _big = _interopRequireDefault(require("big.js"));
 var _utils = require("@zat-design/utils");
@@ -236,7 +233,7 @@ var InputNumber = function InputNumber(props) {
       case 'thousandthCNY':
         return (0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: (0, _jsxRuntime.jsxs)(_space.default, {
+          children: (0, _jsxRuntime.jsxs)(_antd.Space, {
             size: 4,
             children: [value || value === 0 ? 'CNY' : '', _utils.tools.formatAmount(value, precision)]
           })
@@ -292,7 +289,7 @@ var InputNumber = function InputNumber(props) {
     activateRef.current = true;
     onFocus === null || onFocus === void 0 ? void 0 : onFocus(e);
   };
-  return (0, _jsxRuntime.jsx)(_inputNumber.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     autoComplete: "off",
     placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder).concat(label !== null && label !== void 0 ? label : ''),
     className: _className

package/lib/ProForm/components/base/Radio/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/radio/style");
-var _radio = _interopRequireDefault(require("antd/es/radio"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
@@ -58,13 +57,13 @@ var Radio = function Radio(props) {
       };
     }
   }
-  return (0, _jsxRuntime.jsx)(_radio.default.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+  return (0, _jsxRuntime.jsx)(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 (0, _jsxRuntime.jsx)(_radio.default, {
+      return (0, _jsxRuntime.jsx)(_antd.Radio, {
         value: radioItem[_fieldNames.value],
         children: radioItem[_fieldNames.label]
       }, radioItem[_fieldNames.value]);

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

@@ -8,21 +8,20 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 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 _uniq2 = _interopRequireDefault(require("lodash/uniq"));
 var _omit2 = _interopRequireDefault(require("lodash/omit"));
 var _isString2 = _interopRequireDefault(require("lodash/isString"));
 var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _moment = _interopRequireDefault(require("moment"));
+var _antd = require("antd");
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
 var _useDateRange = require("./useDateRange");
 var _excluded = ["format", "otherProps", "separator", "range"]; // @ts-check
-var AntRangePicker = _datePicker.default.RangePicker;
+var AntRangePicker = _antd.DatePicker.RangePicker;
 var RangePicker = function RangePicker(props) {
   var _props$format = props.format,
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
@@ -54,7 +53,7 @@ var RangePicker = function RangePicker(props) {
   }
   // 字符串时间格式兼容
   if (Array.isArray(_rest.value) && (0, _isString2.default)(_rest.value[0]) && (0, _isString2.default)(_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];
@@ -75,10 +74,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 ((0, _isFunction2.default)(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 ((0, _isFunction2.default)(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,11 +6,10 @@ 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 _isNumber2 = _interopRequireDefault(require("lodash/isNumber"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../../locale"));
@@ -56,7 +55,7 @@ var Select = function Select(props) {
       children: value || (0, _isNumber2.default)(value) ? transToLabel([value]) : null
     });
   }
-  return (0, _jsxRuntime.jsx)(_select.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     placeholder: "".concat(_locale.default.ProForm.selectPlaceHolder),
     allowClear: true,
     getPopupContainer: function getPopupContainer(trigger) {

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

@@ -6,12 +6,11 @@ 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 _isUndefined2 = _interopRequireDefault(require("lodash/isUndefined"));
 var _isNull2 = _interopRequireDefault(require("lodash/isNull"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
@@ -38,7 +37,7 @@ var Switch = function Switch(props) {
       children: res.checked === true ? "".concat(_locale.default.ProForm.switchText[0]) : "".concat(_locale.default.ProForm.switchText[1])
     });
   }
-  return (0, _jsxRuntime.jsx)(_switch.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsx)(_antd.Switch, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     disabled: disabled,
     checkedChildren: "".concat(_locale.default.ProForm.switchText[0]),
     unCheckedChildren: "".concat(_locale.default.ProForm.switchText[1])

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

@@ -6,12 +6,11 @@ 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 _isUndefined2 = _interopRequireDefault(require("lodash/isUndefined"));
 var _isNull2 = _interopRequireDefault(require("lodash/isNull"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../../locale"));
@@ -61,7 +60,7 @@ var SwitchCheckbox = function SwitchCheckbox(props) {
     'pro-switch-checkbox': true,
     className: className
   });
-  return (0, _jsxRuntime.jsx)(_checkbox.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (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,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;