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

package/es/ProEditLabel/style/index.less

@@ -1,8 +1,11 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-edit-label {
   display: inline-block;
 
   .pro-form-view {
-    .ant-row {
+    .@{ant-prefix}-row {
       display: block;
     }
   }
@@ -54,8 +57,8 @@
 
 }
 
-.ant-popover {
-  .ant-btn-sm {
+.@{ant-prefix}-popover {
+  .@{ant-prefix}-btn-sm {
     font-size  : var(--zaui-font-size-sm, 12px);
     min-width  : 56px;
     line-height: 1;
@@ -70,15 +73,15 @@
 .pro-edit-label-popconfirm {
   z-index: 1001 !important;
 
-  .ant-popover-message {
+  .@{ant-prefix}-popover-message {
     display: block;
   }
 
-  .ant-popover-message-title {
+  .@{ant-prefix}-popover-message-title {
     padding-left: 0;
   }
 
-  .ant-popover-content {
+  .@{ant-prefix}-popover-content {
     width    : 360px;
     max-width: 400px;
   }
@@ -109,13 +112,13 @@
       width: 100%;
 
       &.pro-form-no-label {
-        .ant-form-item-label {
+        .@{ant-prefix}-form-item-label {
           display: none;
         }
       }
     }
 
-    .ant-col-10 {
+    .@{ant-prefix}-col-10 {
       flex         : 0 0 var(--zaui-form-label-width, 130px);
       text-align   : var(--zaui-form-align, left);
       white-space  : pre-wrap;
@@ -127,7 +130,7 @@
 
   }
 
-  .ant-select {
+  .@{ant-prefix}-select {
     width: 100%;
   }
 

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

@@ -506,7 +506,7 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = classNames((_classNames = {}, _defineProperty(_classNames, className, className), _defineProperty(_classNames, 'pro-form-item-changed', changed), _classNames));
-  var originalTitle = _jsxs(_Space, {
+  var originalTitle = originalTip ? _jsxs(_Space, {
     children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
@@ -516,14 +516,16 @@ var RenderField = function RenderField(_ref) {
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
     }))]
-  });
-  var FormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({
+  }) : null;
+  var FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
     validateFirst: true
   }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: cellName,
     children: /*#__PURE__*/React.isValidElement(TargetComponent) ? /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange']))) : _jsx(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))
-  }));
+  })) : _jsx(Container, {
+    viewEmpty: viewEmpty
+  });
   return _jsx(FieldProvider, {
     value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
     children: !originalTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {

package/es/ProEditTable/index.js

@@ -1,18 +1,18 @@
 import "antd/es/table/style";
 import _Table from "antd/es/table";
-import "antd/es/config-provider/style";
-import _ConfigProvider from "antd/es/config-provider";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import "antd/es/config-provider/style";
+import _ConfigProvider from "antd/es/config-provider";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip", "rowKey"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef } from 'react';
+import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useRef } from 'react';
 import { isArray } from 'lodash';
 import { useDebounceEffect, useSetState } from 'ahooks';
 import classnames from 'classnames';
@@ -50,6 +50,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     pagination = _ref.pagination,
     originalValues = _ref.originalValues,
     originalTip = _ref.originalTip,
+    rowKey = _ref.rowKey,
     resetProps = _objectWithoutProperties(_ref, _excluded);
   // 上下文form
   var contentForm = _Form.useFormInstance();
@@ -60,6 +61,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     _otherProps$viewEmpty = otherProps.viewEmpty,
     viewEmpty = _otherProps$viewEmpty === void 0 ? '-' : _otherProps$viewEmpty;
   var tableRef = useRef(null);
+  var _React$useContext = React.useContext(_ConfigProvider.ConfigContext),
+    getPrefixCls = _React$useContext.getPrefixCls;
+  var prefixCls = getPrefixCls();
   disabled = (otherProps === null || otherProps === void 0 ? void 0 : otherProps.disabled) || disabled;
   var _useSetState = useSetState({
       _columns: columns,
@@ -94,21 +98,13 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     'pro-table-no-stripe': !stripe,
     className: className
   });
-  // 编辑行设置下样式
-  var _rowClassName = function _rowClassName(record) {
-    return !virtualKey || editingKeys.includes(record.rowKey) ? 'is-editing' : '';
-  };
-  // 复选框
-  var _rowSelection = _objectSpread({
-    fixed: true,
-    selectedRowKeys: selectedRowKeys,
-    onChange: function onChange(selectedRowKeys, selectedRows) {
-      setState({
-        selectedRowKeys: selectedRowKeys,
-        selectedRows: selectedRows
-      });
+  var getRowKey = function getRowKey(record) {
+    var key = record.rowKey || getRandom();
+    if (rowKey) {
+      key = typeof rowKey === 'function' ? rowKey(record) : record[rowKey];
     }
-  }, rowSelection);
+    return key;
+  };
   var config = {
     form: form,
     mode: mode,
@@ -138,8 +134,26 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     tableLength: value === null || value === void 0 ? void 0 : value.length,
     page: page,
     originalValues: originalValues,
-    originalTip: originalTip
+    originalTip: originalTip,
+    prefixCls: prefixCls
+  };
+  // 编辑行设置下样式
+  var _rowClassName = function _rowClassName(record) {
+    var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
+    var className = isEdit ? 'is-editing' : '';
+    return className;
   };
+  // 复选框
+  var _rowSelection = _objectSpread({
+    fixed: true,
+    selectedRowKeys: selectedRowKeys,
+    onChange: function onChange(selectedRowKeys, selectedRows) {
+      setState({
+        selectedRowKeys: selectedRowKeys,
+        selectedRows: selectedRows
+      });
+    }
+  }, rowSelection);
   // 判断是否禁止添加、批量删除
   var isForbiddenBtn = useCallback(function (type) {
     // 当工具栏不渲染时，都不渲染
@@ -233,7 +247,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     if ((value === null || value === void 0 ? void 0 : value.length) && !(value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey)) {
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
-          rowKey: getRandom()
+          rowKey: getRowKey(item)
         });
       });
       onChange(nextValues);

package/es/ProEditTable/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-edit-table {
   .pro-edit-table-tooltip {
     display    : inline-flex;
@@ -35,7 +38,7 @@
       justify-content: center;
       margin-top: var(--zaui-space-size-md, 16px);
 
-      .ant-btn-link {
+      .@{ant-prefix}-btn-link {
         padding: 0;
       }
     }
@@ -47,7 +50,7 @@
   }
 
 
-  .is-cell .ant-form-item .ant-form-item-row .ant-form-item-control .ant-form-item-control-input {
+  .is-cell .@{ant-prefix}-form-item .@{ant-prefix}-form-item-row .@{ant-prefix}-form-item-control .@{ant-prefix}-form-item-control-input {
     border: 1px solid transparent;
 
     &:hover {
@@ -66,15 +69,15 @@
   }
 
   &.pro-table-no-stripe {
-    .ant-table-tbody tr:nth-child(n)>td {
+    .@{ant-prefix}-table-tbody tr:nth-child(n)>td {
       background-color: var(--zaui-base-bg, #fff);
     }
   }
 
-  .ant-space {
+  .@{ant-prefix}-space {
     gap: var(--zaui-space-size-sm, 8px);
 
-    .ant-btn-link {
+    .@{ant-prefix}-btn-link {
       padding: 0 var(--zaui-space-size-xs, 4px);
 
       &:first-child {
@@ -83,12 +86,12 @@
     }
   }
 
-  .ant-table-header>table .ant-table-thead>tr>th.ant-table-selection-column {
+  .@{ant-prefix}-table-header>table .@{ant-prefix}-table-thead>tr>th.@{ant-prefix}-table-selection-column {
     padding-left: var(--zaui-space-size-md, 16px);
     padding-right: var(--zaui-space-size-md, 16px);
   }
 
-  .ant-table-header>table .ant-table-thead>tr>th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required {
+  .@{ant-prefix}-table-header>table .@{ant-prefix}-table-thead>tr>th:not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan]).is-required {
     &::after {
       content: "";
     }
@@ -130,27 +133,29 @@
     }
   }
 
-  .ant-table-content {
+  .@{ant-prefix}-table-scroll-horizontal {
+    .@{ant-prefix}-table-cell-fix-right-first {
+      &::after {
+        box-shadow: inset -10px 0 8px -8px rgba(0, 0, 0, 0.15);
+      }
+    }
+  }
+
+  .@{ant-prefix}-table-content {
     >table {
-      .ant-table-summary {
+      .@{ant-prefix}-table-summary {
         background-color: var(--zaui-table-header-bg, #f2f3f5);
         color           : var(--zaui-text, #343434);
         font-weight     : 600;
 
-        .ant-table-cell-fix-left,
-        .ant-table-cell-fix-right {
+        .@{ant-prefix}-table-cell-fix-left,
+        .@{ant-prefix}-table-cell-fix-right {
           background-color: var(--zaui-table-header-bg, #f2f3f5);
           
         }
       }
 
-      .ant-table-cell-fix-right-first {
-        &::after {
-          box-shadow: inset -10px 0 8px -8px rgba(0, 0, 0, 0.15);
-        }
-      }
-
-      th.ant-table-selection-column {
+      th.@{ant-prefix}-table-selection-column {
         width: 48px;
       }
 
@@ -160,7 +165,7 @@
         }
       }
 
-      .ant-table-thead>tr>th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required {
+      .@{ant-prefix}-table-thead>tr>th:not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan]).is-required {
         &::after {
           content: "";
         }
@@ -204,83 +209,88 @@
     }
   }
 
-  .ant-table-cell {
-    .ant-form-item {
+  .@{ant-prefix}-table-cell {
+    .@{ant-prefix}-form-item {
       margin-bottom: 0px !important;
     }
   }
 
-  .ant-table.ant-table-bordered>.ant-table-container {
+  .@{ant-prefix}-table.@{ant-prefix}-table-bordered>.@{ant-prefix}-table-container {
     border: 0;
   }
 
-  .ant-table-thead>tr>th {
+  .@{ant-prefix}-table-thead>tr>th {
     border          : 0;
     white-space     : nowrap;
     background-color: var(--zaui-table-header-bg, #f2f3f5);
   }
 
-  .ant-table-thead>tr>th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {
+  .@{ant-prefix}-table-thead>tr>th:not(:last-child):not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan])::before {
     height: 0;
   }
 
-  .ant-table-tbody>tr:not(.ant-table-placeholder)>td {
+  .@{ant-prefix}-table-tbody>tr:not(.@{ant-prefix}-table-placeholder)>td {
     border-bottom: 0;
     border-right : 0;
     border-top   : 0;
   }
 
-  .ant-table-tbody>.is-editing:not(.ant-table-measure-row)>td {
+  .@{ant-prefix}-table-tbody>.is-editing:not(.@{ant-prefix}-table-measure-row)>td {
     border-bottom : 0;
     vertical-align: top;
   }
 
-  .ant-table-tbody tr:nth-child(n)>td {
+  .@{ant-prefix}-table-tbody tr:nth-child(n)>td {
     background-color: var(--zaui-base-bg, #ffffff);
   }
 
-  .ant-table-tbody tr:nth-child(2n)>td {
+  .@{ant-prefix}-table-tbody tr:nth-child(2n)>td {
     background-color: var(--zaui-table-strip-bg, #FAFAFA);
   }
 
-  .ant-table-tbody>.ant-table-placeholder>td {
+  .@{ant-prefix}-table-tbody>.@{ant-prefix}-table-placeholder>td {
     background-color: var(--zaui-base-bg, #ffffff);
   }
 
-  .ant-table-tbody {
+  .@{ant-prefix}-table-tbody {
 
-    >tr:hover:not(.ant-table-expanded-row, .ant-table-placeholder)>td,
-    .ant-table-row-hover,
-    .ant-table-row-hover>td {
+    >tr:hover:not(.@{ant-prefix}-table-expanded-row)>td,
+    .@{ant-prefix}-table-row-hover,
+    .@{ant-prefix}-table-row-hover>td {
+      background: #FAFAFA;
+    }
+    >tr:hover:not(.@{ant-prefix}-table-placeholder)>td,
+    .@{ant-prefix}-table-row-hover,
+    .@{ant-prefix}-table-row-hover>td {
       background: #FAFAFA;
     }
   }
 
-  .ant-table-fixed {
+  .@{ant-prefix}-table-fixed {
 
-    .ant-table-row-hover,
-    .ant-table-row-hover>td {
+    .@{ant-prefix}-table-row-hover,
+    .@{ant-prefix}-table-row-hover>td {
       background: #FAFAFA;
     }
   }
 
-  .ant-table-fixed-header {
-    .ant-table-tbody tr:nth-child(n)>td {
+  .@{ant-prefix}-table-fixed-header {
+    .@{ant-prefix}-table-tbody tr:nth-child(n)>td {
       background-color: #FAFAFA;
     }
 
-    .ant-table-tbody tr:nth-child(2n)>td {
+    .@{ant-prefix}-table-tbody tr:nth-child(2n)>td {
       background-color: var(--zaui-base-bg, #ffffff);
     }
   }
 
-  .ant-table-summary>tr>td {
+  .@{ant-prefix}-table-summary>tr>td {
     border-bottom: none;
   }
 
-  .ant-table-pagination {
-    .ant-pagination-options {
-      .ant-select.ant-select-in-form-item {
+  .@{ant-prefix}-table-pagination {
+    .@{ant-prefix}-pagination-options {
+      .@{ant-prefix}-select.@{ant-prefix}-select-in-form-item {
         width: auto;
       }
     }
@@ -299,11 +309,11 @@
 
 .pro-edit-table-toolbar {
   margin-top: var(--zaui-space-size-md, 16px);
-  .ant-space {
+  .@{ant-prefix}-space {
     gap: var(--zaui-space-size-sm, 8px);
 
-    .ant-space-item {
-      .ant-btn-link {
+    .@{ant-prefix}-space-item {
+      .@{ant-prefix}-btn-link {
         display: flex;
         align-items: center;
         padding: 0 var(--zaui-space-size-xs, 4px);
@@ -321,7 +331,7 @@
 }
 
 .pro-edit-table-drag {
-  table tr th.ant-table-selection-column.ant-table-cell-fix-left{
+  table tr th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-left{
     text-align: right;
   }
 }

package/es/ProEditTable/utils/config.d.ts

@@ -20,6 +20,6 @@ export declare const actions: {
     save: ({ record, editingKeys, setState, form, rowName, virtualRowName, result }: any) => Promise<void>;
     cancel: ({ name, record, editingKeys, setState, form, virtualRowName, virtualKey }: any) => void;
     delete: ({ name, record, editingKeys, setState, form, virtualKey, onlyOneLineMsg }: any) => boolean;
-    add: ({ result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, }: any) => Promise<boolean>;
+    add: ({ result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, prefixCls, }: any) => Promise<boolean>;
     mulDelete: ({ form, name, virtualKey, setState, selectedRowKeys, editingKeys }: any) => void;
 };

package/es/ProEditTable/utils/config.js

@@ -168,11 +168,11 @@ export var actions = {
   add: function () {
     var _add = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
       var _tableRef$current$que, _tableRef$current$que2;
-      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, nextData, rowKey, addData, nextEditingKeys;
+      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef;
+            result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef, _ref5$prefixCls = _ref5.prefixCls, prefixCls = _ref5$prefixCls === void 0 ? 'ant' : _ref5$prefixCls;
             nextData = _toConsumableArray(form.getFieldValue(name) || []); // 单行编辑时，需要先保存，才能进行下面的编辑
             if (!(virtualKey && editingKeys.length >= 1)) {
               _context2.next = 5;
@@ -191,7 +191,7 @@ export var actions = {
             }
             insertType === 'before' ? nextData.unshift(addData) : nextData.push(addData);
             form.setFieldValue(name, nextData);
-            (_tableRef$current$que = tableRef.current.querySelector('.ant-table-body')) === null || _tableRef$current$que === void 0 ? void 0 : (_tableRef$current$que2 = _tableRef$current$que.scrollTo) === null || _tableRef$current$que2 === void 0 ? void 0 : _tableRef$current$que2.call(_tableRef$current$que, {
+            (_tableRef$current$que = tableRef.current.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current$que === void 0 ? void 0 : (_tableRef$current$que2 = _tableRef$current$que.scrollTo) === null || _tableRef$current$que2 === void 0 ? void 0 : _tableRef$current$que2.call(_tableRef$current$que, {
               top: 10000,
               behavior: 'smooth'
             });

package/es/ProEnum/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-enum {
   &-tag-root {
     display: flex;

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

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

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

@@ -7,7 +7,7 @@ var _excluded = ["className", "format"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { isFunction, isString } from 'lodash';
 import classNames from 'classnames';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { useProConfig } from '../../../../ProConfigProvider';
 import ProForm from '../../../../ProForm';
 import Container from '../../Container';
@@ -30,12 +30,12 @@ var DatePicker = function DatePicker(props) {
     var viewChildren = null;
     if (!value) {
       viewChildren = null;
-    } else if (typeof format === 'string' && moment.isMoment(value)) {
+    } else if (typeof format === 'string' && dayjs.isDayjs(value)) {
       viewChildren = value.format(format);
     } else if (isFunction(format)) {
       viewChildren = format(value);
     } else if (isString(value)) {
-      viewChildren = moment(value).format(format);
+      viewChildren = dayjs(value).format(format);
     }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
@@ -46,16 +46,13 @@ var DatePicker = function DatePicker(props) {
   var _rest = _objectSpread(_objectSpread({}, rest), {}, {
     showTime: rest.showTime === undefined && valueType === 'dateTime' || rest.showTime
   });
-  if (_rest === null || _rest === void 0 ? void 0 : _rest.placeholder) {
-    _rest === null || _rest === void 0 ? true : delete _rest.placeholder;
-  }
   // 字符串时间格式兼容
   if (isString(_rest.value)) {
-    _rest.value = moment(_rest.value);
+    _rest.value = dayjs(_rest.value);
   }
   if (['dateStartTime', 'dateEndTime'].includes(valueType) && rest.showTime === undefined) {
     _rest.showTime = {
-      value: moment(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
+      value: dayjs(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
       disabled: true
     };
   }

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

@@ -1,11 +1,12 @@
-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, 'separator'>;
+} & Omit<RangePickerProps<Dayjs>, 'separator'>;
 declare const RangePicker: React.FC<Props>;
 export default RangePicker;

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

@@ -4,10 +4,8 @@ import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
 var _excluded = ["format", "otherProps", "separator"];
 import { jsx as _jsx } from "react/jsx-runtime";
-// @ts-check
-
 import { isFunction, isString, omit } from 'lodash';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { useProConfig } from '../../../../ProConfigProvider';
 import ProForm from '../../../../ProForm';
 import Container from '../../Container';
@@ -52,9 +50,9 @@ var RangePicker = function RangePicker(props) {
   var _res = _objectSpread(_objectSpread({}, rest), {}, {
     showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
   });
-  // 字符串时间格式兼容
+  // // 字符串时间格式兼容
   if (Array.isArray(_res.value) && isString(_res.value[0]) && isString(_res.value[1])) {
-    _res.value = [moment(_res.value[0]), moment(_res.value[1])];
+    _res.value = [dayjs(_res.value[0]), dayjs(_res.value[1])];
   }
   return _jsx(AntRangePicker, _objectSpread(_objectSpread({}, initialConfig), omit(_res, ['separator'])));
 };

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

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

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

@@ -1,7 +1,8 @@
-.pro-textarea {
-}
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 div.pro-textarea-view {
-  .ant-input-disabled {
+  .@{ant-prefix}-input-disabled {
     background: transparent !important;
   }
   &::after {

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

@@ -4,7 +4,7 @@ import _TimePicker from "antd/es/time-picker";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["format", "onChange", "value", "otherProps"];
 import { jsx as _jsx } from "react/jsx-runtime";
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
 import ProForm from '../../../../ProForm';
@@ -25,7 +25,7 @@ var TimePicker = function TimePicker(props) {
   var initialConfig = useProConfig('AntTimePicker');
   var handleChange = function handleChange(value) {
     if (valueType === 'dateTime') {
-      onChange && onChange(value ? moment(value).format(format) : undefined);
+      onChange && onChange(value ? dayjs(value).format(format) : undefined);
     }
   };
   if (isView) {
@@ -35,7 +35,7 @@ var TimePicker = function TimePicker(props) {
     });
   }
   return _jsx(_TimePicker, _objectSpread(_objectSpread(_objectSpread({
-    value: value ? moment(value, format) : undefined
+    value: value ? dayjs(value, format) : undefined
   }, initialConfig), rest), {}, {
     format: format,
     onChange: handleChange

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

@@ -1,3 +1,6 @@
-.ant-picker {
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
+.@{ant-prefix}-picker {
   display: flex;
 }