@zat-design/sisyphus-react 4.0.0-beta.4 → 4.0.0-beta.5

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

@@ -1,60 +1,46 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/ProTable/components/RcTable/components/BaseTable/index.tsx
-var BaseTable_exports = {};
-__export(BaseTable_exports, {
-  default: () => BaseTable_default
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(BaseTable_exports);
-var import_antd = require("antd");
-var import_react = require("react");
-var import__ = require("../../../index");
-var BaseTable = ({
-  dataSource,
-  tableProps,
-  draggableProps,
-  summaryProps,
-  emptyTextProps,
-  ...restProps
-}) => {
-  const { columns, renderRowSelection, rowClassName, resizeColumn } = tableProps;
-  const renderComponents = () => {
+exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+require("antd/es/table/style");
+var _table = _interopRequireDefault(require("antd/es/table"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _react = require("react");
+var _index = require("../../../index");
+var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
+var BaseTable = _ref => {
+  var dataSource = _ref.dataSource,
+    tableProps = _ref.tableProps,
+    draggableProps = _ref.draggableProps,
+    summaryProps = _ref.summaryProps,
+    emptyTextProps = _ref.emptyTextProps,
+    restProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var columns = tableProps.columns,
+    renderRowSelection = tableProps.renderRowSelection,
+    rowClassName = tableProps.rowClassName,
+    resizeColumn = tableProps.resizeColumn;
+  var renderComponents = () => {
     if (resizeColumn) {
-      return import__.TableResizable.components;
+      return _index.TableResizable.components;
     }
     return null;
   };
-  return /* @__PURE__ */ React.createElement(
-    import_antd.Table,
-    {
-      components: renderComponents(),
-      columns,
-      locale: {
-        emptyText: (0, import__.RenderEmptyText)(emptyTextProps)
-      },
-      summary: () => (0, import__.RenderSummary)(summaryProps),
-      rowClassName,
-      ...tableProps,
-      dataSource,
-      rowSelection: renderRowSelection(),
-      ...restProps
-    }
-  );
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_table.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    components: renderComponents(),
+    columns: columns,
+    locale: {
+      emptyText: (0, _index.RenderEmptyText)(emptyTextProps)
+    },
+    summary: () => (0, _index.RenderSummary)(summaryProps),
+    rowClassName: rowClassName
+  }, tableProps), {}, {
+    dataSource: dataSource,
+    rowSelection: renderRowSelection()
+  }, restProps));
 };
-var BaseTable_default = (0, import_react.memo)(BaseTable);
+var _default = exports.default = /*#__PURE__*/(0, _react.memo)(BaseTable);

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

@@ -1,149 +1,197 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.tsx
-var DndWrapper_exports = {};
-__export(DndWrapper_exports, {
-  Row: () => Row,
-  default: () => DndWrapper_default
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(DndWrapper_exports);
-var import_react = __toESM(require("react"));
-var import_core = require("@dnd-kit/core");
-var import_sortable = require("@dnd-kit/sortable");
-var import_utilities = require("@dnd-kit/utilities");
-var import_lodash = require("lodash");
-var import_utils = require("./utils/index");
-var import_ProIcon = __toESM(require("../../../../../../../ProIcon"));
-var Row = (props) => {
-  const { disabled, children, ...restProps } = props;
-  const data = (0, import_sortable.useSortable)({
-    id: props["data-row-key"],
+exports.default = exports.Row = void 0;
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _react = _interopRequireDefault(require("react"));
+var _core = require("@dnd-kit/core");
+var _sortable = require("@dnd-kit/sortable");
+var _utilities = require("@dnd-kit/utilities");
+var _lodash = require("lodash");
+var _index = require("./utils/index");
+var _ProIcon = _interopRequireDefault(require("../../../../../../../ProIcon"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["disabled", "children"];
+var Row = props => {
+  var disabled = props.disabled,
+    children = props.children,
+    restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var data = (0, _sortable.useSortable)({
+    id: props['data-row-key'],
     disabled
   });
-  const { attributes, listeners, setNodeRef, transform, transition, isDragging } = data;
-  const style = {
-    ...props.style,
-    transform: import_utilities.CSS.Transform.toString(transform && { ...transform, scaleY: 1 }),
-    transition,
-    ...isDragging ? { position: "relative", zIndex: 2 } : {}
-  };
-  return /* @__PURE__ */ import_react.default.createElement("tr", { ...restProps, ref: setNodeRef, style, ...attributes }, import_react.default.Children.map(children, (child, index) => {
-    if (index === 0) {
-      const { render, record, renderIndex } = (child == null ? void 0 : child.props) || {};
-      return import_react.default.cloneElement(child, {
-        children: /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("span", { className: `pro-table-drag-wrapper${props["data-hide"] ? " no-check" : ""}` }, /* @__PURE__ */ import_react.default.createElement(
-          import_ProIcon.default,
-          {
-            className: "drag-icon",
-            style: { touchAction: "none", cursor: disabled ? "no-drop" : "move" },
-            type: "drag",
-            size: 20,
-            ...listeners
-          }
-        )), props["data-hide"] ? null : render == null ? void 0 : render(null, record, renderIndex))
-      });
-    }
-    return child;
+  var attributes = data.attributes,
+    listeners = data.listeners,
+    setNodeRef = data.setNodeRef,
+    transform = data.transform,
+    transition = data.transition,
+    isDragging = data.isDragging;
+  var style = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.style), {}, {
+    transform: _utilities.CSS.Transform.toString(transform && (0, _objectSpread2.default)((0, _objectSpread2.default)({}, transform), {}, {
+      scaleY: 1
+    })),
+    transition
+  }, isDragging ? {
+    position: 'relative',
+    zIndex: 2
+  } : {});
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("tr", (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
+    ref: setNodeRef,
+    style: style
+  }, attributes), {}, {
+    children: _react.default.Children.map(children, (child, index) => {
+      // 在第一列（通常是rowSelection列）显示拖拽图标
+      if (index === 0) {
+        var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
+          render = _ref.render,
+          record = _ref.record,
+          renderIndex = _ref.renderIndex;
+        return /*#__PURE__*/_react.default.cloneElement(child, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+              className: `pro-table-drag-wrapper${props['data-hide'] ? ' no-check' : ''}`,
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProIcon.default, (0, _objectSpread2.default)({
+                className: "drag-icon",
+                style: {
+                  touchAction: 'none',
+                  cursor: disabled ? 'no-drop' : 'move'
+                },
+                type: "drag",
+                size: 20
+              }, listeners))
+            }), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+          })
+        });
+      }
+      return child;
+    })
   }));
 };
-var DndWrapper = ({
-  draggable,
-  value,
-  onChange,
-  disabled,
-  children,
-  rowKey,
-  onDragStartGuard,
-  onDragEndGuard
-}) => {
-  var _a;
-  const onDragStart = async ({ active }) => {
-    if (onDragStartGuard && (0, import_lodash.isFunction)(onDragStartGuard)) {
-      const transformedValue2 = (0, import_utils.addLevelAndParentId)(value, rowKey);
-      const activeObject = (0, import_utils.treeNodeFind)(transformedValue2, (t) => t.rowKey === active.id);
-      await onDragStartGuard({
-        activeObject,
-        currentDataSource: value
-      });
-    }
-  };
-  const onDragEnd = async ({ active, over }) => {
-    const transformedValue2 = (0, import_utils.addLevelAndParentId)(value, rowKey);
-    if (active.id !== (over == null ? void 0 : over.id)) {
-      const activeObject = (0, import_utils.treeNodeFind)(transformedValue2, (t) => t.rowKey === active.id);
-      const overObject = (0, import_utils.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;
-        let nextDataSource = value;
-        if (activeLevel === overLevel && activeParentId === overParentId) {
-          const flatTree2 = (0, import_utils.transformTreeToArray)(transformedValue2).map((item) => ({
-            ...item,
-            children: void 0
-          }));
-          const activeIndex = flatTree2.findIndex((i) => i.rowKey === active.id);
-          const overIndex = flatTree2.findIndex((i) => i.rowKey === (over == null ? void 0 : over.id));
-          const nextValue = (0, import_sortable.arrayMove)(flatTree2, activeIndex, overIndex);
-          nextDataSource = (0, import_utils.createTreeFromArray)(nextValue, {
-            itemKey: "rowKey",
-            parentKey: "parentId",
-            childrenKey: "children"
-          });
-          if (onDragEndGuard && (0, import_lodash.isFunction)(onDragEndGuard)) {
-            nextDataSource = await onDragEndGuard({
+exports.Row = Row;
+var DndWrapper = _ref2 => {
+  var _flatTree$;
+  var draggable = _ref2.draggable,
+    value = _ref2.value,
+    onChange = _ref2.onChange,
+    disabled = _ref2.disabled,
+    children = _ref2.children,
+    rowKey = _ref2.rowKey,
+    onDragStartGuard = _ref2.onDragStartGuard,
+    onDragEndGuard = _ref2.onDragEndGuard;
+  var onDragStart = /*#__PURE__*/function () {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref3) {
+      var active, _transformedValue, activeObject;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            active = _ref3.active;
+            if (!(onDragStartGuard && (0, _lodash.isFunction)(onDragStartGuard))) {
+              _context.next = 6;
+              break;
+            }
+            // 为数据源划分层级及parentId
+            _transformedValue = (0, _index.addLevelAndParentId)(value, rowKey);
+            activeObject = (0, _index.treeNodeFind)(_transformedValue, t => t.rowKey === active.id);
+            _context.next = 6;
+            return onDragStartGuard({
+              activeObject,
+              currentDataSource: value
+            });
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onDragStart(_x) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var onDragEnd = /*#__PURE__*/function () {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
+      var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            active = _ref5.active, over = _ref5.over;
+            // 为数据源划分层级及parentId
+            transformedValue = (0, _index.addLevelAndParentId)(value, rowKey); // 同一level层级的且parentId相同的，可以互相之间拖拽替换
+            if (!(active.id !== (over === null || over === void 0 ? void 0 : over.id))) {
+              _context2.next = 20;
+              break;
+            }
+            activeObject = (0, _index.treeNodeFind)(transformedValue, t => t.rowKey === active.id);
+            overObject = (0, _index.treeNodeFind)(transformedValue, t => t.rowKey === (over === null || over === void 0 ? void 0 : over.id));
+            if (!(activeObject && overObject)) {
+              _context2.next = 20;
+              break;
+            }
+            activeLevel = activeObject.level, activeParentId = activeObject.parentId;
+            overLevel = overObject.level, overParentId = overObject.parentId;
+            nextDataSource = value;
+            if (!(activeLevel === overLevel && activeParentId === overParentId)) {
+              _context2.next = 20;
+              break;
+            }
+            // 将树平铺
+            _flatTree = (0, _index.transformTreeToArray)(transformedValue).map(item => (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+              children: undefined
+            }));
+            activeIndex = _flatTree.findIndex(i => i.rowKey === active.id);
+            overIndex = _flatTree.findIndex(i => i.rowKey === (over === null || over === void 0 ? void 0 : over.id));
+            nextValue = (0, _sortable.arrayMove)(_flatTree, activeIndex, overIndex);
+            nextDataSource = (0, _index.createTreeFromArray)(nextValue, {
+              itemKey: 'rowKey',
+              parentKey: 'parentId',
+              childrenKey: 'children'
+            });
+            // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
+            if (!(onDragEndGuard && (0, _lodash.isFunction)(onDragEndGuard))) {
+              _context2.next = 19;
+              break;
+            }
+            _context2.next = 18;
+            return onDragEndGuard({
               activeObject,
               overObject,
               originDataSource: value,
               currentDataSource: nextDataSource
             });
-          }
-          onChange(nextDataSource ?? []);
+          case 18:
+            nextDataSource = _context2.sent;
+          case 19:
+            onChange((_nextDataSource = nextDataSource) !== null && _nextDataSource !== void 0 ? _nextDataSource : []);
+          case 20:
+          case "end":
+            return _context2.stop();
         }
-      }
-    }
-  };
-  const transformedValue = (0, import_utils.addLevelAndParentId)(value, rowKey);
-  const flatTree = (0, import_utils.transformTreeToArray)(transformedValue).map((item) => ({
-    ...item,
-    children: void 0
+      }, _callee2);
+    }));
+    return function onDragEnd(_x2) {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+  var transformedValue = (0, _index.addLevelAndParentId)(value, rowKey);
+
+  // 将树平铺
+  var flatTree = (0, _index.transformTreeToArray)(transformedValue).map(item => (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+    children: undefined
   }));
-  return draggable && !disabled ? /* @__PURE__ */ import_react.default.createElement(import_core.DndContext, { onDragStart, onDragEnd, collisionDetection: import_core.closestCorners }, /* @__PURE__ */ import_react.default.createElement(
-    import_sortable.SortableContext,
-    {
-      items: ((_a = flatTree == null ? void 0 : flatTree[0]) == null ? void 0 : _a.rowKey) ? flatTree.map((i) => i.rowKey) : [],
-      strategy: import_sortable.verticalListSortingStrategy
-    },
-    children
-  )) : children;
+  return draggable && !disabled ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_core.DndContext, {
+    onDragStart: onDragStart,
+    onDragEnd: onDragEnd,
+    collisionDetection: _core.closestCorners,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_sortable.SortableContext, {
+      items: flatTree !== null && flatTree !== void 0 && (_flatTree$ = flatTree[0]) !== null && _flatTree$ !== void 0 && _flatTree$.rowKey ? flatTree.map(i => i.rowKey) : [],
+      strategy: _sortable.verticalListSortingStrategy,
+      children: children
+    })
+  }) : children;
 };
-var DndWrapper_default = DndWrapper;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  Row
-});
+var _default = exports.default = DndWrapper;