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

package/es/ProTable/components/FormatColumn/index.js

@@ -1,5 +1,3 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "toolTipProps", "minWidth", "onDiff"];
@@ -7,9 +5,10 @@ var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code"
  * 调整点：
  */
 import React, { isValidElement } from 'react';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import classnames from 'classnames';
 import ReactDOM from 'react-dom';
+import { Space } from 'antd';
 import { isEqual, isFunction, isString, isObject, isBoolean } from 'lodash';
 import { tools } from '@zat-design/utils';
 import TooltipTitle from "../TooltipTitle";
@@ -17,7 +16,7 @@ import RenderColumn from "../RenderColumn";
 import { getDecimalDigits, getOriginalValue } from "../../utils";
 import { isEmpty } from "../../../utils";
 import getEnumLabel from "../../../ProEnum/utils/getEnumLabel";
-import ProForm from "../../../ProForm";
+import { ProCascader } from "../../../ProForm/components/index";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -244,7 +243,7 @@ export var formatColumn = _ref2 => {
           children: "-"
         });
       }
-      var node = /*#__PURE__*/_jsxs(_Space, {
+      var node = /*#__PURE__*/_jsxs(Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -278,7 +277,7 @@ export var formatColumn = _ref2 => {
       if (isEmpty(originalValue)) {
         originalRenderValue = '-';
       }
-      var node = /*#__PURE__*/_jsxs(_Space, {
+      var node = /*#__PURE__*/_jsxs(Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -307,34 +306,34 @@ export var formatColumn = _ref2 => {
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
     column.render = (value, record, index) => {
-      var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
-      var renderValue = (_moment = moment(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
+      var _dayjs, _dayjs2, _dayjs3, _dayjs4, _dayjs5, _dayjs6, _dayjs7, _dayjs8, _dayjs9, _dayjs10, _dayjs11, _dayjs12, _dayjs13, _dayjs14;
+      var renderValue = (_dayjs = dayjs(value)) === null || _dayjs === void 0 ? void 0 : _dayjs.format(format);
       var originalResult = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var isChanged = originalResult.isChanged,
         originalValue = originalResult.originalValue,
         isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
-      var originalRenderValue = (_moment2 = moment(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
+      var originalRenderValue = (_dayjs2 = dayjs(originalValue)) === null || _dayjs2 === void 0 ? void 0 : _dayjs2.format(format);
       switch (valueType) {
         case 'date':
-          renderValue = (_moment3 = moment(value)) === null || _moment3 === void 0 ? void 0 : _moment3.format('YYYY-MM-DD');
-          originalRenderValue = (_moment4 = moment(originalValue)) === null || _moment4 === void 0 ? void 0 : _moment4.format('YYYY-MM-DD');
+          renderValue = (_dayjs3 = dayjs(value)) === null || _dayjs3 === void 0 ? void 0 : _dayjs3.format('YYYY-MM-DD');
+          originalRenderValue = (_dayjs4 = dayjs(originalValue)) === null || _dayjs4 === void 0 ? void 0 : _dayjs4.format('YYYY-MM-DD');
           break;
         case 'dateTime':
-          renderValue = (_moment5 = moment(value)) === null || _moment5 === void 0 ? void 0 : _moment5.format('YYYY-MM-DD HH:mm:ss');
-          originalRenderValue = (_moment6 = moment(originalValue)) === null || _moment6 === void 0 ? void 0 : _moment6.format('YYYY-MM-DD HH:mm:ss');
+          renderValue = (_dayjs5 = dayjs(value)) === null || _dayjs5 === void 0 ? void 0 : _dayjs5.format('YYYY-MM-DD HH:mm:ss');
+          originalRenderValue = (_dayjs6 = dayjs(originalValue)) === null || _dayjs6 === void 0 ? void 0 : _dayjs6.format('YYYY-MM-DD HH:mm:ss');
           break;
         case 'dateStartTime':
-          renderValue = `${(_moment7 = moment(value)) === null || _moment7 === void 0 ? void 0 : _moment7.format('YYYY-MM-DD')} 00:00:00`;
-          originalRenderValue = `${(_moment8 = moment(originalValue)) === null || _moment8 === void 0 ? void 0 : _moment8.format('YYYY-MM-DD')} 00:00:00`;
+          renderValue = `${(_dayjs7 = dayjs(value)) === null || _dayjs7 === void 0 ? void 0 : _dayjs7.format('YYYY-MM-DD')} 00:00:00`;
+          originalRenderValue = `${(_dayjs8 = dayjs(originalValue)) === null || _dayjs8 === void 0 ? void 0 : _dayjs8.format('YYYY-MM-DD')} 00:00:00`;
           break;
         case 'dateEndTime':
-          renderValue = `${(_moment9 = moment(value)) === null || _moment9 === void 0 ? void 0 : _moment9.format('YYYY-MM-DD')} 23:59:59`;
-          originalRenderValue = `${(_moment10 = moment(originalValue)) === null || _moment10 === void 0 ? void 0 : _moment10.format('YYYY-MM-DD')} 23:59:59`;
+          renderValue = `${(_dayjs9 = dayjs(value)) === null || _dayjs9 === void 0 ? void 0 : _dayjs9.format('YYYY-MM-DD')} 23:59:59`;
+          originalRenderValue = `${(_dayjs10 = dayjs(originalValue)) === null || _dayjs10 === void 0 ? void 0 : _dayjs10.format('YYYY-MM-DD')} 23:59:59`;
           break;
         case 'dateStartEndTime':
-          renderValue = `${(_moment11 = moment(value === null || value === void 0 ? void 0 : value[0])) === null || _moment11 === void 0 ? void 0 : _moment11.format('YYYY-MM-DD')} 00:00:00~${(_moment12 = moment(value === null || value === void 0 ? void 0 : value[1])) === null || _moment12 === void 0 ? void 0 : _moment12.format('YYYY-MM-DD')} 23:59:59`;
-          originalRenderValue = `${(_moment13 = moment(originalValue === null || originalValue === void 0 ? void 0 : originalValue[0])) === null || _moment13 === void 0 ? void 0 : _moment13.format('YYYY-MM-DD')} 00:00:00~${(_moment14 = moment(originalValue === null || originalValue === void 0 ? void 0 : originalValue[1])) === null || _moment14 === void 0 ? void 0 : _moment14.format('YYYY-MM-DD')} 23:59:59`;
+          renderValue = `${(_dayjs11 = dayjs(value === null || value === void 0 ? void 0 : value[0])) === null || _dayjs11 === void 0 ? void 0 : _dayjs11.format('YYYY-MM-DD')} 00:00:00~${(_dayjs12 = dayjs(value === null || value === void 0 ? void 0 : value[1])) === null || _dayjs12 === void 0 ? void 0 : _dayjs12.format('YYYY-MM-DD')} 23:59:59`;
+          originalRenderValue = `${(_dayjs13 = dayjs(originalValue === null || originalValue === void 0 ? void 0 : originalValue[0])) === null || _dayjs13 === void 0 ? void 0 : _dayjs13.format('YYYY-MM-DD')} 00:00:00~${(_dayjs14 = dayjs(originalValue === null || originalValue === void 0 ? void 0 : originalValue[1])) === null || _dayjs14 === void 0 ? void 0 : _dayjs14.format('YYYY-MM-DD')} 23:59:59`;
           break;
       }
       if (!value) {
@@ -343,7 +342,7 @@ export var formatColumn = _ref2 => {
       if (!originalValue) {
         originalRenderValue = '-';
       }
-      var node = /*#__PURE__*/_jsxs(_Space, {
+      var node = /*#__PURE__*/_jsxs(Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -394,7 +393,7 @@ export var formatColumn = _ref2 => {
           });
         }
       }
-      var node = /*#__PURE__*/_jsxs(_Space, {
+      var node = /*#__PURE__*/_jsxs(Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -422,7 +421,7 @@ export var formatColumn = _ref2 => {
         isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
-      var node = /*#__PURE__*/_jsxs(_Space, {
+      var node = /*#__PURE__*/_jsxs(Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -474,23 +473,26 @@ export var formatColumn = _ref2 => {
       var className = classnames({
         'empty-cell': isEmpty
       });
-      var renderValue = /*#__PURE__*/_jsx(ProForm.ProCascader, {
+
+      // 处理 code 为函数的情况
+      var realCode = typeof code === 'function' ? code(value, record) : code;
+      var renderValue = /*#__PURE__*/_jsx(ProCascader, {
         isView: true,
         mode: "address",
-        code: code,
+        code: realCode,
         value: realValue
       });
-      var originalRenderValue = /*#__PURE__*/_jsx(ProForm.ProCascader, {
+      var originalRenderValue = /*#__PURE__*/_jsx(ProCascader, {
         isView: true,
         mode: "address",
-        code: code,
+        code: realCode,
         value: originalRealValue
       });
-      var renderNode = /*#__PURE__*/_jsx(ProForm.ProCascader, {
+      var renderNode = /*#__PURE__*/_jsx(ProCascader, {
         className: className,
         isView: true,
         mode: "address",
-        code: code,
+        code: realCode,
         value: realValue,
         tooltip: false
       });
@@ -512,7 +514,7 @@ export var formatColumn = _ref2 => {
   } else if (copyable) {
     column.render = (value, record, index) => {
       var isInNewRowFlag = isInNewRow(record);
-      return /*#__PURE__*/_jsxs(_Space, {
+      return /*#__PURE__*/_jsxs(Space, {
         size: 8,
         children: [prefixNode(value, record, index), /*#__PURE__*/_jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
           valueType: valueType,
@@ -544,7 +546,7 @@ export var formatColumn = _ref2 => {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return /*#__PURE__*/_jsxs(_Space, {
+      return /*#__PURE__*/_jsxs(Space, {
         size: 8,
         children: [prefixNode(value, record, index), /*#__PURE__*/_jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
           valueType: valueType,
@@ -568,7 +570,7 @@ export var formatColumn = _ref2 => {
         originalValue = originalResult.originalValue,
         isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
-      var node = /*#__PURE__*/_jsxs(_Space, {
+      var node = /*#__PURE__*/_jsxs(Space, {
         size: 8,
         children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
       });

package/es/ProTable/components/RcTable/components/BaseTable/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-import '../../../../style/index.less';
 declare const _default: import("react").MemoExoticComponent<({ dataSource, tableProps, draggableProps, summaryProps, emptyTextProps, ...restProps }: {
     [x: string]: any;
     dataSource: any;

package/es/ProTable/components/RcTable/components/BaseTable/index.js

@@ -1,11 +1,9 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/table/style";
-import _Table from "antd/es/table";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
+import { Table } from 'antd';
 import { memo } from 'react';
 import { RenderEmptyText, RenderSummary, TableResizable } from "../../../index";
-import "../../../../style/index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 var BaseTable = _ref => {
   var dataSource = _ref.dataSource,
@@ -24,7 +22,7 @@ var BaseTable = _ref => {
     }
     return null;
   };
-  return /*#__PURE__*/_jsx(_Table, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(Table, _objectSpread(_objectSpread({
     components: renderComponents(),
     columns: columns,
     locale: {

package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -11,6 +11,7 @@ import { isFunction } from 'lodash';
 import { addLevelAndParentId, treeNodeFind, transformTreeToArray, createTreeFromArray } from "./utils/index";
 import ProIcon from "../../../../../../../ProIcon";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var Row = props => {
   var disabled = props.disabled,
@@ -39,24 +40,27 @@ export var Row = props => {
     ref: setNodeRef,
     style: style
   }, attributes), {}, {
-    children: React.Children.map(children, child => {
-      if (child.key === 'RC_TABLE_KEY') {
+    children: React.Children.map(children, (child, index) => {
+      // 在第一列（通常是rowSelection列）显示拖拽图标
+      if (index === 0) {
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,
           record = _ref.record,
           renderIndex = _ref.renderIndex;
         return /*#__PURE__*/React.cloneElement(child, {
-          children: /*#__PURE__*/_jsxs("span", {
-            className: `drag-wrapper${props['data-hide'] ? ' no-check' : ''}`,
-            children: [/*#__PURE__*/_jsx(ProIcon, _objectSpread({
-              className: "drag-icon",
-              style: {
-                touchAction: 'none',
-                cursor: disabled ? 'no-drop' : 'move'
-              },
-              type: "drag",
-              size: 20
-            }, listeners)), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+          children: /*#__PURE__*/_jsxs(_Fragment, {
+            children: [/*#__PURE__*/_jsx("span", {
+              className: `pro-table-drag-wrapper${props['data-hide'] ? ' no-check' : ''}`,
+              children: /*#__PURE__*/_jsx(ProIcon, _objectSpread({
+                className: "drag-icon",
+                style: {
+                  touchAction: 'none',
+                  cursor: disabled ? 'no-drop' : 'move'
+                },
+                type: "drag",
+                size: 20
+              }, listeners))
+            }), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
           })
         });
       }

package/es/ProTable/components/RcTable/components/DraggableTable/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-import '../../../../style/index.less';
 declare const _default: import("react").MemoExoticComponent<({ dataSource, tableProps, draggableProps, summaryProps, emptyTextProps, ...restProps }: {
     [x: string]: any;
     dataSource: any;

package/es/ProTable/components/RcTable/components/DraggableTable/index.js

@@ -1,12 +1,10 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/table/style";
-import _Table from "antd/es/table";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
+import { Table } from 'antd';
 import { memo } from 'react';
 import DndWrapper, { Row } from "./components/DndWrapper";
 import { RenderEmptyText, RenderSummary } from "../../../index";
-import "../../../../style/index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 var DraggableTable = _ref => {
   var dataSource = _ref.dataSource,
@@ -32,7 +30,7 @@ var DraggableTable = _ref => {
     rowKey: rowKey,
     onDragStartGuard: onDragStartGuard,
     onDragEndGuard: onDragEndGuard,
-    children: /*#__PURE__*/_jsx(_Table, _objectSpread(_objectSpread({
+    children: /*#__PURE__*/_jsx(Table, _objectSpread(_objectSpread({
       className: "pro-edit-table-drag",
       components: {
         body: {

package/es/ProTable/components/RenderColumn/index.d.ts

@@ -9,7 +9,7 @@ interface Props {
     ellipsis?: any;
     width?: number | string;
     originalValue?: any;
-    toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
+    toolTipProps?: TooltipProps;
     minWidth?: number;
     isInNewRowFlag?: boolean;
     isChanged?: boolean;

package/es/ProTable/components/RenderColumn/index.js

@@ -1,12 +1,7 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import "antd/es/typography/style";
-import _Typography from "antd/es/typography";
 import { useRef } from 'react';
+import { Tooltip, Typography, Space } from 'antd';
 import { useSetState } from 'ahooks';
 import { isBoolean } from 'lodash';
 import classNames from 'classnames';
@@ -18,8 +13,8 @@ import copySvg from "../../../assets/copy.svg";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-var Paragraph = _Typography.Paragraph,
-  Text = _Typography.Text;
+var Paragraph = Typography.Paragraph,
+  Text = Typography.Text;
 // @ts-ignore
 var RenderColumn = props => {
   var valueType = props.valueType,
@@ -95,7 +90,7 @@ var RenderColumn = props => {
       });
       if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
         if (ellipsis) {
-          return /*#__PURE__*/_jsx(_Tooltip, _objectSpread(_objectSpread({
+          return /*#__PURE__*/_jsx(Tooltip, _objectSpread(_objectSpread({
             title: currentValue,
             onOpenChange: open => {
               setState({
@@ -127,27 +122,29 @@ var RenderColumn = props => {
         }
         return !isEmpty(originalValue) ? originalValue : '-';
       };
-      return /*#__PURE__*/_jsx(_Tooltip, _objectSpread(_objectSpread({
+      return /*#__PURE__*/_jsx(Tooltip, _objectSpread(_objectSpread({
         className: cellDiffCls,
         style: {
           width,
           minWidth
         },
-        overlayClassName: "original-value-tooltip",
-        destroyTooltipOnHide: true,
+        classNames: {
+          root: 'original-value-tooltip'
+        },
+        destroyOnHidden: true,
         placement: "topLeft",
         autoAdjustOverflow: false,
-        title: /*#__PURE__*/_jsx(_Space, {
+        title: /*#__PURE__*/_jsx(Space, {
           direction: "vertical",
           className: "changed-tooltip",
           children: props !== null && props !== void 0 && props.isChanged && !(props !== null && props !== void 0 && props.isAddCell) ? /*#__PURE__*/_jsxs(_Fragment, {
-            children: [/*#__PURE__*/_jsxs(_Space, {
+            children: [/*#__PURE__*/_jsxs(Space, {
               align: "start",
               className: "original-value-container",
               children: ["\u521D\u59CB\u503C\uFF1A", originalValueCalc()]
-            }), /*#__PURE__*/_jsx(_Space, {
+            }), /*#__PURE__*/_jsx(Space, {
               className: "current-value-container",
-              children: ellipsis ? /*#__PURE__*/_jsxs(_Space, {
+              children: ellipsis ? /*#__PURE__*/_jsxs(Space, {
                 children: ["\u5F53\u524D\u503C\uFF1A", currentValue]
               }) : null
             })]
@@ -198,9 +195,9 @@ var RenderColumn = props => {
       });
     }
     var calculatedWidth = updateCalculatedWidth(textRef.current);
-    return /*#__PURE__*/_jsx(_Tooltip, _objectSpread(_objectSpread({
+    return /*#__PURE__*/_jsx(Tooltip, _objectSpread(_objectSpread({
       title: value,
-      destroyTooltipOnHide: true,
+      destroyOnHidden: true,
       onOpenChange: () => {
         setState({
           tooltip: false

package/es/ProTable/components/RenderSummary/index.js

@@ -1,5 +1,4 @@
-import "antd/es/table/style";
-import _Table from "antd/es/table";
+import { Table } from 'antd';
 import { get, isObject } from 'lodash';
 import { tools } from '@zat-design/utils';
 import { valueTypeRender } from "../../../ProUtils/utils";
@@ -18,9 +17,9 @@ var renderSummary = props => {
   if (!(dataSource !== null && dataSource !== void 0 && dataSource.length)) {
     return null;
   }
-  return isObject(summary) ? /*#__PURE__*/_jsx(_Table.Summary, {
+  return isObject(summary) ? /*#__PURE__*/_jsx(Table.Summary, {
     fixed: fixed,
-    children: /*#__PURE__*/_jsx(_Table.Summary.Row, {
+    children: /*#__PURE__*/_jsx(Table.Summary.Row, {
       children: columns === null || columns === void 0 ? void 0 : columns.map(_ref2 => {
         var key = _ref2.key,
           dataIndex = _ref2.dataIndex,
@@ -44,7 +43,7 @@ var renderSummary = props => {
           }, 0);
           text = format ? format(sum, precision !== null && precision !== void 0 ? precision : 2) : sum;
         }
-        return /*#__PURE__*/_jsxs(_Table.Summary.Cell, {
+        return /*#__PURE__*/_jsxs(Table.Summary.Cell, {
           index: index,
           colSpan: colSpan,
           children: [prefix, text, suffix]

package/es/ProTable/components/RenderTableHeader/index.js

@@ -1,5 +1,4 @@
-import "antd/es/button/style";
-import _Button from "antd/es/button";
+import { Button } from 'antd';
 import { ReactSVG } from 'react-svg';
 import { ProTreeModal } from "../../../index";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -30,7 +29,7 @@ var RenderTableHeader = props => {
       children: headerRender ? typeof headerRender === 'function' ? headerRender() : headerRender : null
     }), /*#__PURE__*/_jsxs("div", {
       className: "right-actions",
-      children: [resizeColumn && /*#__PURE__*/_jsx(_Button, {
+      children: [resizeColumn && /*#__PURE__*/_jsx(Button, {
         icon: /*#__PURE__*/_jsx(ReactSVG, {
           className: "anticon",
           wrapper: "span",
@@ -47,7 +46,7 @@ var RenderTableHeader = props => {
         value: checkColumns,
         allValue: "all",
         onChange: handleColumnConfig,
-        trigger: /*#__PURE__*/_jsx(_Button, {
+        trigger: /*#__PURE__*/_jsx(Button, {
           className: "custom-column-btn",
           icon: /*#__PURE__*/_jsx(ReactSVG, {
             className: "anticon",

package/es/ProTable/components/RenderTabs/index.js

@@ -1,9 +1,6 @@
-import "antd/es/tabs/style";
-import _Tabs from "antd/es/tabs";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { Tabs, Form } from 'antd';
 import { useMemo, useState, useEffect, memo } from 'react';
 import useEnum from "../../../ProEnum/hooks/useEnum";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -26,7 +23,7 @@ var RenderTabs = props => {
   var _useEnum = useEnum(code),
     _useEnum2 = _slicedToArray(_useEnum, 1),
     options = _useEnum2[0];
-  var fieldValue = _Form.useWatch(name, form);
+  var fieldValue = Form.useWatch(name, form);
 
   // 使用useMemo计算派生状态
   var tabItems = useMemo(() => {
@@ -55,7 +52,7 @@ var RenderTabs = props => {
   if (!(tabItems !== null && tabItems !== void 0 && tabItems.length)) {
     return null;
   }
-  return /*#__PURE__*/_jsx(_Tabs, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(Tabs, _objectSpread(_objectSpread({
     className: "pro-table-tabs",
     onChange: key => {
       var fieldsValues = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {};

package/es/ProTable/components/TableResizable/index.js

@@ -23,7 +23,8 @@ var ResizableTitle = props => {
   if (restProps !== null && restProps !== void 0 && (_restProps$className = restProps.className) !== null && _restProps$className !== void 0 && _restProps$className.includes('ant-table-selection-column')) {
     return /*#__PURE__*/_jsx("th", _objectSpread({}, restProps));
   }
-  return /*#__PURE__*/_jsx(Resizable, {
+  var ResizableComponent = Resizable;
+  return /*#__PURE__*/_jsx(ResizableComponent, {
     width: Number(width) + Number(offset),
     minConstraints: [minwidth, 0],
     height: 0,

package/es/ProTable/components/TooltipTitle/index.js

@@ -1,5 +1,4 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
+import { Tooltip } from 'antd';
 import { ReactSVG } from 'react-svg';
 import tipSvg from "../../../assets/tip.svg";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -12,7 +11,7 @@ var TooltipTitle = props => {
     icon = _ref.icon;
   return /*#__PURE__*/_jsxs("span", {
     className: "pro-table-tooltip",
-    children: [title, /*#__PURE__*/_jsx(_Tooltip, {
+    children: [title, /*#__PURE__*/_jsx(Tooltip, {
       title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip,
       children: /*#__PURE__*/_jsx(ReactSVG, {
         className: "icon-tip",

package/es/ProTable/hooks/useAntdTable.js

@@ -1,16 +1,13 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import "antd/es/message/style";
-import _message from "antd/es/message";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["page", "filters", "sorter"];
 import { useEffect, useMemo, useState } from 'react';
 import { useRequest, useSetState, useDeepCompareEffect, usePrevious } from 'ahooks';
 import { pickBy, isObject, merge, set, isEqual, omit } from 'lodash';
+import { Form, message } from 'antd';
 import { defaultPage } from "../index";
 import { isListResult, removeEmptyKeys, isNonEmptyObject } from "../utils";
 import locale, { formatMessage } from "../../locale";
@@ -70,7 +67,7 @@ function useAntdTable(service, options, useRequestOptions) {
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
-  var _Form$useForm = _Form.useForm(_form),
+  var _Form$useForm = Form.useForm(_form),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var _ref = useRequestOptions || {},
@@ -129,7 +126,7 @@ function useAntdTable(service, options, useRequestOptions) {
         total = _ref2$total === void 0 ? 0 : _ref2$total;
       if (list !== null && !Array.isArray(list)) {
         var _locale$ProTable;
-        return _message.error(locale === null || locale === void 0 || (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.transformResponseMsg);
+        return message.error(locale === null || locale === void 0 || (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.transformResponseMsg);
       }
       setState({
         total,
@@ -464,7 +461,7 @@ function useAntdTable(service, options, useRequestOptions) {
           return acc;
         }, {});
         setState({
-          selectedRecords: newSelectedKeys === null || newSelectedKeys === void 0 ? void 0 : newSelectedKeys.map(item => selectedRecordObj === null || selectedRecordObj === void 0 ? void 0 : selectedRecordObj[item]),
+          selectedRecords: newSelectedKeys === null || newSelectedKeys === void 0 ? void 0 : newSelectedKeys.map(item => selectedRecordObj === null || selectedRecordObj === void 0 ? void 0 : selectedRecordObj[String(item)]),
           selectedRowKeys: newSelectedKeys
         });
       } else {

package/es/ProTable/index.d.ts

@@ -8,13 +8,6 @@ export declare const defaultPage: {
 };
 declare const ProTable: {
     (props: ProTableType): import("react/jsx-runtime").JSX.Element;
-    defaultProps: {
-        quickConfig: boolean;
-        stripe: boolean;
-        draggable: boolean;
-        disabled: boolean;
-        isView: boolean;
-    };
     useAntdTable: typeof useAntdTable;
     SELECTION_ALL: string;
     CURRENT_PAGE: string;

package/es/ProTable/index.js

@@ -11,7 +11,7 @@ import { useDebounceEffect, useDeepCompareEffect, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { useProConfig } from "../index";
 import { RenderTableHeader, RenderFooter, RenderTabs } from "./components";
-import useAntdTable, { CURRENT_PAGE, SELECTION_ALL, UNCHECK_ALL } from "./hooks/useAntdTable";
+import useAntdTable, { SELECTION_ALL, CURRENT_PAGE, UNCHECK_ALL } from "./hooks/useAntdTable";
 import { BaseTable, DraggableTable } from "./components/RcTable";
 import { formatColumn } from "./components/FormatColumn";
 import empty from "../assets/empty.png";
@@ -42,14 +42,19 @@ var ProTable = props => {
   var tableId = props.tableId,
     headerRender = props.headerRender,
     footerRender = props.footerRender,
-    quickConfig = props.quickConfig,
-    stripe = props.stripe,
+    _props$quickConfig = props.quickConfig,
+    quickConfig = _props$quickConfig === void 0 ? false : _props$quickConfig,
+    _props$stripe = props.stripe,
+    stripe = _props$stripe === void 0 ? true : _props$stripe,
     _props$columns = props.columns,
     propsColumns = _props$columns === void 0 ? [] : _props$columns,
     className = props.className,
-    draggable = props.draggable,
-    disabled = props.disabled,
-    isView = props.isView,
+    _props$draggable = props.draggable,
+    draggable = _props$draggable === void 0 ? false : _props$draggable,
+    _props$disabled = props.disabled,
+    disabled = _props$disabled === void 0 ? false : _props$disabled,
+    _props$isView = props.isView,
+    isView = _props$isView === void 0 ? false : _props$isView,
     rowDisabled = props.rowDisabled,
     summary = props.summary,
     _props$emptyText = props.emptyText,
@@ -442,14 +447,6 @@ var ProTable = props => {
     })
   });
 };
-ProTable.defaultProps = {
-  quickConfig: false,
-  // 默认关闭快速配置
-  stripe: true,
-  draggable: false,
-  disabled: false,
-  isView: false
-};
 ProTable.useAntdTable = useAntdTable;
 ProTable.SELECTION_ALL = SELECTION_ALL;
 ProTable.CURRENT_PAGE = CURRENT_PAGE;

package/es/ProTable/propsType.d.ts

@@ -1,9 +1,8 @@
 import { Key, ReactNode } from 'react';
-import { TableProps } from 'antd/es/table/Table';
+import type { TableProps, TooltipProps } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
+import { FormInstance } from 'antd/es/form/Form';
 import { ColumnType, GetRowKey, RowSelectionType } from 'antd/es/table/interface';
-import { FormInstance } from 'antd';
-import type { TooltipProps } from 'antd';
 import type { TabsProps } from 'antd/es/tabs';
 /**
  * 合计栏的每列配置参数

package/es/ProTable/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-table {
   .pro-tooltip .singleLine {
@@ -96,18 +94,18 @@
       }
     }
   }
-  .drag-wrapper {
+  .pro-table-drag-wrapper {
     display: flex;
-    width: 20px;
+    justify-content: flex-end;
+    margin-right: 8px;
     .anticon {
-      margin-right: 12px;
       cursor: pointer;
       .drag-icon {
         margin-right: 0;
       }
     }
   }
-  .drag-wrapper.no-check {
+  .pro-table-drag-wrapper.no-check {
     .anticon {
       margin-right: 0;
     }