@zat-design/sisyphus-react 4.5.10-beta.1 → 4.5.10-beta.2

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

@@ -1,84 +1,56 @@
-import { Table } from 'antd';
-import React, { memo, useCallback } from 'react';
-import { arrayMove } from '@dnd-kit/sortable';
+import { jsx, jsxs } from "react/jsx-runtime";
+import { Table } from "antd";
+import React, { memo, useCallback } from "react";
+import { arrayMove } from "@dnd-kit/sortable";
 import dragSvg from "../../../assets/drag.svg";
 import ProIcon from "../../../ProIcon";
 import { SortableTableContext, useDraggableRowState } from "../../../hooks/useDraggableRow";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const Row = props => {
-  const {
-    disabled,
-    children,
-    ...restProps
-  } = props;
-  const {
-    setNodeRef,
-    style,
-    listeners,
-    attributes
-  } = useDraggableRowState({
-    id: props['data-row-key'],
+const Row = (props) => {
+  var _a;
+  const { disabled, children, ...restProps } = props;
+  const { setNodeRef, style, listeners, attributes } = useDraggableRowState({
+    id: props["data-row-key"],
     disabled
   });
-
-  // 检查是否是空状态占位行
-  const isPlaceholderRow = restProps.className?.includes('ant-table-placeholder');
-  return /*#__PURE__*/_jsx("tr", {
-    ...restProps,
-    ref: setNodeRef,
-    style: {
-      ...props.style,
-      ...style
-    },
-    ...attributes,
-    children: React.Children.map(children, (child, index) => {
-      // 在第一列（通常是rowSelection列）显示拖拽图标
-      // 如果是占位行，不添加拖拽包装器
-      if (index === 0 && !disabled && !isPlaceholderRow) {
-        const {
-          render,
-          record,
-          renderIndex
-        } = child?.props || {};
-        const isDrag = restProps['data-row-draggable'] ? restProps['data-row-draggable']?.(record) : true;
-        return /*#__PURE__*/React.cloneElement(child, {
-          children: /*#__PURE__*/_jsxs("span", {
-            className: `pro-edit-table-drag-wrapper${props['data-hide'] ? ' no-check' : ''}`,
-            children: [isDrag ? /*#__PURE__*/_jsx(ProIcon, {
-              component: dragSvg,
-              size: 20,
-              color: "#949599",
-              style: {
-                touchAction: 'none',
-                cursor: disabled ? 'no-drop' : 'move'
-              },
-              ...listeners
-            }) : null, props['data-hide'] ? null : render?.(null, record, renderIndex)]
-          }),
-          className: 'pro-edit-table-drag-wrapper-cell'
-        });
-      }
-      return child;
-    })
-  });
+  const isPlaceholderRow = (_a = restProps.className) == null ? void 0 : _a.includes("ant-table-placeholder");
+  return /* @__PURE__ */ jsx("tr", { ...restProps, ref: setNodeRef, style: { ...props.style, ...style }, ...attributes, children: React.Children.map(children, (child, index) => {
+    var _a2;
+    if (index === 0 && !disabled && !isPlaceholderRow) {
+      const { render, record, renderIndex } = (child == null ? void 0 : child.props) || {};
+      const isDrag = restProps["data-row-draggable"] ? (_a2 = restProps["data-row-draggable"]) == null ? void 0 : _a2.call(restProps, record) : true;
+      return React.cloneElement(child, {
+        children: /* @__PURE__ */ jsxs(
+          "span",
+          {
+            className: `pro-edit-table-drag-wrapper${props["data-hide"] ? " no-check" : ""}`,
+            children: [
+              isDrag ? /* @__PURE__ */ jsx(
+                ProIcon,
+                {
+                  component: dragSvg,
+                  size: 20,
+                  color: "#949599",
+                  style: { touchAction: "none", cursor: disabled ? "no-drop" : "move" },
+                  ...listeners
+                }
+              ) : null,
+              props["data-hide"] ? null : render == null ? void 0 : render(null, record, renderIndex)
+            ]
+          }
+        ),
+        className: "pro-edit-table-drag-wrapper-cell"
+      });
+    }
+    return child;
+  }) });
 };
-const DndWrapper = ({
-  draggable,
-  value,
-  onChange,
-  onDrag,
-  onDragEnd,
-  disabled,
-  children
-}) => {
-  const onDragEndtInside = event => {
-    const {
-      active,
-      over
-    } = event;
-    if (active.id !== over?.id) {
-      const activeIndex = value.findIndex(i => i.rowKey === active.id);
-      const overIndex = value.findIndex(i => i.rowKey === over?.id);
+const DndWrapper = ({ draggable, value, onChange, onDrag, onDragEnd, disabled, children }) => {
+  var _a;
+  const onDragEndtInside = (event) => {
+    const { active, over } = event;
+    if (active.id !== (over == null ? void 0 : over.id)) {
+      const activeIndex = value.findIndex((i) => i.rowKey === active.id);
+      const overIndex = value.findIndex((i) => i.rowKey === (over == null ? void 0 : over.id));
       const nextValue = arrayMove(value, activeIndex, overIndex);
       if (onDrag || onDragEnd) {
         const nextList = onDragEnd ? onDragEnd(event, value, nextValue) : onDrag(event, value, nextValue);
@@ -88,19 +60,19 @@ const DndWrapper = ({
       onChange(nextValue);
     }
   };
-  return /*#__PURE__*/_jsx(SortableTableContext, {
-    draggable: draggable,
-    disabled: disabled,
-    items: value?.[0]?.rowKey ? value.map(i => i.rowKey) : [],
-    onDragEnd: onDragEndtInside,
-    children: children
-  });
+  return /* @__PURE__ */ jsx(
+    SortableTableContext,
+    {
+      draggable,
+      disabled,
+      items: ((_a = value == null ? void 0 : value[0]) == null ? void 0 : _a.rowKey) ? value.map((i) => i.rowKey) : [],
+      onDragEnd: onDragEndtInside,
+      children
+    }
+  );
 };
-const DraggableTable = ({
-  tableProps,
-  draggableProps,
-  ...resetProps
-}) => {
+const DraggableTable = ({ tableProps, draggableProps, ...resetProps }) => {
+  var _a;
   const {
     rowKey,
     tableRowKey,
@@ -124,23 +96,15 @@ const DraggableTable = ({
     locale,
     handlePageChange
   } = tableProps;
-  const {
-    onChange,
-    onDrag,
-    draggable,
-    onDragEnd
-  } = draggableProps;
+  const { onChange, onDrag, draggable, onDragEnd } = draggableProps;
   const getScroll = useCallback(() => {
-    if (!scroll) return null;
+    if (!scroll)
+      return null;
     const result = {};
-
-    // 处理 x 轴
-    if (scroll.x !== undefined) {
+    if (scroll.x !== void 0) {
       result.x = scroll.x;
     }
-
-    // 处理 y 轴：支持数字和字符串（如 calc 表达式）
-    if (scroll.y !== undefined) {
+    if (scroll.y !== void 0) {
       result.y = scroll.y;
     }
     return Object.keys(result).length > 0 ? result : null;
@@ -157,45 +121,49 @@ const DraggableTable = ({
     },
     onRow: () => ({
       disabled: disabled || virtualKey && !!editingKeys.length,
-      'data-hide': isHideCheckBox,
-      'data-row-draggable': rowDraggable,
-      onClick: () => {}
+      "data-hide": isHideCheckBox,
+      "data-row-draggable": rowDraggable,
+      onClick: () => {
+      }
     }),
-    dataSource: value?.[0]?.rowKey ? value : [],
+    dataSource: ((_a = value == null ? void 0 : value[0]) == null ? void 0 : _a.rowKey) ? value : [],
     ...resetProps,
     rowKey: tableRowKey,
     pagination: pagination ? {
       showSizeChanger: false,
       showQuickJumper: true,
-      total: value?.length,
-      showTotal: total => {
-        if (!total) return;
-        return formatMessage(locale?.ProEditTable?.total, {
-          total
-        });
+      total: value == null ? void 0 : value.length,
+      showTotal: (total) => {
+        var _a2;
+        if (!total)
+          return;
+        return formatMessage((_a2 = locale == null ? void 0 : locale.ProEditTable) == null ? void 0 : _a2.total, { total });
       },
-      ...(typeof pagination === 'object' ? pagination : {}),
-      current: (typeof pagination === 'object' ? pagination.current : undefined) ?? page.pageNum,
-      pageSize: (typeof pagination === 'object' ? pagination.pageSize : undefined) ?? page.pageSize,
+      ...typeof pagination === "object" ? pagination : {},
+      current: (typeof pagination === "object" ? pagination.current : void 0) ?? page.pageNum,
+      pageSize: (typeof pagination === "object" ? pagination.pageSize : void 0) ?? page.pageSize,
       onChange: handlePageChange
     } : false,
     scroll: getScroll(),
     summary
   };
-  return /*#__PURE__*/_jsxs(DndWrapper, {
-    value: value,
-    onChange: onChange,
-    onDrag: onDrag,
-    onDragEnd: onDragEnd,
-    disabled: disabled,
-    draggable: draggable,
-    children: [headerRender ? /*#__PURE__*/_jsx("div", {
-      className: "pro-edit-table-header",
-      children: typeof headerRender === 'function' ? headerRender() : headerRender
-    }) : null, /*#__PURE__*/_jsx(Table, {
-      ref: tableRef,
-      ...nextTableProps
-    })]
-  });
+  return /* @__PURE__ */ jsxs(
+    DndWrapper,
+    {
+      value,
+      onChange,
+      onDrag,
+      onDragEnd,
+      disabled,
+      draggable,
+      children: [
+        headerRender ? /* @__PURE__ */ jsx("div", { className: "pro-edit-table-header", children: typeof headerRender === "function" ? headerRender() : headerRender }) : null,
+        /* @__PURE__ */ jsx(Table, { ref: tableRef, ...nextTableProps })
+      ]
+    }
+  );
+};
+var DraggableTable_default = memo(DraggableTable);
+export {
+  DraggableTable_default as default
 };
-export default /*#__PURE__*/memo(DraggableTable);

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

@@ -1,4 +1,6 @@
-/** 基础表格 */
-export { default as BaseTable } from "./BaseTable";
-/** 拖拽表格 */
-export { default as DraggableTable } from "./DraggableTable";
+import { default as default2 } from "./BaseTable";
+import { default as default3 } from "./DraggableTable";
+export {
+  default2 as BaseTable,
+  default3 as DraggableTable
+};

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

@@ -1,13 +1,14 @@
-import _omit from "lodash/omit";
-import React, { useMemo } from 'react';
-import { Space, Tooltip } from 'antd';
-import classnames from 'classnames';
+import { jsx, jsxs } from "react/jsx-runtime";
+import React, { useMemo } from "react";
+import { Space, Tooltip } from "antd";
+import classnames from "classnames";
+import omit from "lodash/omit";
 import { diffOriginal } from "../../utils/diffOriginal";
 import { useProConfig } from "../../../ProConfigProvider";
 import { isEmpty } from "../../../utils";
 import { OMIT_FROM_DOM_KEYS, toNamePath, toNamePaths, getOriginalValue } from "./tools";
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-const ListChangedWrapper = props => {
+const ListChangedWrapper = (props) => {
+  var _a, _b, _c;
   const {
     name,
     names,
@@ -22,25 +23,19 @@ const ListChangedWrapper = props => {
     type,
     normalize,
     getValueProps,
-    valuePropName = 'value',
+    valuePropName = "value",
     viewRender,
     diffConfig,
     index,
     ...rest
   } = props;
-  const {
-    isDiffAll
-  } = useProConfig('ProEditTable') || {};
-  const {
-    scrollFollowParent = true
-  } = diffConfig || {};
-
-  // children 在各使用点均经 React.isValidElement 守卫，统一以带 props 的元素类型访问，避免 @ts-ignore
+  const { isDiffAll } = useProConfig("ProEditTable") || {};
+  const { scrollFollowParent = true } = diffConfig || {};
   const childEl = children;
   const namePath = toNamePath(namesStr || name);
   const originalNamePath = toNamePath(originalName);
   const originalNamePaths = originalNames && toNamePaths(originalNames);
-  const toolTip = diffConfig?.toolTip ?? true;
+  const toolTip = (diffConfig == null ? void 0 : diffConfig.toolTip) ?? true;
   const isWatch = Boolean(originalValues);
   const originalDTO = getOriginalValue({
     namePath,
@@ -50,119 +45,106 @@ const ListChangedWrapper = props => {
     rowKeyPath,
     form
   });
-  const originalValue = isWatch ? originalDTO?.originalValue : undefined;
+  const originalValue = isWatch ? originalDTO == null ? void 0 : originalDTO.originalValue : void 0;
   const noChange = !onDiff && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
   const diffType = useMemo(() => {
-    if (!isWatch || noChange) return 'same';
-    const normalizedValue = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
-    : props[valuePropName];
-
-    // fix:修复 DatePicker时，originalValue与最新值一致时，显示为 changed的问题
-    const normalizedOriginalValue = normalize && ['DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
-
-    // fix:修复 InputNumber 时，originalValue与最新值一致都为'0'时，显示为 changed的问题
-    if (['InputNumber'].includes(props.type) && normalize && normalizedValue === Number(originalValue)) {
-      return 'same';
+    if (!isWatch || noChange)
+      return "same";
+    const normalizedValue = normalize ? normalize(props[valuePropName], void 0, void 0, true) : props[valuePropName];
+    const normalizedOriginalValue = normalize && ["DatePicker"].includes(props.type) ? normalize(originalValue, void 0, void 0, true) : originalValue;
+    if (["InputNumber"].includes(props.type) && normalize && normalizedValue === Number(originalValue)) {
+      return "same";
     }
     return diffOriginal({
       value: normalizedValue,
       originalValue: normalizedOriginalValue,
       form,
       onDiff,
-      originRecord: originalDTO?.originRecord,
-      record: originalDTO?.record,
+      originRecord: originalDTO == null ? void 0 : originalDTO.originRecord,
+      record: originalDTO == null ? void 0 : originalDTO.record,
       index,
       type: props.type
     });
   }, [props[valuePropName], originalValue]);
-  const isAdd = diffType === 'add';
-  const isChanged = diffType === 'changed';
+  const isAdd = diffType === "add";
+  const isChanged = diffType === "changed";
   const tipContent = useMemo(() => {
-    if (!isWatch || noChange) return undefined;
-    const orgValue = getValueProps ? getValueProps(originalValue, true)?.[valuePropName] : originalValue;
-
-    // viewRender 为函数时直接返回其结果；为 Element 时落到下方 children 克隆逻辑
-    if (viewRender && ! /*#__PURE__*/React.isValidElement(viewRender)) {
-      return viewRender(orgValue, originalDTO?.originRecord || {}, {
-        form,
-        name,
-        index
-      });
+    var _a2;
+    if (!isWatch || noChange)
+      return void 0;
+    const orgValue = getValueProps ? (_a2 = getValueProps(originalValue, true)) == null ? void 0 : _a2[valuePropName] : originalValue;
+    if (viewRender && !React.isValidElement(viewRender)) {
+      return viewRender(orgValue, (originalDTO == null ? void 0 : originalDTO.originRecord) || {}, { form, name, index });
     }
-
-    // 对于ProNumberRange类型，需要将字符串数组转换为数字数组
     let processedValue = orgValue;
-    if (type === 'ProNumberRange' && Array.isArray(orgValue)) {
-      processedValue = orgValue.map(item => {
+    if (type === "ProNumberRange" && Array.isArray(orgValue)) {
+      processedValue = orgValue.map((item) => {
         const num = Number(item);
         return Number.isNaN(num) ? item : num;
       });
     }
-    return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(childEl, {
+    return React.isValidElement(children) ? React.cloneElement(childEl, {
       ...childEl,
       isView: true,
       [valuePropName]: processedValue,
-      checked: type === 'Switch' ? originalValue : undefined
-    }) : undefined;
+      checked: type === "Switch" ? originalValue : void 0
+    }) : void 0;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
-    const filteredRest = _omit(rest, OMIT_FROM_DOM_KEYS);
-    return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(childEl, {
-      ...childEl.props,
-      ...filteredRest
-    });
+    const filteredRest = omit(rest, OMIT_FROM_DOM_KEYS);
+    return React.isValidElement(children) && React.cloneElement(childEl, { ...childEl.props, ...filteredRest });
   }
   const tipOpenCalc = () => {
-    if (!toolTip) return false;
-
-    // 传入undefined 鼠标移入显示移出隐藏
-    return isChanged ? undefined : false;
+    if (!toolTip)
+      return false;
+    return isChanged ? void 0 : false;
   };
-  const showEllipse = childEl.props?.showEllipse || childEl.props?.tooltip;
+  const showEllipse = ((_a = childEl.props) == null ? void 0 : _a.showEllipse) || ((_b = childEl.props) == null ? void 0 : _b.tooltip);
   const classNames = classnames({
-    'original-value-tooltip': true,
-    'original-value-tooltip-fixed': true
+    "original-value-tooltip": true,
+    "original-value-tooltip-fixed": true
   });
   const diffClassName = classnames({
-    'pro-form-item-changed': isChanged,
-    'pro-form-item-add': isAdd
+    "pro-form-item-changed": isChanged,
+    "pro-form-item-add": isAdd
   });
   const open = tipOpenCalc();
-  return /*#__PURE__*/_jsx(Tooltip, {
-    open: open,
-    getPopupContainer: trigger => scrollFollowParent ? trigger.parentElement : document.body,
-    classNames: {
-      root: classNames
-    },
-    placement: "topLeft",
-    autoAdjustOverflow: false,
-    title: /*#__PURE__*/_jsxs(Space, {
-      orientation: "vertical",
-      className: "changed-tooltip",
-      children: [/*#__PURE__*/_jsxs(Space, {
-        align: "start",
-        className: "original-value-container",
-        children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-      }), showEllipse && /*#__PURE__*/_jsxs(Space, {
-        className: "current-value-container",
-        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(childEl, {
-          ...childEl.props,
-          ..._omit(rest, OMIT_FROM_DOM_KEYS),
-          isView: true
-        }) : undefined]
-      })]
-    }),
-    children: /*#__PURE__*/_jsx("div", {
-      className: diffClassName,
-      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(childEl, {
+  return /* @__PURE__ */ jsx(
+    Tooltip,
+    {
+      open,
+      getPopupContainer: (trigger) => scrollFollowParent ? trigger.parentElement : document.body,
+      classNames: {
+        root: classNames
+      },
+      placement: "topLeft",
+      autoAdjustOverflow: false,
+      title: /* @__PURE__ */ jsxs(Space, { orientation: "vertical", className: "changed-tooltip", children: [
+        /* @__PURE__ */ jsxs(Space, { align: "start", className: "original-value-container", children: [
+          "初始值：",
+          tipContent
+        ] }),
+        showEllipse && /* @__PURE__ */ jsxs(Space, { className: "current-value-container", children: [
+          "当前值：",
+          React.isValidElement(children) ? React.cloneElement(childEl, {
+            ...childEl.props,
+            ...omit(rest, OMIT_FROM_DOM_KEYS),
+            isView: true
+          }) : void 0
+        ] })
+      ] }),
+      children: /* @__PURE__ */ jsx("div", { className: diffClassName, children: React.isValidElement(children) ? React.cloneElement(childEl, {
         ...childEl.props,
-        ..._omit(rest, OMIT_FROM_DOM_KEYS),
+        ...omit(rest, OMIT_FROM_DOM_KEYS),
         otherProps: {
-          ...childEl.props?.otherProps,
+          ...(_c = childEl.props) == null ? void 0 : _c.otherProps,
           isDiffChange: isChanged
         }
-      }) : undefined
-    })
-  });
+      }) : void 0 })
+    }
+  );
+};
+var ListChangedWrapper_default = ListChangedWrapper;
+export {
+  ListChangedWrapper_default as default
 };
-export default ListChangedWrapper;