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

package/es/ProTable/components/FormatColumn/propsType.js

@@ -1 +0,0 @@
-export {};

package/es/ProTable/components/RcTable/components/BaseTable/index.js

@@ -1,40 +1,36 @@
-import { Table } from 'antd';
-import { forwardRef, memo } from 'react';
+import { jsx } from "react/jsx-runtime";
+import { Table } from "antd";
+import { forwardRef, memo } from "react";
 import { RenderEmptyText, RenderSummary, TableResizable } from "../../../index";
-import { jsx as _jsx } from "react/jsx-runtime";
-const BaseTable = /*#__PURE__*/forwardRef(({
-  dataSource,
-  tableProps,
-  draggableProps,
-  summaryProps,
-  emptyTextProps,
-  ...restProps
-}, ref) => {
-  const {
-    columns,
-    renderRowSelection,
-    rowClassName,
-    resizeColumn
-  } = tableProps;
-  const renderComponents = () => {
-    if (resizeColumn) {
-      return TableResizable.components;
-    }
-    return null;
-  };
-  return /*#__PURE__*/_jsx(Table, {
-    ref: ref,
-    components: renderComponents(),
-    columns: columns,
-    locale: {
-      emptyText: RenderEmptyText(emptyTextProps)
-    },
-    summary: () => RenderSummary(summaryProps),
-    rowClassName: rowClassName,
-    ...tableProps,
-    dataSource: dataSource,
-    rowSelection: renderRowSelection(),
-    ...restProps
-  });
-});
-export default /*#__PURE__*/memo(BaseTable);
+const BaseTable = forwardRef(
+  ({ dataSource, tableProps, draggableProps, summaryProps, emptyTextProps, ...restProps }, ref) => {
+    const { columns, renderRowSelection, rowClassName, resizeColumn } = tableProps;
+    const renderComponents = () => {
+      if (resizeColumn) {
+        return TableResizable.components;
+      }
+      return null;
+    };
+    return /* @__PURE__ */ jsx(
+      Table,
+      {
+        ref,
+        components: renderComponents(),
+        columns,
+        locale: {
+          emptyText: RenderEmptyText(emptyTextProps)
+        },
+        summary: () => RenderSummary(summaryProps),
+        rowClassName,
+        ...tableProps,
+        dataSource,
+        rowSelection: renderRowSelection(),
+        ...restProps
+      }
+    );
+  }
+);
+var BaseTable_default = memo(BaseTable);
+export {
+  BaseTable_default as default
+};

package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -1,64 +1,47 @@
-import _isFunction from "lodash/isFunction";
-import React from 'react';
-import { closestCorners } from '@dnd-kit/core';
-import { arrayMove } from '@dnd-kit/sortable';
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import React from "react";
+import { closestCorners } from "@dnd-kit/core";
+import { arrayMove } from "@dnd-kit/sortable";
 import dragSvg from "../../../../../../../assets/drag.svg";
 import ProIcon from "../../../../../../../ProIcon";
-import { addLevelAndParentId, treeNodeFind, transformTreeToArray, createTreeFromArray } from "./utils/index";
-import { SortableTableContext, useDraggableRowState } from "../../../../../../../hooks/useDraggableRow";
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-export const Row = props => {
-  const {
-    disabled,
-    children,
-    ...restProps
-  } = props;
-  const {
-    setNodeRef,
-    style,
-    listeners,
-    attributes
-  } = useDraggableRowState({
-    id: props['data-row-key'],
+import isFunction from "lodash/isFunction";
+import {
+  addLevelAndParentId,
+  treeNodeFind,
+  transformTreeToArray,
+  createTreeFromArray
+} from "./utils/index";
+import {
+  SortableTableContext,
+  useDraggableRowState
+} from "../../../../../../../hooks/useDraggableRow";
+const Row = (props) => {
+  const { disabled, children, ...restProps } = props;
+  const { setNodeRef, style, listeners, attributes } = useDraggableRowState({
+    id: props["data-row-key"],
     disabled
   });
-  return /*#__PURE__*/_jsx("tr", {
-    ...restProps,
-    ref: setNodeRef,
-    style: {
-      ...props.style,
-      ...style
-    },
-    ...attributes,
-    children: React.Children.map(children, (child, index) => {
-      // 在第一列（通常是rowSelection列）显示拖拽图标
-      if (index === 0) {
-        const {
-          render,
-          record,
-          renderIndex
-        } = child?.props || {};
-        return /*#__PURE__*/React.cloneElement(child, {
-          children: /*#__PURE__*/_jsxs(_Fragment, {
-            children: [/*#__PURE__*/_jsx("span", {
-              className: `pro-table-drag-wrapper${props['data-hide'] ? ' no-check' : ''}`,
-              children: /*#__PURE__*/_jsx(ProIcon, {
-                component: dragSvg,
-                size: 20,
-                color: "#949599",
-                style: {
-                  touchAction: 'none',
-                  cursor: disabled ? 'no-drop' : 'move'
-                },
-                ...listeners
-              })
-            }), props['data-hide'] ? null : render?.(null, record, renderIndex)]
-          })
-        });
-      }
-      return child;
-    })
-  });
+  return /* @__PURE__ */ jsx("tr", { ...restProps, ref: setNodeRef, style: { ...props.style, ...style }, ...attributes, children: React.Children.map(children, (child, index) => {
+    if (index === 0) {
+      const { render, record, renderIndex } = (child == null ? void 0 : child.props) || {};
+      return React.cloneElement(child, {
+        children: /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx("span", { className: `pro-table-drag-wrapper${props["data-hide"] ? " no-check" : ""}`, children: /* @__PURE__ */ jsx(
+            ProIcon,
+            {
+              component: dragSvg,
+              size: 20,
+              color: "#949599",
+              style: { touchAction: "none", cursor: disabled ? "no-drop" : "move" },
+              ...listeners
+            }
+          ) }),
+          props["data-hide"] ? null : render == null ? void 0 : render(null, record, renderIndex)
+        ] })
+      });
+    }
+    return child;
+  }) });
 };
 const DndWrapper = ({
   draggable,
@@ -70,55 +53,40 @@ const DndWrapper = ({
   onDragStartGuard,
   onDragEndGuard
 }) => {
-  const onDragStart = async ({
-    active
-  }) => {
-    if (onDragStartGuard && _isFunction(onDragStartGuard)) {
-      // 为数据源划分层级及parentId
-      const transformedValue = addLevelAndParentId(value, rowKey);
-      const activeObject = treeNodeFind(transformedValue, t => t.rowKey === active.id);
+  var _a;
+  const onDragStart = async ({ active }) => {
+    if (onDragStartGuard && isFunction(onDragStartGuard)) {
+      const transformedValue2 = addLevelAndParentId(value, rowKey);
+      const activeObject = treeNodeFind(transformedValue2, (t) => t.rowKey === active.id);
       await onDragStartGuard({
         activeObject,
         currentDataSource: value
       });
     }
   };
-  const onDragEnd = async ({
-    active,
-    over
-  }) => {
-    // 为数据源划分层级及parentId
-    const transformedValue = addLevelAndParentId(value, rowKey);
-    // 同一level层级的且parentId相同的，可以互相之间拖拽替换
-    if (active.id !== over?.id) {
-      const activeObject = treeNodeFind(transformedValue, t => t.rowKey === active.id);
-      const overObject = treeNodeFind(transformedValue, t => t.rowKey === over?.id);
+  const onDragEnd = async ({ active, over }) => {
+    const transformedValue2 = addLevelAndParentId(value, rowKey);
+    if (active.id !== (over == null ? void 0 : over.id)) {
+      const activeObject = treeNodeFind(transformedValue2, (t) => t.rowKey === active.id);
+      const overObject = treeNodeFind(transformedValue2, (t) => t.rowKey === (over == null ? void 0 : over.id));
       if (activeObject && overObject) {
-        const {
-          level: activeLevel,
-          parentId: activeParentId
-        } = activeObject;
-        const {
-          level: overLevel,
-          parentId: overParentId
-        } = overObject;
+        const { level: activeLevel, parentId: activeParentId } = activeObject;
+        const { level: overLevel, parentId: overParentId } = overObject;
         let nextDataSource = value;
         if (activeLevel === overLevel && activeParentId === overParentId) {
-          // 将树平铺
-          const flatTree = transformTreeToArray(transformedValue).map(item => ({
+          const flatTree2 = transformTreeToArray(transformedValue2).map((item) => ({
             ...item,
-            children: undefined
+            children: void 0
           }));
-          const activeIndex = flatTree.findIndex(i => i.rowKey === active.id);
-          const overIndex = flatTree.findIndex(i => i.rowKey === over?.id);
-          const nextValue = arrayMove(flatTree, activeIndex, overIndex);
+          const activeIndex = flatTree2.findIndex((i) => i.rowKey === active.id);
+          const overIndex = flatTree2.findIndex((i) => i.rowKey === (over == null ? void 0 : over.id));
+          const nextValue = arrayMove(flatTree2, activeIndex, overIndex);
           nextDataSource = createTreeFromArray(nextValue, {
-            itemKey: 'rowKey',
-            parentKey: 'parentId',
-            childrenKey: 'children'
+            itemKey: "rowKey",
+            parentKey: "parentId",
+            childrenKey: "children"
           });
-          // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
-          if (onDragEndGuard && _isFunction(onDragEndGuard)) {
+          if (onDragEndGuard && isFunction(onDragEndGuard)) {
             nextDataSource = await onDragEndGuard({
               activeObject,
               overObject,
@@ -132,20 +100,25 @@ const DndWrapper = ({
     }
   };
   const transformedValue = addLevelAndParentId(value, rowKey);
-
-  // 将树平铺
-  const flatTree = transformTreeToArray(transformedValue).map(item => ({
+  const flatTree = transformTreeToArray(transformedValue).map((item) => ({
     ...item,
-    children: undefined
+    children: void 0
   }));
-  return /*#__PURE__*/_jsx(SortableTableContext, {
-    draggable: draggable,
-    disabled: disabled,
-    items: flatTree?.[0]?.rowKey ? flatTree.map(i => i.rowKey) : [],
-    onDragStart: onDragStart,
-    onDragEnd: onDragEnd,
-    collisionDetection: closestCorners,
-    children: children
-  });
+  return /* @__PURE__ */ jsx(
+    SortableTableContext,
+    {
+      draggable,
+      disabled,
+      items: ((_a = flatTree == null ? void 0 : flatTree[0]) == null ? void 0 : _a.rowKey) ? flatTree.map((i) => i.rowKey) : [],
+      onDragStart,
+      onDragEnd,
+      collisionDetection: closestCorners,
+      children
+    }
+  );
+};
+var DndWrapper_default = DndWrapper;
+export {
+  Row,
+  DndWrapper_default as default
 };
-export default DndWrapper;

package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index.js

@@ -1,27 +1,29 @@
-export const getRowKey = (rowKey, record) => {
-  // 默认取id
-  let key = record.rowKey || 'id';
+const getRowKey = (rowKey, record) => {
+  let key = record.rowKey || "id";
   if (rowKey) {
-    key = (typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) ?? key;
+    key = (typeof rowKey === "function" ? rowKey(record) : record[rowKey]) ?? key;
   }
   return key;
 };
-export const addLevelAndParentId = (tree, rowKey, currentLevel = 0, currentParentId = null) => {
-  return tree.map(node => {
-    const newNode = {
-      ...node
-    };
+const addLevelAndParentId = (tree, rowKey, currentLevel = 0, currentParentId = null) => {
+  return tree.map((node) => {
+    const newNode = { ...node };
     newNode.level = currentLevel;
     newNode.parentId = currentParentId;
     newNode.rowKey = getRowKey(rowKey, node);
     if (node.children) {
-      newNode.children = addLevelAndParentId(node.children, rowKey, currentLevel + 1, newNode.rowKey);
+      newNode.children = addLevelAndParentId(
+        node.children,
+        rowKey,
+        currentLevel + 1,
+        newNode.rowKey
+      );
     }
     return newNode;
   });
 };
-export function getFinalChildrenKey(tree, meta, options) {
-  if (typeof options.getChildrenKey === 'function') {
+function getFinalChildrenKey(tree, meta, options) {
+  if (typeof options.getChildrenKey === "function") {
     const dynamicChildrenKey = options.getChildrenKey(tree, meta);
     if (dynamicChildrenKey != null) {
       return dynamicChildrenKey;
@@ -29,17 +31,15 @@ export function getFinalChildrenKey(tree, meta, options) {
   }
   return options.childrenKey;
 }
-
-// 前置深度优先遍历
 const treeNodePreImpl = (treeItem, callback, options) => {
   const callbackResult = callback(treeItem, options);
   if (callbackResult) {
     return treeItem;
   }
   const finalChildrenKey = getFinalChildrenKey(treeItem, options, options);
-  const children = treeItem?.[finalChildrenKey];
+  const children = treeItem == null ? void 0 : treeItem[finalChildrenKey];
   if (!children || !Array.isArray(children)) {
-    return undefined;
+    return void 0;
   }
   for (let i = 0, count = children.length; i < count; i++) {
     const childItem = children[i];
@@ -52,15 +52,15 @@ const treeNodePreImpl = (treeItem, callback, options) => {
       return findOne;
     }
   }
-  return undefined;
+  return void 0;
 };
 const treeNodeStrategies = {
   pre: treeNodePreImpl
 };
-export function treeNodeFind(tree, callback, options) {
-  const childrenKey = options?.childrenKey ?? 'children';
-  const strategy = options?.strategy ?? 'pre';
-  const getChildrenKey = options?.getChildrenKey;
+function treeNodeFind(tree, callback, options) {
+  const childrenKey = (options == null ? void 0 : options.childrenKey) ?? "children";
+  const strategy = (options == null ? void 0 : options.strategy) ?? "pre";
+  const getChildrenKey = options == null ? void 0 : options.getChildrenKey;
   const method = treeNodeStrategies[strategy];
   const innerOptions = {
     childrenKey,
@@ -76,26 +76,22 @@ export function treeNodeFind(tree, callback, options) {
         return result;
       }
     }
-    return undefined;
+    return void 0;
   }
   return method(tree, callback, innerOptions);
 }
-export function createTreeFromArray(array, options) {
+function createTreeFromArray(array, options) {
   const result = [];
-  const {
-    parentKey = 'pid',
-    itemKey = 'id',
-    childrenKey = 'children'
-  } = options || {};
-  const map = new Map();
-  array.map(item => {
+  const { parentKey = "pid", itemKey = "id", childrenKey = "children" } = options || {};
+  const map = /* @__PURE__ */ new Map();
+  array.map((item) => {
     const itemKeyValue = item[itemKey];
     if (!map.get(itemKeyValue)) {
       map.set(itemKeyValue, item);
     }
     return item;
   });
-  array.map(item => {
+  array.map((item) => {
     const parentKeyValue = item[parentKey];
     const parentItem = map.get(parentKeyValue);
     if (!parentItem || !parentKeyValue) {
@@ -103,8 +99,7 @@ export function createTreeFromArray(array, options) {
       return;
     }
     const siblings = parentItem[childrenKey];
-    if (siblings === null || siblings === undefined) {
-      // disable eslint tslint
+    if (siblings === null || siblings === void 0) {
       parentItem[childrenKey] = [item];
     } else if (Array.isArray(siblings)) {
       siblings.push(item);
@@ -116,19 +111,17 @@ export function createTreeFromArray(array, options) {
   });
   return result;
 }
-
-// 前置遍历
 const treeForEachPreImpl = (treeItem, callback, options) => {
   callback(treeItem, options);
   const finalChildrenKey = getFinalChildrenKey(treeItem, options, options);
-  const children = treeItem?.[finalChildrenKey];
+  const children = treeItem == null ? void 0 : treeItem[finalChildrenKey];
   if (children && Array.isArray(children)) {
     const nextLevelOptions = {
       ...options,
       parents: [...options.parents, treeItem],
       depth: options.depth + 1
     };
-    children.forEach(childItem => {
+    children.forEach((childItem) => {
       treeForEachPreImpl(childItem, callback, nextLevelOptions);
     });
   }
@@ -136,10 +129,10 @@ const treeForEachPreImpl = (treeItem, callback, options) => {
 const treeForEachStrategies = {
   pre: treeForEachPreImpl
 };
-export function treeForEach(tree, callback, options) {
-  const childrenKey = options?.childrenKey ?? 'children';
-  const strategy = options?.strategy ?? 'pre';
-  const getChildrenKey = options?.getChildrenKey;
+function treeForEach(tree, callback, options) {
+  const childrenKey = (options == null ? void 0 : options.childrenKey) ?? "children";
+  const strategy = (options == null ? void 0 : options.strategy) ?? "pre";
+  const getChildrenKey = options == null ? void 0 : options.getChildrenKey;
   const isForest = Array.isArray(tree);
   const method = treeForEachStrategies[strategy];
   const innerOptions = {
@@ -148,14 +141,27 @@ export function treeForEach(tree, callback, options) {
     parents: [],
     getChildrenKey
   };
-  isForest ? tree.forEach(tree => {
-    method(tree, callback, innerOptions);
+  isForest ? tree.forEach((tree2) => {
+    method(tree2, callback, innerOptions);
   }) : method(tree, callback, innerOptions);
 }
-export function transformTreeToArray(tree, options) {
+function transformTreeToArray(tree, options) {
   const results = [];
-  treeForEach(tree, t => {
-    results.push(t);
-  }, options);
+  treeForEach(
+    tree,
+    (t) => {
+      results.push(t);
+    },
+    options
+  );
   return results;
-}
+}
+export {
+  addLevelAndParentId,
+  createTreeFromArray,
+  getFinalChildrenKey,
+  getRowKey,
+  transformTreeToArray,
+  treeForEach,
+  treeNodeFind
+};

package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/propsType.js

@@ -1 +0,0 @@
-export {};

package/es/ProTable/components/RcTable/components/DraggableTable/index.js

@@ -1,56 +1,49 @@
-import { Table } from 'antd';
-import { forwardRef, memo } from 'react';
+import { jsx } from "react/jsx-runtime";
+import { Table } from "antd";
+import { forwardRef, memo } from "react";
 import DndWrapper, { Row } from "./components/DndWrapper";
 import { RenderEmptyText, RenderSummary } from "../../../index";
-import { jsx as _jsx } from "react/jsx-runtime";
-const DraggableTable = /*#__PURE__*/forwardRef(({
-  dataSource,
-  tableProps,
-  draggableProps,
-  summaryProps,
-  emptyTextProps,
-  ...restProps
-}, ref) => {
-  const {
-    columns,
-    renderRowSelection,
-    rowClassName,
-    disabled
-  } = tableProps;
-  const {
-    onChange,
-    draggable,
-    rowKey,
-    onDragStartGuard,
-    onDragEndGuard
-  } = draggableProps;
-  return /*#__PURE__*/_jsx(DndWrapper, {
-    value: dataSource ?? [],
-    onChange: onChange,
-    disabled: disabled,
-    draggable: draggable,
-    rowKey: rowKey,
-    onDragStartGuard: onDragStartGuard,
-    onDragEndGuard: onDragEndGuard,
-    children: /*#__PURE__*/_jsx(Table, {
-      ref: ref,
-      className: "pro-edit-table-drag",
-      components: {
-        body: {
-          row: Row
-        }
-      },
-      columns: columns,
-      locale: {
-        emptyText: RenderEmptyText(emptyTextProps)
-      },
-      summary: () => RenderSummary(summaryProps),
-      rowClassName: rowClassName,
-      ...tableProps,
-      dataSource: dataSource,
-      rowSelection: renderRowSelection(),
-      ...restProps
-    })
-  });
-});
-export default /*#__PURE__*/memo(DraggableTable);
+const DraggableTable = forwardRef(
+  ({ dataSource, tableProps, draggableProps, summaryProps, emptyTextProps, ...restProps }, ref) => {
+    const { columns, renderRowSelection, rowClassName, disabled } = tableProps;
+    const { onChange, draggable, rowKey, onDragStartGuard, onDragEndGuard } = draggableProps;
+    return /* @__PURE__ */ jsx(
+      DndWrapper,
+      {
+        value: dataSource ?? [],
+        onChange,
+        disabled,
+        draggable,
+        rowKey,
+        onDragStartGuard,
+        onDragEndGuard,
+        children: /* @__PURE__ */ jsx(
+          Table,
+          {
+            ref,
+            className: "pro-edit-table-drag",
+            components: {
+              body: {
+                row: Row
+              }
+            },
+            columns,
+            locale: {
+              emptyText: RenderEmptyText(emptyTextProps)
+            },
+            summary: () => RenderSummary(summaryProps),
+            rowClassName,
+            ...tableProps,
+            dataSource,
+            rowSelection: renderRowSelection(),
+            ...restProps
+          }
+        )
+      }
+    );
+  }
+);
+var DraggableTable_default = memo(DraggableTable);
+export {
+  DraggableTable_default as default
+};

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

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