@zat-design/sisyphus-react 4.4.1-beta.1 → 4.4.1-beta.3

package/es/ProTable/utils/index.js

@@ -1,10 +1,44 @@
+import _isFunction from "lodash/isFunction";
 import _isEqual from "lodash/isEqual";
+import _isBoolean from "lodash/isBoolean";
 import _get from "lodash/get";
 import { validate } from '@zat-design/utils';
 const {
   isEmpty
 } = validate;
 
+/**
+ * 列可见性过滤：hidden 优先（antd 5.13+ 原生），show 兼容（已废弃）
+ * - hidden 为布尔值 → 直接按 hidden 决定
+ * - hidden 缺省、show 为布尔值 → 按 show 决定
+ * - hidden 缺省、show 为函数 → 调用 show() 决定
+ * - 都缺省 → 显示
+ *
+ * 返回过滤后的列与 deprecated show 使用情况，由调用方决定告警时机/去重。
+ */
+export const filterVisibleColumns = (columns = []) => {
+  let usedShow = false;
+  const filtered = columns.filter(item => {
+    const {
+      hidden,
+      show
+    } = item;
+    if (_isBoolean(hidden)) {
+      return !hidden;
+    }
+    if (show !== undefined) {
+      usedShow = true;
+      if (_isBoolean(show)) return show;
+      if (_isFunction(show)) return show();
+    }
+    return true;
+  });
+  return {
+    columns: filtered,
+    usedShow
+  };
+};
+
 /**
  * 获取小数点后的位数
  * @param num 数字
@@ -97,25 +131,4 @@ export const removeEmptyKeys = obj => {
 /** 判断是有值的对象 */
 export const isNonEmptyObject = obj => {
   return obj !== null && typeof obj === 'object' && !Array.isArray(obj) && Object.keys(obj).length > 0;
-};
-
-/** 解析宽度值 */
-export const parseWidth = (widthValue, trWidth) => {
-  // 如果是数字，直接返回
-  if (typeof widthValue === 'number') return widthValue;
-  // 如果是字符串，检查是否是百分比
-  if (typeof widthValue === 'string') {
-    if (widthValue.endsWith('%')) {
-      // 计算百分比
-      const percentage = parseFloat(widthValue) / 100;
-      return Math.max(trWidth * percentage, 0);
-    }
-    // 尝试解析为数字（处理如'300px'这样的情况）
-    const numericValue = parseFloat(widthValue);
-    if (!Number.isNaN(numericValue)) {
-      return numericValue;
-    }
-  }
-  // 所有其他情况，返回默认值
-  return null;
 };

package/es/hooks/useDraggableRow.d.ts

@@ -0,0 +1,34 @@
+import React from 'react';
+import type { CollisionDetection, DragEndEvent, DragStartEvent } from '@dnd-kit/core';
+/**
+ * 行拖拽 hook 公共实现（薄封装）
+ * - 仅封装 dnd-kit 集成（useSortable + DndContext + SortableContext）
+ * - 业务方各自处理拖拽手柄渲染、树形/简单 arrayMove、占位行检查、rowDraggable 等差异化逻辑
+ */
+export interface UseDraggableRowStateOptions {
+    id: string;
+    disabled?: boolean;
+}
+export declare const useDraggableRowState: ({ id, disabled }: UseDraggableRowStateOptions) => {
+    setNodeRef: (node: HTMLElement) => void;
+    style: React.CSSProperties;
+    listeners: import("@dnd-kit/core/dist/hooks/utilities").SyntheticListenerMap;
+    attributes: import("@dnd-kit/core").DraggableAttributes;
+    isDragging: boolean;
+};
+export interface SortableTableContextProps {
+    /** 是否启用拖拽 */
+    draggable?: boolean;
+    /** 整体禁用（与 draggable=false 等价：不包装 DndContext） */
+    disabled?: boolean;
+    /** 排序条目 id 列表（rowKey） */
+    items: (string | number)[];
+    /** 拖拽开始回调 */
+    onDragStart?: (event: DragStartEvent) => void | Promise<void>;
+    /** 拖拽结束回调 */
+    onDragEnd?: (event: DragEndEvent) => void | Promise<void>;
+    /** 碰撞检测策略（默认 dnd-kit 内置 closestCenter） */
+    collisionDetection?: CollisionDetection;
+    children: React.ReactNode;
+}
+export declare const SortableTableContext: React.FC<SortableTableContextProps>;

package/es/hooks/useDraggableRow.js

@@ -0,0 +1,70 @@
+import React from 'react';
+import { DndContext } from '@dnd-kit/core';
+import { SortableContext, useSortable, verticalListSortingStrategy } from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
+
+/**
+ * 行拖拽 hook 公共实现（薄封装）
+ * - 仅封装 dnd-kit 集成（useSortable + DndContext + SortableContext）
+ * - 业务方各自处理拖拽手柄渲染、树形/简单 arrayMove、占位行检查、rowDraggable 等差异化逻辑
+ */
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+export const useDraggableRowState = ({
+  id,
+  disabled
+}) => {
+  const {
+    attributes,
+    listeners,
+    setNodeRef,
+    transform,
+    transition,
+    isDragging
+  } = useSortable({
+    id,
+    disabled
+  });
+  const style = {
+    transform: CSS.Transform.toString(transform && {
+      ...transform,
+      scaleY: 1
+    }),
+    transition,
+    ...(isDragging ? {
+      position: 'relative',
+      zIndex: 2
+    } : {})
+  };
+  return {
+    setNodeRef,
+    style,
+    listeners,
+    attributes,
+    isDragging
+  };
+};
+export const SortableTableContext = ({
+  draggable,
+  disabled,
+  items,
+  onDragStart,
+  onDragEnd,
+  collisionDetection,
+  children
+}) => {
+  if (!draggable || disabled) {
+    return /*#__PURE__*/_jsx(_Fragment, {
+      children: children
+    });
+  }
+  return /*#__PURE__*/_jsx(DndContext, {
+    onDragStart: onDragStart,
+    onDragEnd: onDragEnd,
+    collisionDetection: collisionDetection,
+    children: /*#__PURE__*/_jsx(SortableContext, {
+      items: items,
+      strategy: verticalListSortingStrategy,
+      children: children
+    })
+  });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.4.1-beta.1",
+  "version": "4.4.1-beta.3",
   "license": "MIT",
   "files": [
     "es",
@@ -110,14 +110,12 @@
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
-    "@rc-component/picker": "^1.9.0",
     "@zat-design/utils": "^4.0.0",
     "big.js": "^6.2.1",
     "classnames": "^2.3.1",
     "dayjs": "^1.11.13",
     "idb-keyval": "^6.2.2",
     "lodash": "^4.17.21",
-    "rc-resize-observer": "^1.4.0",
     "react-intersection-observer": "^9.13.0",
     "react-resizable": "^3.0.5",
     "react-svg": "^15.1.7"

package/es/ProForm/components/base/DatePicker/useDateLimit.d.ts

@@ -1,3 +0,0 @@
-export declare const useDateLimit: () => {
-    onCalendarChange: (val: any) => void;
-};

package/es/ProForm/components/base/DatePicker/useDateLimit.js

@@ -1,7 +0,0 @@
-import { useState } from 'react';
-export const useDateLimit = () => {
-  const [dates, setDates] = useState();
-  return {
-    onCalendarChange: val => setDates(val)
-  };
-};

package/es/ProForm/components/combination/FormList/components/BlockTitle.d.ts

@@ -1,13 +0,0 @@
-import React from 'react';
-import { NamePath } from 'antd/es/form/interface';
-import { FormInstance } from 'antd';
-import type { FormListMode, TitleType } from '../propsType';
-interface Props {
-    mode: FormListMode;
-    namePath: NamePath;
-    index: number;
-    form: FormInstance;
-    title: TitleType;
-}
-declare const BlockTitle: React.FC<Props>;
-export default BlockTitle;

package/es/ProForm/components/combination/FormList/components/BlockTitle.js

@@ -1,31 +0,0 @@
-import _isFunction from "lodash/isFunction";
-import React from 'react';
-import { jsx as _jsx } from "react/jsx-runtime";
-const BlockTitle = props => {
-  const {
-    mode,
-    namePath,
-    index,
-    form,
-    title
-  } = props;
-  if (mode !== 'block') {
-    return null;
-  }
-  if (!title) {
-    return /*#__PURE__*/_jsx("div", {});
-  }
-  if ( /*#__PURE__*/React.isValidElement(title)) {
-    return title;
-  }
-  let titleContent = title;
-  if (_isFunction(title)) {
-    const record = form.getFieldValue(namePath);
-    titleContent = title(record, index, form);
-  }
-  return /*#__PURE__*/_jsx("div", {
-    className: "pro-form-list-block-title",
-    children: titleContent
-  });
-};
-export default BlockTitle;