@zat-design/sisyphus-react 3.6.7 → 3.6.8

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

@@ -82,24 +82,24 @@ var ActionButton = function ActionButton(_ref) {
         disabled: isDisabled,
         okText: locale.ProEditTable.confirm,
         cancelText: locale.ProEditTable.cancel,
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled
-        }))) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        }))) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           children: btnConfig.label
         }))
       }) : _jsx(_Fragment, {
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled,
           onClick: function onClick() {
             btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
           }
-        }))) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        }))) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: function onClick() {
@@ -109,12 +109,12 @@ var ActionButton = function ActionButton(_ref) {
         }))
       })
     }) : _jsx(_Fragment, {
-      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
+      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         record: record,
         index: index
       }))) : _jsx(_Button, _objectSpread(_objectSpread({
         className: "action-button"
-      }, omit(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
+      }, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         type: "link",
         icon: (_btnConfig$icon = btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.icon) !== null && _btnConfig$icon !== void 0 ? _btnConfig$icon : iconMap[btnConfig.type],
         children: btnConfig.label

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

@@ -43,8 +43,8 @@ var BaseTable = function BaseTable(_ref) {
         return {
           disabled: disabled || virtualKey && !!editingKeys.length,
           'data-hide': isHideCheckBox,
-          onClick: function onClick() {},
-          rowDraggable: rowDraggable
+          'data-row-draggable': rowDraggable,
+          onClick: function onClick() {}
         };
       }
     }, resetProps), {}, {

package/es/ProEditTable/components/RcTable/DraggableTable.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
-declare const _default: import("react").MemoExoticComponent<({ tableProps, draggableProps, ...resetProps }: {
+import React from 'react';
+declare const _default: React.MemoExoticComponent<({ tableProps, draggableProps, ...resetProps }: {
     [x: string]: any;
     tableProps: any;
     draggableProps: any;

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

@@ -1,16 +1,114 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/table/style";
 import _Table from "antd/es/table";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["tableProps", "draggableProps"];
+var _excluded = ["disabled", "children"],
+  _excluded2 = ["tableProps", "draggableProps"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { memo } from 'react';
-import { DndWrapper, Row } from '../index';
-var DraggableTable = function DraggableTable(_ref) {
+import React, { memo } from 'react';
+import { DndContext } from '@dnd-kit/core';
+import { arrayMove, useSortable, SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
+import ProIcon from '../../../ProIcon';
+var Row = function Row(props) {
+  var disabled = props.disabled,
+    children = props.children,
+    restProps = _objectWithoutProperties(props, _excluded);
+  var data = useSortable({
+    id: props['data-row-key'],
+    disabled: disabled
+  });
+  var attributes = data.attributes,
+    listeners = data.listeners,
+    setNodeRef = data.setNodeRef,
+    transform = data.transform,
+    transition = data.transition,
+    isDragging = data.isDragging;
+  var style = _objectSpread(_objectSpread({}, props.style), {}, {
+    transform: CSS.Transform.toString(transform && _objectSpread(_objectSpread({}, transform), {}, {
+      scaleY: 1
+    })),
+    transition: transition
+  }, isDragging ? {
+    position: 'relative',
+    zIndex: 2
+  } : {});
+  return _jsx("tr", _objectSpread(_objectSpread(_objectSpread({}, restProps), {}, {
+    ref: setNodeRef,
+    style: style
+  }, attributes), {}, {
+    children: React.Children.map(children, function (child) {
+      if (child.key === 'RC_TABLE_KEY' && !disabled) {
+        var _restProps$dataRowD;
+        var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
+          render = _ref.render,
+          record = _ref.record,
+          renderIndex = _ref.renderIndex;
+        var isDrag = restProps['data-row-draggable'] ? (_restProps$dataRowD = restProps['data-row-draggable']) === null || _restProps$dataRowD === void 0 ? void 0 : _restProps$dataRowD.call(restProps, record) : true;
+        return /*#__PURE__*/React.cloneElement(child, {
+          children: _jsxs("span", {
+            className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
+            children: [isDrag ? _jsx(ProIcon, _objectSpread({
+              className: "drag-icon",
+              style: {
+                touchAction: 'none',
+                cursor: disabled ? 'no-drop' : 'move'
+              },
+              type: "drag",
+              size: 20
+            }, listeners)) : _jsx(ProIcon, {
+              size: 20
+            }), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+          })
+        });
+      }
+      return child;
+    })
+  }));
+};
+var DndWrapper = function DndWrapper(_ref2) {
   var _value$;
-  var tableProps = _ref.tableProps,
-    draggableProps = _ref.draggableProps,
-    resetProps = _objectWithoutProperties(_ref, _excluded);
+  var draggable = _ref2.draggable,
+    value = _ref2.value,
+    onChange = _ref2.onChange,
+    onDrag = _ref2.onDrag,
+    disabled = _ref2.disabled,
+    children = _ref2.children;
+  var onDragEnd = function onDragEnd(event) {
+    var active = event.active,
+      over = event.over;
+    if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
+      if (onDrag) {
+        var nextList = onDrag(event, value);
+        onChange(nextList);
+        return;
+      }
+      var activeIndex = value.findIndex(function (i) {
+        return i.rowKey === active.id;
+      });
+      var overIndex = value.findIndex(function (i) {
+        return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+      });
+      var nextValue = arrayMove(value, activeIndex, overIndex);
+      onChange(nextValue);
+    }
+  };
+  return draggable && !disabled ? _jsx(DndContext, {
+    onDragEnd: onDragEnd,
+    children: _jsx(SortableContext, {
+      items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
+        return i.rowKey;
+      }) : [],
+      strategy: verticalListSortingStrategy,
+      children: children
+    })
+  }) : children;
+};
+var DraggableTable = function DraggableTable(_ref3) {
+  var _value$2;
+  var tableProps = _ref3.tableProps,
+    draggableProps = _ref3.draggableProps,
+    resetProps = _objectWithoutProperties(_ref3, _excluded2);
   var value = tableProps.value,
     headerRender = tableProps.headerRender,
     tableRef = tableProps.tableRef,
@@ -45,7 +143,7 @@ var DraggableTable = function DraggableTable(_ref) {
     }) : null, _jsx(_Table, _objectSpread(_objectSpread({
       ref: tableRef,
       className: className,
-      dataSource: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value : undefined,
+      dataSource: (value === null || value === void 0 ? void 0 : (_value$2 = value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.rowKey) ? value : undefined,
       columns: columns,
       rowSelection: renderRowSelection(),
       rowClassName: rowClassName,
@@ -58,8 +156,8 @@ var DraggableTable = function DraggableTable(_ref) {
         return {
           disabled: disabled || virtualKey && !!editingKeys.length,
           'data-hide': isHideCheckBox,
-          onClick: function onClick() {},
-          rowDraggable: rowDraggable
+          'data-row-draggable': rowDraggable,
+          onClick: function onClick() {}
         };
       }
     }, resetProps), {}, {

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

@@ -148,8 +148,8 @@ var VirtualTable = function VirtualTable(_ref) {
         return {
           disabled: disabled || virtualKey && !!editingKeys.length,
           'data-hide': isHideCheckBox,
-          onClick: function onClick() {},
-          rowDraggable: rowDraggable
+          'data-row-draggable': rowDraggable,
+          onClick: function onClick() {}
         };
       }
     }, resetProps), {}, {

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

@@ -61,7 +61,7 @@ var RenderField = function RenderField(_ref) {
     trim = column.trim,
     confirm = column.confirm,
     _column$validateTrigg = column.validateTrigger,
-    validateTrigger = _column$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSumbit'] : _column$validateTrigg,
+    validateTrigger = _column$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _column$validateTrigg,
     resetProps = _objectWithoutProperties(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -555,7 +555,7 @@ var RenderField = function RenderField(_ref) {
   var FormItem = null;
   FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
     validateFirst: true
-  }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+  }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell'])), {}, {
     className: _className,
     name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
     children: ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) ? _jsx(ConfirmWrapper, _objectSpread(_objectSpread({}, componentProps), {}, {

package/es/ProEditTable/components/index.d.ts

@@ -1,4 +1,3 @@
-export { default as DndWrapper, Row } from './DndWrapper';
 export { default as RenderField } from './RenderField';
 export { default as Validator } from './Validator';
 export { default as Summary } from './Summary';

package/es/ProEditTable/components/index.js

@@ -1,4 +1,3 @@
-export { default as DndWrapper, Row } from './DndWrapper';
 export { default as RenderField } from './RenderField';
 export { default as Validator } from './Validator';
 export { default as Summary } from './Summary';

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -4,6 +4,8 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+import "antd/es/spin/style";
+import _Spin from "antd/es/spin";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
@@ -141,7 +143,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       }
     })),
-    run = _useRequestList.run;
+    run = _useRequestList.run,
+    selectLoading = _useRequestList.loading;
   var _useRequestList2 = useRequestList(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
       withPagination: withPagination,
       transformParams: transformParams,
@@ -684,6 +687,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       optionRender: optionRender,
       scrollFollowParent: false,
       mode: isMultiple ? 'multiple' : undefined,
+      notFoundContent: selectLoading ? _jsx(_Spin, {
+        size: "small"
+      }) : null,
       onFocus: function onFocus() {
         if (useRequest) {
           var _useRequest$options9;

package/es/ProSelect/index.js

@@ -9,10 +9,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView", "viewportReady"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useDeepCompareEffect, useInViewport, useRequest as useRequestFunc } from 'ahooks';
-import React, { useImperativeHandle, useState, forwardRef, useRef, useEffect } from 'react';
+import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
+import React, { useImperativeHandle, useState, forwardRef, useRef } from 'react';
 import { isFunction, isObject, isString, omit, cloneDeep, isNumber } from 'lodash';
 import { useProConfig } from '../ProConfigProvider';
 import Container from '../ProForm/components/Container';
@@ -27,8 +27,7 @@ export var ProSelect = function ProSelect(props, ref) {
   var _ref = useProConfig('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
-    showCodeName = _ref.showCodeName,
-    gViewportReady = _ref.viewportReady;
+    showCodeName = _ref.showCodeName;
   var label = 'label';
   var code = 'value';
   if (proSelectFieldNames && Object.keys(proSelectFieldNames).length) {
@@ -55,18 +54,8 @@ export var ProSelect = function ProSelect(props, ref) {
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
     isViewPro = props.isView,
-    __viewportReady = props.viewportReady,
     selectProps = _objectWithoutProperties(props, _excluded);
-  var viewportReady = __viewportReady || gViewportReady;
-  /** 是否在可视区域出现过 */
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    viewFlag = _useState2[0],
-    setViewFlag = _useState2[1];
   var refSelect1 = useRef();
-  var _useInViewport = useInViewport(refSelect1),
-    _useInViewport2 = _slicedToArray(_useInViewport, 1),
-    inViewport = _useInViewport2[0];
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
   var value = props.value;
   var _ref2 = ProForm.useFieldProps() || {},
@@ -77,15 +66,15 @@ export var ProSelect = function ProSelect(props, ref) {
     code = fieldNames.value;
     label = fieldNames.label;
   }
-  var _useState3 = useState(dataSource || []),
-    _useState4 = _slicedToArray(_useState3, 2),
-    selectList = _useState4[0],
-    setSelectList = _useState4[1];
+  var _useState = useState(dataSource || []),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectList = _useState2[0],
+    setSelectList = _useState2[1];
   // 用来控制只有第一次才会设置 defaultOne 属性、🔒
-  var _useState5 = useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    isDefaultOne = _useState6[0],
-    setIsDefaultOne = _useState6[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isDefaultOne = _useState4[0],
+    setIsDefaultOne = _useState4[1];
   var OptionRender = optionRender;
   var defaultOnSuccessFun = function defaultOnSuccessFun(res) {
     var _res$status = res.status,
@@ -146,16 +135,8 @@ export var ProSelect = function ProSelect(props, ref) {
     if (manual) {
       return;
     }
-    if (viewportReady && !viewFlag) {
-      return;
-    }
     fetchFunction.run(defaultParams);
-  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue, viewFlag]);
-  useEffect(function () {
-    if (inViewport && !viewFlag && viewportReady) {
-      setViewFlag(true);
-    }
-  }, [inViewport]);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
   // disable默认值
   if (defaultDisableValue) {
     return _jsx("span", {
@@ -301,11 +282,9 @@ export var ProSelect = function ProSelect(props, ref) {
     });
   }
   return _jsx("div", {
-    ref: refSelect1,
     style: props.style,
     className: "ant-select-compact-item-div",
     children: _jsx(_Select, _objectSpread(_objectSpread({
-      // id={refSelect1.current}
       placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProSelect = locale.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
       allowClear: true,
       showArrow: true,

package/es/ProTable/{utils.d.ts → components/FormatColumn/index.d.ts}

@@ -1,7 +1,6 @@
 import React from 'react';
-import { ProTableColumn } from './propsType';
+import { ProTableColumn } from '../../propsType';
 export declare const formatColumn: (column: ProTableColumn, originalObj: any, dataSourceObj: any, rowKey: any) => void;
-export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
 /**
  * 查找最近的父级className
  * @param element 当前node节点
@@ -10,12 +9,3 @@ export declare const getColumnDataIndex: (dataIndex: string | string[]) => strin
  * @returns ReactNode 父级element
  */
 export declare const getParentElement: (element: any, name: any, type?: string) => React.ReactNode;
-/**
- * 判断数据是否为Response<List<any>>结构
- * @param data { [key: string]: any } 需要判断数据
- * @returns boolean 是否
- */
-export declare const isListResult: (data: {
-    [key: string]: any;
-}) => boolean;
-export declare const getRowKey: (rowKey: any, record: any) => any;

package/es/ProTable/{utils.js → components/FormatColumn/index.js}

@@ -1,46 +1,16 @@
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-/* eslint-disable react-hooks/rules-of-hooks */
 import { isValidElement } from 'react';
 import moment from 'moment';
-import { get, isEqual, isFunction, isString } from 'lodash';
-import { tools } from '@zat-design/utils';
 import classnames from 'classnames';
-import getEnumLabel from '../ProEnum/utils/getEnumLabel';
-import TooltipTitle from './components/TooltipTitle';
-import RenderColumn from './components/RenderColumn';
-import ProForm from '../ProForm';
-/**
- * 获取小数点后的位数
- * @param num 数字
- * @returns 位数
- */
-var getDecimalDigits = function getDecimalDigits() {
-  var num = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-  var match = Number(num).toString().match(/\.(\d+)/);
-  return match ? match[1].length : 0;
-};
-/**
- * @description: 获取初始值
- * @author: xiangchengli
- * @param {any} rowKey
- * @param any value
- * @param any originalObj
- * @param {any} dataIndex
- * @return {any}
- */
-var getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
-  if (!originalObj) {
-    return undefined;
-  }
-  var originalRecord = get(originalObj, get(record, rowKey));
-  var originalValue = get(originalRecord, dataIndex);
-  if (!isEqual(originalValue, value)) {
-    return originalValue;
-  }
-  return undefined;
-};
+import { isEqual, isFunction, isString } from 'lodash';
+import { tools } from '@zat-design/utils';
+import TooltipTitle from '../TooltipTitle';
+import RenderColumn from '../RenderColumn';
+import { getDecimalDigits, getOriginalValue } from '../../utils';
+import getEnumLabel from '../../../ProEnum/utils/getEnumLabel';
+import ProForm from '../../../ProForm';
 export var formatColumn = function formatColumn(column, originalObj, dataSourceObj, rowKey) {
   var title = column.title,
     valueType = column.valueType,
@@ -366,9 +336,6 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
     };
   }
 };
-export var getColumnDataIndex = function getColumnDataIndex(dataIndex) {
-  return typeof dataIndex === 'string' ? dataIndex : dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.join('-');
-};
 /**
  * 查找最近的父级className
  * @param element 当前node节点
@@ -392,21 +359,4 @@ export var getParentElement = function getParentElement(element, name) {
   };
   _searchDom(element, name, type = 'className');
   return result;
-};
-/**
- * 判断数据是否为Response<List<any>>结构
- * @param data { [key: string]: any } 需要判断数据
- * @returns boolean 是否
- */
-export var isListResult = function isListResult(data) {
-  return data.hasOwnProperty('total') && data.hasOwnProperty('list');
-};
-export var getRowKey = function getRowKey(rowKey, record) {
-  // 默认取id
-  var key = record.rowKey || 'id';
-  if (rowKey) {
-    var _ref;
-    key = (_ref = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref !== void 0 ? _ref : key;
-  }
-  return key;
 };

package/es/ProTable/components/RcTable/components/BaseTable/index.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="react" />
+import '../../../../style/index.less';
+declare const _default: import("react").MemoExoticComponent<({ dataSource, tableProps, draggableProps, summaryProps, emptyTextProps, ...restProps }: {
+    [x: string]: any;
+    dataSource: any;
+    tableProps: any;
+    draggableProps: any;
+    summaryProps: any;
+    emptyTextProps: any;
+}) => import("react/jsx-runtime").JSX.Element>;
+export default _default;

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

@@ -0,0 +1,43 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "antd/es/table/style";
+import _Table from "antd/es/table";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
+import { jsx as _jsx } from "react/jsx-runtime";
+import { memo } from 'react';
+import { RenderEmptyText, RenderSummary, TableResizable } from '../../../index';
+import '../../../../style/index.less';
+var BaseTable = function BaseTable(_ref) {
+  var dataSource = _ref.dataSource,
+    tableProps = _ref.tableProps,
+    draggableProps = _ref.draggableProps,
+    summaryProps = _ref.summaryProps,
+    emptyTextProps = _ref.emptyTextProps,
+    restProps = _objectWithoutProperties(_ref, _excluded);
+  var columns = tableProps.columns,
+    renderRowSelection = tableProps.renderRowSelection,
+    rowClassName = tableProps.rowClassName,
+    resizeColumn = tableProps.resizeColumn;
+  var renderComponents = function renderComponents() {
+    if (resizeColumn) {
+      return TableResizable.components;
+    }
+    return null;
+  };
+  return _jsx(_Table, _objectSpread(_objectSpread({
+    className: "pro-edit-table-drag",
+    components: renderComponents(),
+    columns: columns,
+    locale: {
+      emptyText: RenderEmptyText(emptyTextProps)
+    },
+    summary: function summary() {
+      return RenderSummary(summaryProps);
+    },
+    rowClassName: rowClassName
+  }, tableProps), {}, {
+    dataSource: dataSource,
+    rowSelection: renderRowSelection()
+  }, restProps));
+};
+export default /*#__PURE__*/memo(BaseTable);

package/es/ProTable/components/{DndWrapper → RcTable/components/DraggableTable/components/DndWrapper}/index.js

@@ -1,4 +1,3 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["disabled", "children"];
@@ -8,7 +7,7 @@ import { DndContext, closestCorners } from '@dnd-kit/core';
 import { arrayMove, useSortable, SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import { addLevelAndParentId, treeNodeFind, transformTreeToArray, createTreeFromArray } from './utils/index';
-import ProIcon from '../../../ProIcon';
+import ProIcon from '../../../../../../../ProIcon';
 export var Row = function Row(props) {
   var disabled = props.disabled,
     children = props.children,
@@ -108,8 +107,6 @@ var DndWrapper = function DndWrapper(_ref2) {
           }));
         }
       }
-    } else {
-      onChange(_toConsumableArray(value));
     }
   };
   // 将树平铺

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

@@ -40,7 +40,7 @@ var _treeNodePreImpl = function treeNodePreImpl(treeItem, callback, options) {
     return treeItem;
   }
   var finalChildrenKey = getFinalChildrenKey(treeItem, options, options);
-  var children = treeItem[finalChildrenKey];
+  var children = treeItem === null || treeItem === void 0 ? void 0 : treeItem[finalChildrenKey];
   if (!children || !Array.isArray(children)) {
     return undefined;
   }
@@ -125,7 +125,7 @@ export function createTreeFromArray(array, options) {
 var _treeForEachPreImpl = function treeForEachPreImpl(treeItem, callback, options) {
   callback(treeItem, options);
   var finalChildrenKey = getFinalChildrenKey(treeItem, options, options);
-  var children = treeItem[finalChildrenKey];
+  var children = treeItem === null || treeItem === void 0 ? void 0 : treeItem[finalChildrenKey];
   if (children && Array.isArray(children)) {
     var nextLevelOptions = _objectSpread(_objectSpread({}, options), {}, {
       parents: [].concat(_toConsumableArray(options.parents), [treeItem]),

package/es/ProTable/components/RcTable/components/DraggableTable/index.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="react" />
+import '../../../../style/index.less';
+declare const _default: import("react").MemoExoticComponent<({ dataSource, tableProps, draggableProps, summaryProps, emptyTextProps, ...restProps }: {
+    [x: string]: any;
+    dataSource: any;
+    tableProps: any;
+    draggableProps: any;
+    summaryProps: any;
+    emptyTextProps: any;
+}) => import("react/jsx-runtime").JSX.Element>;
+export default _default;

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

@@ -0,0 +1,52 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "antd/es/table/style";
+import _Table from "antd/es/table";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
+import { jsx as _jsx } from "react/jsx-runtime";
+import { memo } from 'react';
+import DndWrapper, { Row } from './components/DndWrapper';
+import { RenderEmptyText, RenderSummary } from '../../../index';
+import '../../../../style/index.less';
+var DraggableTable = function DraggableTable(_ref) {
+  var dataSource = _ref.dataSource,
+    tableProps = _ref.tableProps,
+    draggableProps = _ref.draggableProps,
+    summaryProps = _ref.summaryProps,
+    emptyTextProps = _ref.emptyTextProps,
+    restProps = _objectWithoutProperties(_ref, _excluded);
+  var columns = tableProps.columns,
+    renderRowSelection = tableProps.renderRowSelection,
+    rowClassName = tableProps.rowClassName,
+    disabled = tableProps.disabled;
+  var onChange = draggableProps.onChange,
+    draggable = draggableProps.draggable,
+    rowKey = draggableProps.rowKey;
+  return _jsx(DndWrapper, {
+    value: dataSource !== null && dataSource !== void 0 ? dataSource : [],
+    onChange: onChange,
+    disabled: disabled,
+    draggable: draggable,
+    rowKey: rowKey,
+    children: _jsx(_Table, _objectSpread(_objectSpread({
+      className: "pro-edit-table-drag",
+      components: {
+        body: {
+          row: Row
+        }
+      },
+      columns: columns,
+      locale: {
+        emptyText: RenderEmptyText(emptyTextProps)
+      },
+      summary: function summary() {
+        return RenderSummary(summaryProps);
+      },
+      rowClassName: rowClassName
+    }, tableProps), {}, {
+      dataSource: dataSource,
+      rowSelection: renderRowSelection()
+    }, restProps))
+  });
+};
+export default /*#__PURE__*/memo(DraggableTable);

package/es/ProTable/components/RcTable/index.d.ts

@@ -0,0 +1,4 @@
+/** 基础表格 */
+export { default as BaseTable } from './components/BaseTable/index';
+/** 拖拽表格 */
+export { default as DraggableTable } from './components/DraggableTable/index';