@pisell/materials 1.0.216 → 1.0.218

package/es/components/table/Table/index.js

@@ -11,32 +11,43 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-import { useSharedState, useResponsive } from "../../../hooks";
+import React, { memo, useCallback, useMemo, useRef } from "react";
+import { Form } from "antd";
 // import { Access } from '@umijs/max';
-import React, { useCallback, useMemo } from "react";
-import { useMemoizedFn } from "ahooks";
+import { useMemoizedFn, useSize } from "ahooks";
 import { Context } from "../model";
 // import AddFieldModal from "./AddFieldModal";
-import "./index.less";
 import BasicTable from "../BasicTable";
 import SortRow from "./tableConfig/SortRow";
-import Body from "./tableConfig/body";
-import Header from "./tableConfig/header";
 import { paginationConfig } from "../../Pagination";
-import getColumnStringProps from "../TableFilter/stringFilter";
-import getColumnNumberProps from "../TableFilter/numberFilter";
-import getColumnSelectProps from "../TableFilter/selectFilter";
-import SortIcon from "../TableFilter/SortIcon";
+import { getText } from "../../../locales";
+import useTransDataSource from "../hooks/useTransDataSource";
+import useTransColumns from "../hooks/useTransColumns";
+import useGenTableComponents from "../hooks/useGenTableComponents";
+import useGenScroll from "../hooks/useGenScroll";
+import { useSharedState, useResponsive } from "../../../hooks";
+import "./index.less";
 var GridViewTable = function GridViewTable(_ref) {
-  var tableProps = _ref.tableProps;
+  var _tableProps$paginatio, _tableProps$paginatio2;
+  var tableProps = _ref.tableProps,
+    filter = _ref.filter,
+    setTableSetting = _ref.setTableSetting;
   var responsive = useResponsive();
   var _useSharedState = useSharedState(Context),
     state = _useSharedState.state,
     dispatch = _useSharedState.dispatch;
-  var dataSource = state.dataSource,
-    defaultColumns = state.defaultColumns;
+  var form = Form.useFormInstance();
+  var column_setting = Form.useWatch("column_setting", {
+    form: form,
+    preserve: true
+  }) || [];
+  var tableWrapRef = useRef(null);
+  var _ref2 = useSize(tableWrapRef) || {},
+    height = _ref2.height;
+  var defaultDataSource = state.dataSource,
+    originDataSource = state.originDataSource;
   var handleSave = useMemoizedFn(function (row) {
-    var newData = _toConsumableArray(dataSource);
+    var newData = _toConsumableArray(defaultDataSource);
     var index = newData.findIndex(function (item) {
       return row.key === item.key;
     });
@@ -48,85 +59,44 @@ var GridViewTable = function GridViewTable(_ref) {
     });
   });
   var handleResize = function handleResize(index) {
-    return function (e, _ref2) {
-      var size = _ref2.size;
-      var nextColumns = _toConsumableArray(defaultColumns);
+    return function (e, _ref3) {
+      var size = _ref3.size;
+      var nextColumns = _toConsumableArray(columns);
       nextColumns[index] = _objectSpread(_objectSpread({}, nextColumns[index]), {}, {
         width: size.width
       });
-      dispatch({
-        type: "setDefaultColumns",
-        payload: nextColumns
-      });
+      form.setFieldValue("column_setting", nextColumns);
+      setTableSetting(form.getFieldsValue());
     };
   };
-  var columns = useMemo(function () {
-    return defaultColumns.map(function (col, index) {
-      var _col$filters;
-      if (!col.editable) {
-        return col;
-      }
-      var item = {
-        editable: col.editable || true,
-        dataIndex: col.dataIndex,
-        title: col.title,
-        field_type: col.field_type,
-        lock: col.lock,
-        width: col.width || 0,
-        action: col.action || "",
-        render: col.render,
-        contentClassName: col.contentClassName || ""
-      };
-      var filterObj = {};
-
-      // 开启默认筛选后根据字段类型渲染表头筛选
-      if (col.defaultFilters) {
-        if (col.field_type === "number") {
-          filterObj = getColumnNumberProps({
-            dataIndex: col.dataIndex
-          });
-        }
-        if (col.field_type === "text") {
-          filterObj = getColumnStringProps({
-            dataIndex: col.dataIndex
-          });
-        }
-      }
-
-      // 表头的筛选菜单项
-      if (((_col$filters = col.filters) === null || _col$filters === void 0 ? void 0 : _col$filters.length) > 0) {
-        filterObj = _objectSpread(_objectSpread({}, getColumnSelectProps({
-          dataIndex: col.dataIndex,
-          filters: col.filters
-        })), {}, {
-          filters: col.filters
-        });
-      }
-      return _objectSpread(_objectSpread(_objectSpread({}, col), filterObj), {}, {
-        sortIcon: function sortIcon(props) {
-          return /*#__PURE__*/React.createElement(SortIcon, props);
-        },
-        onCell: function onCell(record) {
-          return _objectSpread(_objectSpread({
-            record: record
-          }, item), {}, {
-            handleSave: handleSave
-          });
-        },
-        onHeaderCell: function onHeaderCell(record) {
-          return _objectSpread(_objectSpread({
-            record: record
-          }, item), {}, {
-            onResize: handleResize(index)
-          });
-        }
-      });
-    });
-  }, [defaultColumns]);
+  var _useTransColumns = useTransColumns({
+      columns: column_setting,
+      form: form,
+      localPagination: !!(tableProps !== null && tableProps !== void 0 && (_tableProps$paginatio = tableProps.pagination) !== null && _tableProps$paginatio !== void 0 && _tableProps$paginatio.localPagination),
+      handleResize: handleResize,
+      handleSave: handleSave,
+      dragSort: tableProps === null || tableProps === void 0 ? void 0 : tableProps.dragSort
+    }),
+    columns = _useTransColumns.columns;
+  var dataSource = useTransDataSource({
+    dataSource: originDataSource,
+    form: form,
+    localPagination: !!(tableProps !== null && tableProps !== void 0 && (_tableProps$paginatio2 = tableProps.pagination) !== null && _tableProps$paginatio2 !== void 0 && _tableProps$paginatio2.localPagination),
+    rowKey: tableProps.rowKey,
+    filter: filter
+  });
+  var components = useGenTableComponents({
+    form: form
+  });
+  var scroll = useGenScroll({
+    wrapHeight: height || 500,
+    scroll: tableProps.scroll,
+    columns: columns
+  });
   var showTotal = useCallback(function (total, range, pageSize) {
     var start = range[0] - 1;
     var _current = start / pageSize + 1;
-    return "Page ".concat(_current, " of ").concat(Math.ceil(total / pageSize));
+    return getText("table-pagination-total")(_current, Math.ceil(total / pageSize));
   }, []);
   var _paginationConfig = useMemo(function () {
     if (tableProps.pagination === false) {
@@ -137,26 +107,19 @@ var GridViewTable = function GridViewTable(_ref) {
     });
   }, [responsive, tableProps.pagination]);
   return /*#__PURE__*/React.createElement("div", {
-    className: "materials-grid-table-wrap"
-  }, /*#__PURE__*/React.createElement(SortRow, null, /*#__PURE__*/React.createElement(BasicTable, _extends({
+    className: "materials-grid-table-wrap",
+    ref: tableWrapRef
+  }, /*#__PURE__*/React.createElement(SortRow, {
+    rowKey: tableProps.rowKey,
+    onSortChange: tableProps.onSortChange
+  }, /*#__PURE__*/React.createElement(BasicTable, _extends({
     dataSource: dataSource,
     columns: columns,
     className: "grid-view-table",
-    components: {
-      header: {
-        row: Header.Row,
-        cell: Header.Cell
-      },
-      body: {
-        row: Body.Row,
-        cell: Body.Coll
-      }
-    }
+    components: components
   }, tableProps, {
-    scroll: {
-      x: "max-content"
-    },
+    scroll: scroll,
     pagination: _paginationConfig
   }))));
 };
-export default GridViewTable;
+export default /*#__PURE__*/memo(GridViewTable);

package/es/components/table/Table/index.less

@@ -7,9 +7,16 @@
   .grid-view-table {
     // margin-top: 20px;
     // width: max-content;
-
   }
 
+  .pisell-lowcode-table-group-row-wrap {
+    .pisell-lowcode-table-cell {
+      margin-top: 12px;
+    }
+  }
+}
 
-
-}
+.materials-grid-table-wrap {
+  flex: 1;
+  overflow: auto;
+}

package/es/components/table/Table/tableConfig/SortRow/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 import "./index.less";
-declare const SortRow: ({ children }: any) => JSX.Element;
+declare const SortRow: ({ children, rowKey, onSortChange }: any) => React.JSX.Element;
 export default SortRow;

package/es/components/table/Table/tableConfig/SortRow/index.js

@@ -1,37 +1,90 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+import React, { useRef } from "react";
+import { isFunction } from "@pisell/utils";
+import { DndContext } from "@dnd-kit/core";
+import { restrictToVerticalAxis } from "@dnd-kit/modifiers";
+import { arrayMove, SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable";
+import { getIdByRowKey } from "../../utils";
 import { useSharedState } from "../../../../../hooks";
 import { Context } from "../../../model";
 import "./index.less";
-import React from "react";
-import { DndContext } from "@dnd-kit/core";
-import { restrictToVerticalAxis } from "@dnd-kit/modifiers";
-import { SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable";
 var SortRow = function SortRow(_ref) {
-  var children = _ref.children;
+  var children = _ref.children,
+    rowKey = _ref.rowKey,
+    onSortChange = _ref.onSortChange;
   var _useSharedState = useSharedState(Context),
     state = _useSharedState.state,
     dispatch = _useSharedState.dispatch;
-  var dataSource = state.dataSource;
-  var onDragEnd = function onDragEnd(_ref2) {
-    var active = _ref2.active,
-      over = _ref2.over;
-    if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
-      // setDataSource((previous) => {
-      //   const activeIndex = previous.findIndex((i) => i.key === active.id);
-      //   const overIndex = previous.findIndex((i) => i.key === over?.id);
-      //   return arrayMove(previous, activeIndex, overIndex);
-      // });
-    }
-  };
+  var originDataSource = state.originDataSource;
+  var oldOriginDataSource = useRef(null);
+  var onDragEnd = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
+      var active, over, activeIndex, overIndex, newData, isError;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            active = _ref2.active, over = _ref2.over;
+            if (!(active.id !== (over === null || over === void 0 ? void 0 : over.id))) {
+              _context.next = 12;
+              break;
+            }
+            activeIndex = originDataSource.findIndex(function (i) {
+              return getIdByRowKey(i, rowKey) === active.id;
+            });
+            overIndex = originDataSource.findIndex(function (i) {
+              return getIdByRowKey(i, rowKey) === (over === null || over === void 0 ? void 0 : over.id);
+            });
+            newData = arrayMove(originDataSource, activeIndex, overIndex);
+            dispatch({
+              type: "setOriginDataSource",
+              payload: newData
+            });
+            if (!isFunction(onSortChange)) {
+              _context.next = 12;
+              break;
+            }
+            oldOriginDataSource.current = originDataSource;
+            _context.next = 10;
+            return onSortChange({
+              fromIndex: activeIndex,
+              toIndex: overIndex,
+              dataSource: newData,
+              fromId: active.id,
+              toId: over === null || over === void 0 ? void 0 : over.id,
+              fromItem: originDataSource[activeIndex],
+              toItem: originDataSource[overIndex]
+            });
+          case 10:
+            isError = _context.sent;
+            if (isError) {
+              dispatch({
+                type: "setOriginDataSource",
+                payload: oldOriginDataSource.current
+              });
+            } else {
+              oldOriginDataSource.current = null;
+            }
+          case 12:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onDragEnd(_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
   return /*#__PURE__*/React.createElement("div", {
     className: "grid-view-table-wrap"
   }, /*#__PURE__*/React.createElement(DndContext, {
     modifiers: [restrictToVerticalAxis],
     onDragEnd: onDragEnd
-  }, /*#__PURE__*/React.createElement(SortableContext
-  // rowKey array
-  , {
-    items: dataSource.map(function (i) {
-      return i.key;
+  }, /*#__PURE__*/React.createElement(SortableContext, {
+    items: originDataSource.map(function (i) {
+      return getIdByRowKey(i, rowKey);
     }),
     strategy: verticalListSortingStrategy
   }, children)));

package/es/components/table/Table/tableConfig/body/CellContent/index.less

@@ -6,7 +6,6 @@
   align-items: center;
   justify-content: center;
   border-radius: 4px;
-  padding: 12px;
 
   &.focus {
     box-shadow: rgb(22, 110, 225) 0px 0px 0px 1px !important;

package/es/components/table/Table/tableConfig/body/CellProvider/index.js

@@ -31,7 +31,9 @@ var CellProvider = function CellProvider(props) {
     record = props.record,
     handleSave = props.handleSave,
     render = props.render;
-  if (render) {
+  var _ref = record || {},
+    __is_group = _ref.__is_group;
+  if (render || __is_group) {
     return children;
   }
   var _useState = useState(false),
@@ -58,7 +60,7 @@ var CellProvider = function CellProvider(props) {
     form.setFieldsValue(_defineProperty({}, dataIndex, record[dataIndex]));
   };
   var save = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -83,7 +85,7 @@ var CellProvider = function CellProvider(props) {
       }, _callee, null, [[0, 8]]);
     }));
     return function save() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var childNode = children;

package/es/components/table/Table/tableConfig/body/CellProvider/index.less

@@ -5,7 +5,7 @@
   align-items: center;
   justify-content: center;
   border-radius: 4px;
-  padding: 12px;
+  padding: 0;
 
   &.focus {
     box-shadow: var(--theme-color) 0px 0px 0px 1px !important;

package/es/components/table/Table/tableConfig/body/index.d.ts

@@ -8,11 +8,14 @@ interface Item {
     age: string;
     address: string;
 }
-interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
+export interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     index: number;
     "data-row-key": string;
+    __is_group?: boolean;
+    __table_group_field?: string;
+    __table_data_source_children?: Record<string, any>[];
 }
-interface EditableCellProps {
+export interface EditableCellProps {
     title: React.ReactNode;
     editable: boolean;
     children: React.ReactNode;

package/es/components/table/Table/tableConfig/body/index.js

@@ -1,6 +1,12 @@
-var _excluded = ["index"],
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var _excluded = ["index", "__is_group", "children"],
   _excluded2 = ["title", "editable", "children", "dataIndex", "field_type", "record", "handleSave", "lock", "render"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -9,24 +15,85 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { Form } from "antd";
+import { Form, Tooltip } from "antd";
+import { useSortable } from "@dnd-kit/sortable";
+import { CSS } from "@dnd-kit/utilities";
+import { MenuOutlined } from "@ant-design/icons";
 import classNames from "classnames";
-import React from "react";
+import React, { useMemo } from "react";
 import CellProvider from "./CellProvider";
+import { getText } from "../../../../../locales";
 import "./index.less";
 export var EditableContext = /*#__PURE__*/React.createContext(null);
 var EditableRow = function EditableRow(_ref) {
   var index = _ref.index,
+    __is_group = _ref.__is_group,
+    children = _ref.children,
     props = _objectWithoutProperties(_ref, _excluded);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
+  var parentForm = Form.useFormInstance();
+  var order_by = Form.useWatch("order_by", parentForm);
+  var _useSortable = useSortable({
+      id: props["data-row-key"]
+    }),
+    attributes = _useSortable.attributes,
+    listeners = _useSortable.listeners,
+    setNodeRef = _useSortable.setNodeRef,
+    setActivatorNodeRef = _useSortable.setActivatorNodeRef,
+    transform = _useSortable.transform,
+    transition = _useSortable.transition,
+    isDragging = _useSortable.isDragging;
+  var style = _objectSpread(_objectSpread({}, props.style), {}, {
+    transform: CSS.Transform.toString(transform && _objectSpread(_objectSpread({}, transform), {}, {
+      scaleY: 1
+    })),
+    transition: transition
+  }, isDragging ? {
+    position: "relative",
+    zIndex: 9999
+  } : {});
+  var cells = useMemo(function () {
+    if (__is_group) {
+      return children;
+    }
+    return React.Children.map(children, function (child) {
+      if (child.key === "__sort") {
+        var handleIcon = order_by ? /*#__PURE__*/React.createElement(Tooltip, {
+          title: getText("table-column-drag-sort-disabled-tip")
+        }, /*#__PURE__*/React.createElement(MenuOutlined, {
+          style: {
+            touchAction: "none",
+            cursor: "move"
+          }
+        })) : /*#__PURE__*/React.createElement(MenuOutlined, _extends({
+          ref: setActivatorNodeRef,
+          style: {
+            touchAction: "none",
+            cursor: "move"
+          }
+        }, listeners));
+        return /*#__PURE__*/React.cloneElement(child, {
+          children: handleIcon
+        });
+      }
+      return child;
+    });
+  }, [__is_group, children, order_by, setActivatorNodeRef, listeners]);
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
     component: false
   }, /*#__PURE__*/React.createElement(EditableContext.Provider, {
     value: form
-  }, /*#__PURE__*/React.createElement("tr", props)));
+  }, __is_group && /*#__PURE__*/React.createElement("tr", {
+    style: {
+      height: 12
+    }
+  }), /*#__PURE__*/React.createElement("tr", _extends({}, props, {
+    ref: setNodeRef,
+    style: style
+  }, attributes), cells)));
 };
 var EditableCell = function EditableCell(props) {
   var title = props.title,

package/es/components/table/Table/tableConfig/body/index.less

@@ -5,6 +5,6 @@
 
 .materials-grid-table-cell {
   height: 1px;
-  padding: 0 !important;
+  padding: 12px;
 
 }

package/es/components/table/Table/tableConfig/header/CellProvider/index.less

@@ -2,7 +2,7 @@
   height: 44px;
   display: flex;
   align-items: center;
-  padding: 0 14px;
+  padding: 0;
 
   .field-icon {
     font-size: 18px;

package/es/components/table/Table/tableConfig/header/index.d.ts

@@ -1,6 +1,6 @@
 import "react-resizable/css/styles.css";
 import React from "react";
-interface CustomHeaderCellProps {
+export interface CustomHeaderCellProps {
     children: React.ReactNode;
     dataIndex: any;
     record: object;

package/es/components/table/Table/tableConfig/summary/index.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const summary: (props: any) => JSX.Element;
+import React from "react";
+declare const summary: (props: any) => React.JSX.Element;
 export default summary;