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

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";
+import _isNumber from "lodash/isNumber";
 var _excluded = ["disabled", "children"],
   _excluded2 = ["tableProps", "draggableProps"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { memo } from 'react';
+import { Table } from 'antd';
+import React, { memo, useCallback } from 'react';
 import { DndContext } from '@dnd-kit/core';
 import { arrayMove, useSortable, SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
@@ -110,7 +110,8 @@ var DraggableTable = function 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,
@@ -133,6 +134,64 @@ var DraggableTable = function DraggableTable(_ref3) {
     onDrag = draggableProps.onDrag,
     draggable = draggableProps.draggable,
     onDragEnd = draggableProps.onDragEnd;
+  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,
+    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 ? _objectSpread({
+      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 _jsxs(DndWrapper, {
     value: value,
     onChange: onChange,
@@ -143,49 +202,9 @@ var DraggableTable = function DraggableTable(_ref3) {
     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$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 ? _objectSpread({
-        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, _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';

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

@@ -1,7 +1,3 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -9,6 +5,7 @@ import _get from "lodash/get";
 var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "onDiff", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
+import { Space, Tooltip } from 'antd';
 import classnames from 'classnames';
 import { diffOriginal } from '../../utils/diffOriginal';
 import { useProConfig } from '../../../ProConfigProvider';
@@ -180,33 +177,33 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     'pro-form-item-add': isAdd
   });
   var open = tipOpenCalc();
-  return _jsx(_Tooltip, {
+  return _jsx(Tooltip, {
     open: open,
     getPopupContainer: function getPopupContainer(trigger) {
       return scrollFollowParent ? trigger.parentElement : document.body;
     },
-    overlayClassName: classNames,
+    classNames: {
+      root: classNames
+    },
     placement: "topLeft",
     autoAdjustOverflow: false,
-    title: _jsxs(_Space, {
+    title: _jsxs(Space, {
       direction: "vertical",
       className: "changed-tooltip",
-      children: [_jsxs(_Space, {
+      children: [_jsxs(Space, {
         align: "start",
         className: "original-value-container",
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-      }), _showEllipse && _jsxs(_Space, {
+      }), _showEllipse && _jsxs(Space, {
         className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
-          isView: true,
-          scrollFollowParent: scrollFollowParent
+          isView: true
         })) : undefined]
       })]
     }),
     children: _jsx("div", {
       className: diffClassName,
       children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
-        scrollFollowParent: scrollFollowParent,
         otherProps: _objectSpread(_objectSpread({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
           isDiffChange: isChanged
         })

package/es/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;