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

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

@@ -6,11 +6,11 @@ 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 _isNumber2 = _interopRequireDefault(require("lodash/isNumber"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _core = require("@dnd-kit/core");
 var _sortable = require("@dnd-kit/sortable");
@@ -118,7 +118,8 @@ var DraggableTable = function 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,
@@ -141,6 +142,64 @@ var DraggableTable = function DraggableTable(_ref3) {
     onDrag = draggableProps.onDrag,
     draggable = draggableProps.draggable,
     onDragEnd = draggableProps.onDragEnd;
+  var getScroll = (0, _react.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) && !(0, _isNumber2.default)(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 = (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    className: className,
+    columns: columns,
+    rowClassName: rowClassName,
+    rowSelection: renderRowSelection(),
+    components: {
+      body: {
+        row: Row
+      }
+    },
+    onRow: function onRow() {
+      return {
+        disabled: disabled || virtualKey && !!editingKeys.length,
+        'data-hide': isHideCheckBox,
+        'data-row-draggable': rowDraggable,
+        onClick: function onClick() {}
+      };
+    },
+    dataSource: (value === null || value === void 0 ? void 0 : (_value$2 = value[0]) === null || _value$2 === void 0 ? 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: 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
+        });
+      },
+      onChange: handlePageChange
+    }, pagination) : false,
+    scroll: getScroll(),
+    summary: summary
+  });
   return (0, _jsxRuntime.jsxs)(DndWrapper, {
     value: value,
     onChange: onChange,
@@ -151,49 +210,9 @@ var DraggableTable = function DraggableTable(_ref3) {
     children: [headerRender ? (0, _jsxRuntime.jsx)("div", {
       className: "pro-edit-table-header",
       children: typeof headerRender === 'function' ? headerRender() : headerRender
-    }) : null, (0, _jsxRuntime.jsx)(_table.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      ref: tableRef,
-      className: className,
-      dataSource: (value === null || value === void 0 ? void 0 : (_value$2 = value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.rowKey) ? value : undefined,
-      columns: columns,
-      rowSelection: renderRowSelection(),
-      rowClassName: rowClassName,
-      components: {
-        body: {
-          row: Row
-        }
-      },
-      onRow: function onRow() {
-        return {
-          disabled: disabled || virtualKey && !!editingKeys.length,
-          'data-hide': isHideCheckBox,
-          'data-row-draggable': rowDraggable,
-          onClick: function 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: 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
-          });
-        },
-        onChange: handlePageChange
-      }, pagination) : 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
-    }))]
+    }) : null, (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,16 +6,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-require("antd/es/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _get2 = _interopRequireDefault(require("lodash/get"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
@@ -188,33 +185,33 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     'pro-form-item-add': isAdd
   });
   var open = tipOpenCalc();
-  return (0, _jsxRuntime.jsx)(_tooltip.default, {
+  return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
     open: open,
     getPopupContainer: function getPopupContainer(trigger) {
       return scrollFollowParent ? trigger.parentElement : document.body;
     },
-    overlayClassName: classNames,
+    classNames: {
+      root: classNames
+    },
     placement: "topLeft",
     autoAdjustOverflow: false,
-    title: (0, _jsxRuntime.jsxs)(_space.default, {
+    title: (0, _jsxRuntime.jsxs)(_antd.Space, {
       direction: "vertical",
       className: "changed-tooltip",
-      children: [(0, _jsxRuntime.jsxs)(_space.default, {
+      children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "start",
         className: "original-value-container",
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-      }), _showEllipse && (0, _jsxRuntime.jsxs)(_space.default, {
+      }), _showEllipse && (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, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
-          isView: true,
-          scrollFollowParent: scrollFollowParent
+          isView: true
         })) : undefined]
       })]
     }),
     children: (0, _jsxRuntime.jsx)("div", {
       className: diffClassName,
       children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
-        scrollFollowParent: scrollFollowParent,
         otherProps: (0, _objectSpread3.default)((0, _objectSpread3.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;