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

package/es/ProDrawerForm/propsType.d.ts

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import type { ModalProps, DrawerProps, FormInstance } from 'antd';
+import type { ModalProps, DrawerProps, FormInstance, ModalFuncProps } from 'antd';
 import type { ProFormType } from '../ProForm/propsType';
 /**
  * 抽屉尺寸类型定义
@@ -11,17 +11,11 @@ export type DrawerSizeType = DrawerSizePropsType;
  */
 export type ShowTypePropsType = 'Modal' | 'Drawer';
 export type ShowType = ShowTypePropsType;
-/**
- * 为了保持向后兼容，保留原有接口名称
- * @deprecated ProDrawerFormType
- */
-export interface ProDrawerFormPropsType {
+export interface ProDrawerFormType {
     /** @name 内部form实例 */
     form?: FormInstance<any>;
     /** @name 自定义className */
     className?: string;
-    /** @name 控制显示隐藏（兼容旧版API） */
-    visible?: ModalProps['open'] | DrawerProps['open'];
     /** @name 控制显示隐藏 */
     open: ModalProps['open'] | DrawerProps['open'];
     /** @name 标题 */
@@ -33,7 +27,7 @@ export interface ProDrawerFormPropsType {
     /** @name 是否查看模式 */
     isView?: boolean | undefined;
     /** @name 宽度 */
-    width?: ModalProps['width'] | DrawerProps['width'];
+    width?: string | number;
     /** @name 取消按钮文字 */
     cancelText?: ModalProps['cancelText'];
     /** @name 确认按钮文字 */
@@ -62,7 +56,7 @@ export interface ProDrawerFormPropsType {
      * @name 关闭时二次确认弹框的属性
      * @description 只对Drawer的类型有效
      */
-    isConfirmCloseModalProps?: ModalProps;
+    isConfirmCloseModalProps?: Omit<ModalFuncProps, 'content' | 'onOk' | 'onCancel'>;
     /**
      * @name 底部默认取消按钮事件
      * @returns 返回Promise或布尔值可控制弹窗关闭行为
@@ -90,14 +84,12 @@ export interface ProDrawerFormPropsType {
     proFormProps?: Omit<ProFormType, 'form'>;
     /**
      * @name 弹框的属性
-     * @description 不支持'visible'，请使用全局的visible/open
      */
-    modalProps?: Omit<ModalProps, 'visible'>;
+    modalProps?: ModalProps;
     /**
      * @name 抽屉的属性
-     * @description 不支持'visible'，请使用全局的visible/open
      */
-    drawerProps?: Omit<DrawerProps, 'visible'>;
+    drawerProps?: DrawerProps;
     /**
      * @name 关闭时弹框或者抽屉是否清空formValues
      */
@@ -107,7 +99,4 @@ export interface ProDrawerFormPropsType {
     /** @name z轴层级 */
     zIndex?: number;
 }
-/**
- * 抽屉表单属性类型定义
- */
-export type ProDrawerFormType = ProDrawerFormPropsType;
+export type ProDrawerFormPropsType = ProDrawerFormType;

package/es/ProDrawerForm/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-drawer {
   .original-value-tooltip {
@@ -112,18 +110,13 @@
 .pro-modal {
   .@{ant-prefix}-modal-close {
     .@{ant-prefix}-modal-close-x {
-      .close-icon {
-        fill: var(--zaui-aide-text, #909090);
-
-        &:hover {
-          fill: var(--zaui-brand, #006aff);
-        }
-      }
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
   }
 
   .@{ant-prefix}-modal-header {
-    padding: var(--zaui-space-size-md, 16px);
     border-bottom: none;
 
     .@{ant-prefix}-modal-title {
@@ -132,11 +125,11 @@
   }
 
   .@{ant-prefix}-modal-footer {
-    padding: var(--zaui-space-size-md, 16px);
     border-top: none;
 
     .pro-modal-footer {
       display: flex;
+      align-items: center;
       justify-content: space-between;
     }
   }
@@ -144,9 +137,9 @@
   .@{ant-prefix}-modal-content {
     .@{ant-prefix}-modal-body {
       max-height: 450px;
-      padding: 0 var(--zaui-space-size-md, 16px);
       padding-top: 0;
-      overflow: auto;
+      overflow-x: hidden;
+      overflow-y: auto;
     }
   }
 }
@@ -173,6 +166,5 @@
   .@{ant-prefix}-modal-footer {
     position: relative;
     z-index: 1;
-    box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
   }
 }

package/es/ProEditLabel/components/RenderProForm.js

@@ -1,9 +1,8 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { useEffect } from 'react';
 import { omit } from 'lodash';
 import { InfoCircleOutlined } from '@ant-design/icons';
+import { Space } from 'antd';
 import { ProForm } from "../../index";
 import { matchFormValue } from "../utils";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -58,7 +57,7 @@ var RenderProForm = props => {
       children: primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.title
     }), (primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip) && !((_props7 = _props) !== null && _props7 !== void 0 && _props7.isView) && /*#__PURE__*/_jsx("div", {
       className: "pro-edit-label-tip",
-      children: /*#__PURE__*/_jsxs(_Space, {
+      children: /*#__PURE__*/_jsxs(Space, {
         align: "start",
         children: [/*#__PURE__*/_jsx(InfoCircleOutlined, {}), primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip]
       })

package/es/ProEditLabel/index.js

@@ -1,18 +1,11 @@
-import "antd/es/popconfirm/style";
-import _Popconfirm from "antd/es/popconfirm";
-import "antd/es/input/style";
-import _Input from "antd/es/input";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["open", "disabled", "onOpenChange", "onFinish", "onConfirm", "trigger", "mode", "className", "size", "popupProps", "style", "viewEmpty", "children", "form"];
 import { EditOutlined } from '@ant-design/icons';
+import { Input, Popconfirm, Form, Space } from 'antd';
 import { useToggle, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import React, { useEffect, useRef } from 'react';
@@ -56,10 +49,10 @@ var ProEditLabel = _ref => {
     _useToggle2 = _slicedToArray(_useToggle, 2),
     status = _useToggle2[0],
     toggleStatus = _useToggle2[1].toggle;
-  var _Form$useForm = _Form.useForm(OriginForm),
+  var _Form$useForm = Form.useForm(OriginForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _Form$useForm3 = _Form.useForm(),
+  var _Form$useForm3 = Form.useForm(),
     _Form$useForm4 = _slicedToArray(_Form$useForm3, 1),
     viewForm = _Form$useForm4[0];
   var inputRef = useRef(null);
@@ -222,7 +215,7 @@ var ProEditLabel = _ref => {
     var TextNode = /*#__PURE__*/_jsx("div", {
       className: cls,
       style: style,
-      children: /*#__PURE__*/_jsxs(_Space, {
+      children: /*#__PURE__*/_jsxs(Space, {
         align: "start",
         children: [mode === 'current' ? props.value : /*#__PURE__*/_jsx(RenderProForm, _objectSpread({
           value: confirmValue,
@@ -245,7 +238,7 @@ var ProEditLabel = _ref => {
     // 当前页编辑模式
     if (mode === 'current') {
       if (status) {
-        return /*#__PURE__*/_jsx(_Input, _objectSpread(_objectSpread({
+        return /*#__PURE__*/_jsx(Input, _objectSpread(_objectSpread({
           ref: inputRef,
           size: size,
           onBlur: e => {
@@ -271,10 +264,12 @@ var ProEditLabel = _ref => {
         }
         return TextNode;
       };
-      return /*#__PURE__*/_jsx(_Popconfirm, _objectSpread(_objectSpread({
-        overlayClassName: "pro-edit-label-popconfirm",
+      return /*#__PURE__*/_jsx(Popconfirm, _objectSpread(_objectSpread({
+        classNames: {
+          root: 'pro-edit-label-popconfirm'
+        },
         icon: null,
-        destroyTooltipOnHide: true,
+        destroyOnHidden: true,
         title: /*#__PURE__*/_jsx(RenderProForm, _objectSpread({
           form: form,
           value: confirmValue,

package/es/ProEditLabel/propsType.d.ts

@@ -84,11 +84,6 @@ export interface PopupType {
     [key: string]: any;
 }
 export interface LabelType extends InputProps {
-    /**
-     * @description 是否可见
-     * @default false
-     */
-    visible?: boolean;
     /**
      * @description 是否打开
      * @default false
@@ -98,7 +93,7 @@ export interface LabelType extends InputProps {
      * @description 可见性变化回调
      * @default -
      */
-    onVisibleChange?: (open: boolean) => void;
+    onOpenChange?: (open: boolean) => void;
     /**
      * @description 值变化回调
      * @default -

package/es/ProEditLabel/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-edit-label {
   display: inline-block;
@@ -69,12 +67,13 @@
 
 .pro-edit-label-popconfirm {
   z-index: 1001 !important;
+  
 
   .@{ant-prefix}-popover-inner-content {
     width: 100%;
   }
 
-  .@{ant-prefix}-popover-message {
+  .@{ant-prefix}-popconfirm-message {
     display: block;
   }
 

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

@@ -1,9 +1,6 @@
-import "antd/es/popconfirm/style";
-import _Popconfirm from "antd/es/popconfirm";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React from 'react';
+import { Button, Popconfirm } from 'antd';
 import { isFunction, omit } from 'lodash';
 import { iconMap } from "../../utils/config";
 import locale from "../../../locale";
@@ -108,7 +105,7 @@ var ActionButton = _ref => {
   var isDisabled = !selectedRowKeys.length && btnConfig.type === 'mulDelete' || editingKeys.length || (delBtnProps === null || delBtnProps === void 0 ? void 0 : delBtnProps.disabled);
   return _isEditing && getShow(btnConfig.show) ? /*#__PURE__*/_jsx(_Fragment, {
     children: ['delete', 'mulDelete'].includes(btnConfig.type) ? /*#__PURE__*/_jsx(_Fragment, {
-      children: btnConfig !== null && btnConfig !== void 0 && btnConfig.needConfirm ? /*#__PURE__*/_jsx(_Popconfirm, {
+      children: btnConfig !== null && btnConfig !== void 0 && btnConfig.needConfirm ? /*#__PURE__*/_jsx(Popconfirm, {
         placement: "topRight",
         title: deleteMsgMap[btnConfig.type],
         onConfirm: () => {
@@ -128,7 +125,7 @@ var ActionButton = _ref => {
           record,
           index,
           disabled: isDisabled
-        }))) : /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        }))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           children: btnConfig.label
@@ -148,7 +145,7 @@ var ActionButton = _ref => {
               selectedRows
             });
           }
-        }))) : /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        }))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: () => {
@@ -168,7 +165,7 @@ var ActionButton = _ref => {
       children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         record,
         index
-      }))) : /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread({
+      }))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
         className: "action-button"
       }, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         type: "link",

package/es/ProEditTable/components/RcTable/BaseTable.js

@@ -1,12 +1,10 @@
-import "antd/es/table/style";
-import _Table from "antd/es/table";
-import "antd/es/badge/style";
-import _Badge from "antd/es/badge";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["tableProps"];
-import { memo } from 'react';
+import { memo, useCallback } from 'react';
+import { Badge, Table } from 'antd';
+import { isFunction, isNumber } from 'lodash';
 import useEditTableError from "../../utils/useEditTableError";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -15,7 +13,8 @@ var BaseTable = _ref => {
   var _value$;
   var tableProps = _ref.tableProps,
     resetProps = _objectWithoutProperties(_ref, _excluded);
-  var value = tableProps.value,
+  var rowKey = tableProps.rowKey,
+    value = tableProps.value,
     headerRender = tableProps.headerRender,
     tableRef = tableProps.tableRef,
     className = tableProps.className,
@@ -41,56 +40,74 @@ var BaseTable = _ref => {
     }),
     _useEditTableError2 = _slicedToArray(_useEditTableError, 1),
     errorLength = _useEditTableError2[0];
+  var getScroll = useCallback(() => {
+    if (scroll !== null && scroll !== void 0 && scroll.x && scroll !== null && scroll !== void 0 && scroll.y) {
+      return {
+        x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
+        y: Number(scroll === null || scroll === void 0 ? void 0 : scroll.y)
+      };
+    }
+    if (scroll !== null && scroll !== void 0 && scroll.x && !isNumber(scroll === null || scroll === void 0 ? void 0 : scroll.y)) {
+      return {
+        x: scroll === null || scroll === void 0 ? void 0 : scroll.x
+      };
+    }
+    if (scroll !== null && scroll !== void 0 && scroll.y && !(scroll !== null && scroll !== void 0 && scroll.x)) {
+      return {
+        y: Number(scroll === null || scroll === void 0 ? void 0 : scroll.y)
+      };
+    }
+    return null;
+  }, [scroll]);
+  var nextTableProps = _objectSpread(_objectSpread({
+    className,
+    columns,
+    rowClassName,
+    dataSource: value !== null && value !== void 0 && (_value$ = value[0]) !== null && _value$ !== void 0 && _value$.rowKey ? value : [],
+    rowSelection: renderRowSelection(),
+    onRow: () => ({
+      disabled: disabled || virtualKey && !!editingKeys.length,
+      'data-hide': isHideCheckBox,
+      'data-row-draggable': rowDraggable,
+      onClick: () => {}
+    })
+  }, resetProps), {}, {
+    rowKey: rowKey || 'rowKey',
+    summary,
+    pagination: pagination ? _objectSpread(_objectSpread({
+      showSizeChanger: true,
+      pageSizeOptions: [5, 10, 20, 50],
+      showQuickJumper: true,
+      total: value === null || value === void 0 ? void 0 : value.length,
+      showTotal: total => {
+        var _locale$ProEditTable;
+        if (!total) return;
+        return formatMessage(locale === null || locale === void 0 || (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+          total
+        });
+      },
+      itemRender: (index, type, originalElement) => {
+        return type === 'page' && page.pageNum === index && errorLength ? /*#__PURE__*/_jsxs("div", {
+          className: "pro-edit-table-pagination-item-badge",
+          children: [/*#__PURE__*/_jsx(Badge, {
+            count: errorLength
+          }), originalElement]
+        }) : originalElement;
+      },
+      onChange: handlePageChange
+    }, pagination), {}, {
+      current: page.pageNum,
+      pageSize: page.pageSize
+    }) : false,
+    scroll: getScroll()
+  });
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [headerRender ? /*#__PURE__*/_jsx("div", {
       className: "pro-edit-table-header",
-      children: typeof headerRender === 'function' ? headerRender() : headerRender
-    }) : null, /*#__PURE__*/_jsx(_Table, _objectSpread(_objectSpread({
-      ref: tableRef,
-      className: className,
-      dataSource: value !== null && value !== void 0 && (_value$ = value[0]) !== null && _value$ !== void 0 && _value$.rowKey ? value : undefined,
-      columns: columns,
-      rowSelection: renderRowSelection(),
-      rowClassName: rowClassName,
-      onRow: () => ({
-        disabled: disabled || virtualKey && !!editingKeys.length,
-        'data-hide': isHideCheckBox,
-        'data-row-draggable': rowDraggable,
-        onClick: () => {}
-      })
-    }, resetProps), {}, {
-      pagination: pagination ? _objectSpread(_objectSpread({
-        showSizeChanger: true,
-        pageSizeOptions: [5, 10, 20, 50],
-        showQuickJumper: true,
-        total: value === null || value === void 0 ? void 0 : value.length,
-        showTotal: total => {
-          var _locale$ProEditTable;
-          if (!total) return;
-          return formatMessage(locale === null || locale === void 0 || (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
-            total
-          });
-        },
-        itemRender: (index, type, originalElement) => {
-          return type === 'page' && page.pageNum === index && errorLength ? /*#__PURE__*/_jsxs("div", {
-            className: "pro-edit-table-pagination-item-badge",
-            children: [/*#__PURE__*/_jsx(_Badge, {
-              count: errorLength
-            }), originalElement]
-          }) : originalElement;
-        },
-        onChange: handlePageChange
-      }, pagination), {}, {
-        current: page.pageNum,
-        pageSize: page.pageSize
-      }) : false,
-      rowKey: "rowKey",
-      scroll: {
-        x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
-        y: value !== null && value !== void 0 && value.length ? scroll === null || scroll === void 0 ? void 0 : scroll.y : undefined
-      },
-      summary: summary
-    }))]
+      children: isFunction(headerRender) ? headerRender() : headerRender
+    }) : null, /*#__PURE__*/_jsx(Table, _objectSpread({
+      ref: tableRef
+    }, nextTableProps))]
   });
 };
 export default /*#__PURE__*/memo(BaseTable);

package/es/ProEditTable/components/RcTable/DraggableTable.js

@@ -1,11 +1,11 @@
-import "antd/es/table/style";
-import _Table from "antd/es/table";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["disabled", "children"],
   _excluded2 = ["tableProps", "draggableProps"];
-import React, { memo } from 'react';
+import { Table } from 'antd';
+import React, { memo, useCallback } from 'react';
 import { DndContext } from '@dnd-kit/core';
+import { isNumber } from 'lodash';
 import { arrayMove, useSortable, SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import ProIcon from "../../../ProIcon";
@@ -38,8 +38,9 @@ var Row = props => {
     ref: setNodeRef,
     style: style
   }, attributes), {}, {
-    children: React.Children.map(children, child => {
-      if (child.key === 'RC_TABLE_KEY' && !disabled) {
+    children: React.Children.map(children, (child, index) => {
+      // 在第一列（通常是rowSelection列）显示拖拽图标
+      if (index === 0 && !disabled) {
         var _restProps$dataRowD;
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,
@@ -48,7 +49,7 @@ var Row = props => {
         var isDrag = restProps['data-row-draggable'] ? (_restProps$dataRowD = restProps['data-row-draggable']) === null || _restProps$dataRowD === void 0 ? void 0 : _restProps$dataRowD.call(restProps, record) : true;
         return /*#__PURE__*/React.cloneElement(child, {
           children: /*#__PURE__*/_jsxs("span", {
-            className: `drag-wrapper${props['data-hide'] ? ' no-check' : ''}`,
+            className: `pro-edit-table-drag-wrapper${props['data-hide'] ? ' no-check' : ''}`,
             children: [isDrag ? /*#__PURE__*/_jsx(ProIcon, _objectSpread({
               className: "drag-icon",
               style: {
@@ -60,7 +61,8 @@ var Row = props => {
             }, listeners)) : /*#__PURE__*/_jsx(ProIcon, {
               size: 20
             }), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
-          })
+          }),
+          className: 'pro-edit-table-drag-wrapper-cell'
         });
       }
       return child;
@@ -105,7 +107,8 @@ var DraggableTable = _ref3 => {
   var tableProps = _ref3.tableProps,
     draggableProps = _ref3.draggableProps,
     resetProps = _objectWithoutProperties(_ref3, _excluded2);
-  var value = tableProps.value,
+  var rowKey = tableProps.rowKey,
+    value = tableProps.value,
     headerRender = tableProps.headerRender,
     tableRef = tableProps.tableRef,
     className = tableProps.className,
@@ -128,6 +131,62 @@ var DraggableTable = _ref3 => {
     onDrag = draggableProps.onDrag,
     draggable = draggableProps.draggable,
     onDragEnd = draggableProps.onDragEnd;
+  var getScroll = useCallback(() => {
+    if (scroll !== null && scroll !== void 0 && scroll.x && scroll !== null && scroll !== void 0 && scroll.y) {
+      return {
+        x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
+        y: Number(scroll === null || scroll === void 0 ? void 0 : scroll.y)
+      };
+    }
+    if (scroll !== null && scroll !== void 0 && scroll.x && !isNumber(scroll === null || scroll === void 0 ? void 0 : scroll.y)) {
+      return {
+        x: scroll === null || scroll === void 0 ? void 0 : scroll.x
+      };
+    }
+    if (scroll !== null && scroll !== void 0 && scroll.y && !(scroll !== null && scroll !== void 0 && scroll.x)) {
+      return {
+        y: Number(scroll === null || scroll === void 0 ? void 0 : scroll.y)
+      };
+    }
+    return null;
+  }, [scroll]);
+  var nextTableProps = _objectSpread(_objectSpread({
+    className,
+    columns,
+    rowClassName,
+    rowSelection: renderRowSelection(),
+    components: {
+      body: {
+        row: Row
+      }
+    },
+    onRow: () => ({
+      disabled: disabled || virtualKey && !!editingKeys.length,
+      'data-hide': isHideCheckBox,
+      'data-row-draggable': rowDraggable,
+      onClick: () => {}
+    }),
+    dataSource: value !== null && value !== void 0 && (_value$2 = value[0]) !== null && _value$2 !== void 0 && _value$2.rowKey ? value : []
+  }, resetProps), {}, {
+    rowKey: rowKey || 'rowKey',
+    pagination: pagination ? _objectSpread({
+      current: page.pageNum,
+      pageSize: page.pageSize,
+      showSizeChanger: false,
+      showQuickJumper: true,
+      total: value === null || value === void 0 ? void 0 : value.length,
+      showTotal: total => {
+        var _locale$ProEditTable;
+        if (!total) return;
+        return formatMessage(locale === null || locale === void 0 || (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+          total
+        });
+      },
+      onChange: handlePageChange
+    }, pagination) : false,
+    scroll: getScroll(),
+    summary
+  });
   return /*#__PURE__*/_jsxs(DndWrapper, {
     value: value,
     onChange: onChange,
@@ -138,47 +197,9 @@ var DraggableTable = _ref3 => {
     children: [headerRender ? /*#__PURE__*/_jsx("div", {
       className: "pro-edit-table-header",
       children: typeof headerRender === 'function' ? headerRender() : headerRender
-    }) : null, /*#__PURE__*/_jsx(_Table, _objectSpread(_objectSpread({
-      ref: tableRef,
-      className: className,
-      dataSource: value !== null && value !== void 0 && (_value$2 = value[0]) !== null && _value$2 !== void 0 && _value$2.rowKey ? value : undefined,
-      columns: columns,
-      rowSelection: renderRowSelection(),
-      rowClassName: rowClassName,
-      components: {
-        body: {
-          row: Row
-        }
-      },
-      onRow: () => ({
-        disabled: disabled || virtualKey && !!editingKeys.length,
-        'data-hide': isHideCheckBox,
-        'data-row-draggable': rowDraggable,
-        onClick: () => {}
-      })
-    }, resetProps), {}, {
-      pagination: pagination ? _objectSpread({
-        current: page.pageNum,
-        pageSize: page.pageSize,
-        showSizeChanger: false,
-        showQuickJumper: true,
-        total: value === null || value === void 0 ? void 0 : value.length,
-        showTotal: total => {
-          var _locale$ProEditTable;
-          if (!total) return;
-          return formatMessage(locale === null || locale === void 0 || (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
-            total
-          });
-        },
-        onChange: handlePageChange
-      }, pagination) : false,
-      rowKey: "rowKey",
-      scroll: {
-        x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
-        y: value !== null && value !== void 0 && value.length ? scroll === null || scroll === void 0 ? void 0 : scroll.y : undefined
-      },
-      summary: summary
-    }))]
+    }) : null, /*#__PURE__*/_jsx(Table, _objectSpread({
+      ref: tableRef
+    }, nextTableProps))]
   });
 };
 export default /*#__PURE__*/memo(DraggableTable);

package/es/ProEditTable/components/RcTable/index.d.ts

@@ -2,5 +2,3 @@
 export { default as BaseTable } from './BaseTable';
 /** 拖拽表格 */
 export { default as DraggableTable } from './DraggableTable';
-/** 虚拟列表表格, 暂时移除 */
-export { default as VirtualTable } from './VirtualTable';

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

@@ -1,6 +1,4 @@
 /** 基础表格 */
 export { default as BaseTable } from "./BaseTable";
 /** 拖拽表格 */
-export { default as DraggableTable } from "./DraggableTable";
-/** 虚拟列表表格, 暂时移除 */
-export { default as VirtualTable } from "./VirtualTable";
+export { default as DraggableTable } from "./DraggableTable";