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

package/es/ProDrawerForm/index.js

@@ -13,8 +13,7 @@ export var useProDrawerFormContext = function useProDrawerFormContext() {
 };
 var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
   var _okText, _locale$ProDrawerForm, _locale$ProDrawerForm2;
-  var visible = props.visible,
-    showType = props.showType,
+  var showType = props.showType,
     okText = props.okText,
     isView = props.isView;
   var open = props.open,
@@ -29,7 +28,6 @@ var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
   showType = mode || showType;
   isView = isView || disabled;
   okText = (_okText = okText) !== null && _okText !== void 0 ? _okText : showType === 'Drawer' ? locale === null || locale === void 0 ? void 0 : (_locale$ProDrawerForm = locale.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.save : locale === null || locale === void 0 ? void 0 : (_locale$ProDrawerForm2 = locale.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.confirm;
-  visible = open !== null && open !== void 0 ? open : visible;
   var width = props.width;
   if (!width && size) {
     width = transformBySize(size);
@@ -49,7 +47,7 @@ var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
   useImperativeHandle(ref, function () {
     return form;
   });
-  var Com = useMemo(function () {
+  var DrawerModal = useMemo(function () {
     return {
       Drawer: ProDrawer,
       Modal: ProModal
@@ -59,9 +57,9 @@ var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
     value: {
       source: 'ProDrawerForm'
     },
-    children: visible ? _jsx(Com, _objectSpread(_objectSpread({}, props), {}, {
+    children: open ? _jsx(DrawerModal, _objectSpread(_objectSpread({}, props), {}, {
       isView: isView,
-      visible: visible,
+      open: open,
       form: form,
       width: width,
       okText: okText,

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,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'; */
 
 .pro-drawer {
   .original-value-tooltip {
@@ -112,18 +112,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 +127,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 +139,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 +168,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,10 +1,9 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _omit from "lodash/omit";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect } from 'react';
 import { InfoCircleOutlined } from '@ant-design/icons';
+import { Space } from 'antd';
 import { ProForm } from '../../index';
 import { matchFormValue } from '../utils';
 var RenderProForm = function RenderProForm(props) {
@@ -54,7 +53,7 @@ var RenderProForm = function 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 ? void 0 : _props7.isView) && _jsx("div", {
       className: "pro-edit-label-tip",
-      children: _jsxs(_Space, {
+      children: _jsxs(Space, {
         align: "start",
         children: [_jsx(InfoCircleOutlined, {}), primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip]
       })

package/es/ProEditLabel/index.js

@@ -1,21 +1,15 @@
-import "antd/es/popconfirm/style";
-import _Popconfirm from "antd/es/popconfirm";
-import "antd/es/input/style";
-import _Input from "antd/es/input";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-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";
 import _omit from "lodash/omit";
 var _excluded = ["open", "disabled", "onOpenChange", "onFinish", "onConfirm", "trigger", "mode", "className", "size", "popupProps", "style", "viewEmpty", "children", "form"];
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 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';
@@ -54,10 +48,10 @@ var ProEditLabel = function 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);
@@ -134,54 +128,53 @@ var ProEditLabel = function ProEditLabel(_ref) {
    * pop确认回调
    */
   var onConfirmHandle = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var res, value;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+      var res, value, _t, _t2, _t3;
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.p = _context.n) {
           case 0:
-            _context.next = 2;
+            _context.n = 1;
             return form.validateFields();
-          case 2:
-            res = _context.sent;
+          case 1:
+            res = _context.v;
             // 兼容老写法
             if (!popupProps.columns) {
               value = res[(popupProps === null || popupProps === void 0 ? void 0 : popupProps.type) || 'Input'];
             }
             value = res;
-            _context.prev = 5;
-            _context.t0 = onFinish;
-            if (!_context.t0) {
-              _context.next = 10;
+            _context.p = 2;
+            _t = onFinish;
+            if (!_t) {
+              _context.n = 3;
               break;
             }
-            _context.next = 10;
+            _context.n = 3;
             return onFinish(value);
-          case 10:
-            _context.t1 = onConfirm;
-            if (!_context.t1) {
-              _context.next = 14;
+          case 3:
+            _t2 = onConfirm;
+            if (!_t2) {
+              _context.n = 4;
               break;
             }
-            _context.next = 14;
+            _context.n = 4;
             return onConfirm(value);
-          case 14:
-            _context.next = 16;
+          case 4:
+            _context.n = 5;
             return setState({
               confirmValue: value,
               popValue: value
             });
-          case 16:
-            _context.next = 21;
+          case 5:
+            _context.n = 7;
             break;
-          case 18:
-            _context.prev = 18;
-            _context.t2 = _context["catch"](5);
-            return _context.abrupt("return", Promise.reject());
-          case 21:
-          case "end":
-            return _context.stop();
+          case 6:
+            _context.p = 6;
+            _t3 = _context.v;
+            return _context.a(2, Promise.reject());
+          case 7:
+            return _context.a(2);
         }
-      }, _callee, null, [[5, 18]]);
+      }, _callee, null, [[2, 6]]);
     }));
     return function onConfirmHandle() {
       return _ref2.apply(this, arguments);
@@ -209,7 +202,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
     var TextNode = _jsx("div", {
       className: cls,
       style: style,
-      children: _jsxs(_Space, {
+      children: _jsxs(Space, {
         align: "start",
         children: [mode === 'current' ? props.value : _jsx(RenderProForm, _objectSpread({
           value: confirmValue,
@@ -232,7 +225,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
     // 当前页编辑模式
     if (mode === 'current') {
       if (status) {
-        return _jsx(_Input, _objectSpread(_objectSpread({
+        return _jsx(Input, _objectSpread(_objectSpread({
           ref: inputRef,
           size: size,
           onBlur: function onBlur(e) {
@@ -258,10 +251,12 @@ var ProEditLabel = function ProEditLabel(_ref) {
         }
         return TextNode;
       };
-      return _jsx(_Popconfirm, _objectSpread(_objectSpread({
-        overlayClassName: "pro-edit-label-popconfirm",
+      return _jsx(Popconfirm, _objectSpread(_objectSpread({
+        classNames: {
+          root: 'pro-edit-label-popconfirm'
+        },
         icon: null,
-        destroyTooltipOnHide: true,
+        destroyOnHidden: true,
         title: _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,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'; */
 
 .pro-edit-label {
   display: inline-block;
@@ -69,12 +69,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,13 +1,10 @@
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import "antd/es/popconfirm/style";
-import _Popconfirm from "antd/es/popconfirm";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _omit from "lodash/omit";
 import _isFunction from "lodash/isFunction";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
+import { Button, Popconfirm } from 'antd';
 import { iconMap } from '../../utils/config';
 import locale from '../../../locale';
 // 渲染操作按钮
@@ -101,7 +98,7 @@ var ActionButton = function 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) ? _jsx(_Fragment, {
     children: ['delete', 'mulDelete'].includes(btnConfig.type) ? _jsx(_Fragment, {
-      children: (btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.needConfirm) ? _jsx(_Popconfirm, {
+      children: (btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.needConfirm) ? _jsx(Popconfirm, {
         placement: "topRight",
         title: deleteMsgMap[btnConfig.type],
         onConfirm: function onConfirm() {
@@ -121,7 +118,7 @@ var ActionButton = function ActionButton(_ref) {
           record: record,
           index: index,
           disabled: isDisabled
-        }))) : _jsx(_Button, _objectSpread(_objectSpread({}, _omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        }))) : _jsx(Button, _objectSpread(_objectSpread({}, _omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           children: btnConfig.label
@@ -141,7 +138,7 @@ var ActionButton = function ActionButton(_ref) {
               selectedRows: selectedRows
             });
           }
-        }))) : _jsx(_Button, _objectSpread(_objectSpread({}, _omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        }))) : _jsx(Button, _objectSpread(_objectSpread({}, _omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: function onClick() {
@@ -161,7 +158,7 @@ var ActionButton = function ActionButton(_ref) {
       children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, _omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         record: record,
         index: index
-      }))) : _jsx(_Button, _objectSpread(_objectSpread({
+      }))) : _jsx(Button, _objectSpread(_objectSpread({
         className: "action-button"
       }, _omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         type: "link",

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

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