@zat-design/sisyphus-react 4.1.1 → 4.1.2-beta.10

package/es/ProDrawerForm/components/ProDrawer/index.js

@@ -65,6 +65,8 @@ var ProDrawer = _ref => {
   var _ref3 = drawerProps || {},
     drawerMask = _ref3.mask,
     restDrawerProps = _objectWithoutProperties(_ref3, _excluded);
+  var drawerWidth = width;
+  var drawerSize = restDrawerProps === null || restDrawerProps === void 0 ? void 0 : restDrawerProps.size;
 
   // 使用 useEffect 在 open 变更时延迟捕获 初始DOM 快照
   useEffect(() => {
@@ -241,7 +243,8 @@ var ProDrawer = _ref => {
     return defaultFooter;
   };
   return /*#__PURE__*/_jsxs(Drawer, _objectSpread(_objectSpread({
-    size: parseInt(String(width), 10) || 960,
+    width: drawerWidth,
+    size: drawerSize,
     open: open,
     mask: drawerMask !== null && drawerMask !== void 0 ? drawerMask : {
       blur: false
@@ -252,7 +255,7 @@ var ProDrawer = _ref => {
     closable: false,
     onClose: onCancel,
     zIndex: zIndex
-  }, omit(restDrawerProps, 'width')), {}, {
+  }, omit(restDrawerProps, 'width', 'size')), {}, {
     children: [/*#__PURE__*/_jsx("div", {
       className: "pro-drawer-close",
       onClick: onConfirm,

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

@@ -14,7 +14,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { memo, useCallback } from 'react';
 import { Badge, Table } from 'antd';
-import { isFunction, isNumber } from 'lodash';
+import { isFunction } from 'lodash';
 import useEditTableError from "../../utils/useEditTableError";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -51,23 +51,19 @@ 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) return null;
+    var result = {};
+
+    // 处理 x 轴
+    if (scroll.x !== undefined) {
+      result.x = scroll.x;
     }
-    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
-      };
+
+    // 处理 y 轴：支持数字和字符串（如 calc 表达式）
+    if (scroll.y !== undefined) {
+      result.y = scroll.y;
     }
-    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;
+    return Object.keys(result).length > 0 ? result : null;
   }, [scroll]);
   var nextTableProps = _objectSpread(_objectSpread({
     className,

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

@@ -10,7 +10,6 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 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 dragSvg from "../../../assets/drag.svg";
@@ -18,6 +17,7 @@ import ProIcon from "../../../ProIcon";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var Row = props => {
+  var _restProps$className;
   var disabled = props.disabled,
     children = props.children,
     restProps = _objectWithoutProperties(props, _excluded);
@@ -40,13 +40,17 @@ var Row = props => {
     position: 'relative',
     zIndex: 2
   } : {});
+
+  // 检查是否是空状态占位行
+  var isPlaceholderRow = (_restProps$className = restProps.className) === null || _restProps$className === void 0 ? void 0 : _restProps$className.includes('ant-table-placeholder');
   return /*#__PURE__*/_jsx("tr", _objectSpread(_objectSpread(_objectSpread({}, restProps), {}, {
     ref: setNodeRef,
     style: style
   }, attributes), {}, {
     children: React.Children.map(children, (child, index) => {
       // 在第一列（通常是rowSelection列）显示拖拽图标
-      if (index === 0 && !disabled) {
+      // 如果是占位行，不添加拖拽包装器
+      if (index === 0 && !disabled && !isPlaceholderRow) {
         var _restProps$dataRowD;
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,
@@ -137,23 +141,19 @@ var DraggableTable = _ref3 => {
     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) return null;
+    var result = {};
+
+    // 处理 x 轴
+    if (scroll.x !== undefined) {
+      result.x = scroll.x;
     }
-    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
-      };
+
+    // 处理 y 轴：支持数字和字符串（如 calc 表达式）
+    if (scroll.y !== undefined) {
+      result.y = scroll.y;
     }
-    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;
+    return Object.keys(result).length > 0 ? result : null;
   }, [scroll]);
   var nextTableProps = _objectSpread(_objectSpread({
     className,