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

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

@@ -5,12 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/popconfirm/style");
-var _popconfirm = _interopRequireDefault(require("antd/es/popconfirm"));
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = _interopRequireDefault(require("react"));
+var _antd = require("antd");
 var _lodash = require("lodash");
 var _config = require("../../utils/config");
 var _locale = _interopRequireDefault(require("../../../locale"));
@@ -113,7 +110,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__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: ['delete', 'mulDelete'].includes(btnConfig.type) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: btnConfig !== null && btnConfig !== void 0 && btnConfig.needConfirm ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_popconfirm.default, {
+      children: btnConfig !== null && btnConfig !== void 0 && btnConfig.needConfirm ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popconfirm, {
         placement: "topRight",
         title: deleteMsgMap[btnConfig.type],
         onConfirm: () => {
@@ -133,7 +130,7 @@ var ActionButton = _ref => {
           record,
           index,
           disabled: isDisabled
-        }))) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        }))) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           children: btnConfig.label
@@ -153,7 +150,7 @@ var ActionButton = _ref => {
               selectedRows
             });
           }
-        }))) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        }))) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: () => {
@@ -173,7 +170,7 @@ var ActionButton = _ref => {
       children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         record,
         index
-      }))) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      }))) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         className: "action-button"
       }, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         type: "link",

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

@@ -5,14 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/table/style");
-var _table = _interopRequireDefault(require("antd/es/table"));
-require("antd/es/badge/style");
-var _badge = _interopRequireDefault(require("antd/es/badge"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = require("react");
+var _antd = require("antd");
+var _lodash = require("lodash");
 var _useEditTableError3 = _interopRequireDefault(require("../../utils/useEditTableError"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["tableProps"];
@@ -20,7 +18,8 @@ var BaseTable = _ref => {
   var _value$;
   var tableProps = _ref.tableProps,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var value = tableProps.value,
+  var rowKey = tableProps.rowKey,
+    value = tableProps.value,
     headerRender = tableProps.headerRender,
     tableRef = tableProps.tableRef,
     className = tableProps.className,
@@ -46,56 +45,74 @@ var BaseTable = _ref => {
     }),
     _useEditTableError2 = (0, _slicedToArray2.default)(_useEditTableError, 1),
     errorLength = _useEditTableError2[0];
+  var getScroll = (0, _react.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 && !(0, _lodash.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 = (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    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 ? (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      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__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "pro-edit-table-pagination-item-badge",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Badge, {
+            count: errorLength
+          }), originalElement]
+        }) : originalElement;
+      },
+      onChange: handlePageChange
+    }, pagination), {}, {
+      current: page.pageNum,
+      pageSize: page.pageSize
+    }) : false,
+    scroll: getScroll()
+  });
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [headerRender ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "pro-edit-table-header",
-      children: typeof headerRender === 'function' ? headerRender() : headerRender
-    }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_table.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      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 ? (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        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__*/(0, _jsxRuntime.jsxs)("div", {
-            className: "pro-edit-table-pagination-item-badge",
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_badge.default, {
-              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: (0, _lodash.isFunction)(headerRender) ? headerRender() : headerRender
+    }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)({
+      ref: tableRef
+    }, nextTableProps))]
   });
 };
 var _default = exports.default = /*#__PURE__*/(0, _react.memo)(BaseTable);

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

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/table/style");
-var _table = _interopRequireDefault(require("antd/es/table"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _core = require("@dnd-kit/core");
+var _lodash = require("lodash");
 var _sortable = require("@dnd-kit/sortable");
 var _utilities = require("@dnd-kit/utilities");
 var _ProIcon = _interopRequireDefault(require("../../../ProIcon"));
@@ -45,8 +45,9 @@ var Row = props => {
     ref: setNodeRef,
     style: style
   }, attributes), {}, {
-    children: _react.default.Children.map(children, child => {
-      if (child.key === 'RC_TABLE_KEY' && !disabled) {
+    children: _react.default.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,
@@ -55,7 +56,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.default.cloneElement(child, {
           children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
-            className: `drag-wrapper${props['data-hide'] ? ' no-check' : ''}`,
+            className: `pro-edit-table-drag-wrapper${props['data-hide'] ? ' no-check' : ''}`,
             children: [isDrag ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProIcon.default, (0, _objectSpread2.default)({
               className: "drag-icon",
               style: {
@@ -67,7 +68,8 @@ var Row = props => {
             }, listeners)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProIcon.default, {
               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;
@@ -112,7 +114,8 @@ var DraggableTable = _ref3 => {
   var tableProps = _ref3.tableProps,
     draggableProps = _ref3.draggableProps,
     resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
-  var value = tableProps.value,
+  var rowKey = tableProps.rowKey,
+    value = tableProps.value,
     headerRender = tableProps.headerRender,
     tableRef = tableProps.tableRef,
     className = tableProps.className,
@@ -135,6 +138,62 @@ var DraggableTable = _ref3 => {
     onDrag = draggableProps.onDrag,
     draggable = draggableProps.draggable,
     onDragEnd = draggableProps.onDragEnd;
+  var getScroll = (0, _react.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 && !(0, _lodash.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 = (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    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 ? (0, _objectSpread2.default)({
+      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__*/(0, _jsxRuntime.jsxs)(DndWrapper, {
     value: value,
     onChange: onChange,
@@ -145,47 +204,9 @@ var DraggableTable = _ref3 => {
     children: [headerRender ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "pro-edit-table-header",
       children: typeof headerRender === 'function' ? headerRender() : headerRender
-    }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_table.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      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 ? (0, _objectSpread2.default)({
-        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__*/(0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)({
+      ref: tableRef
+    }, nextTableProps))]
   });
 };
 var _default = exports.default = /*#__PURE__*/(0, _react.memo)(DraggableTable);

package/lib/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/lib/ProEditTable/components/RcTable/index.js

@@ -16,12 +16,5 @@ Object.defineProperty(exports, "DraggableTable", {
     return _DraggableTable.default;
   }
 });
-Object.defineProperty(exports, "VirtualTable", {
-  enumerable: true,
-  get: function get() {
-    return _VirtualTable.default;
-  }
-});
 var _BaseTable = _interopRequireDefault(require("./BaseTable"));
-var _DraggableTable = _interopRequireDefault(require("./DraggableTable"));
-var _VirtualTable = _interopRequireDefault(require("./VirtualTable"));
+var _DraggableTable = _interopRequireDefault(require("./DraggableTable"));

package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -6,13 +6,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
 var _diffOriginal = require("../../utils/diffOriginal");
@@ -202,31 +199,31 @@ var ListChangedWrapper = props => {
     'pro-form-item-add': isAdd
   });
   var open = tipOpenCalc();
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
     open: open,
     getPopupContainer: trigger => scrollFollowParent ? trigger.parentElement : document.body,
-    overlayClassName: classNames,
+    classNames: {
+      root: classNames
+    },
     placement: "topLeft",
     autoAdjustOverflow: false,
-    title: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+    title: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
       direction: "vertical",
       className: "changed-tooltip",
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "start",
         className: "original-value-container",
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-      }), _showEllipse && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      }), _showEllipse && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest), {}, {
-          isView: true,
-          scrollFollowParent
+          isView: true
         })) : undefined]
       })]
     }),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: diffClassName,
       children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest), {}, {
-        scrollFollowParent,
         otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
           isDiffChange: isChanged
         })

package/lib/ProEditTable/components/RenderField/index.d.ts

@@ -1,2 +1,3 @@
-declare const RenderField: ({ text: value, record, index, column, config }: any) => import("react/jsx-runtime").JSX.Element;
-export default RenderField;
+import React from 'react';
+declare const _default: React.MemoExoticComponent<({ text: value, record, index, column, config }: any) => import("react/jsx-runtime").JSX.Element>;
+export default _default;