@arim-aisdc/public-components 0.0.2 → 0.0.4

package/dist/{TableMax/index.js → components/TableMax/TableMax.js}

@@ -1,4 +1,12 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+import "antd/es/pagination/style";
+import _Pagination from "antd/es/pagination";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
+import "antd/es/checkbox/style";
+import _Checkbox from "antd/es/checkbox";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 var _this = this;
 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 e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 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); } }
@@ -19,30 +27,23 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { getTextWidth } from "../../src/utils/index";
 import { MinusSquareOutlined, PlusSquareOutlined } from '@ant-design/icons';
 import { getCoreRowModel, getExpandedRowModel, getFacetedUniqueValues, getFilteredRowModel, getSortedRowModel, useReactTable } from '@tanstack/react-table';
-import { Button, Checkbox, Form, Pagination } from 'antd';
 import { cloneDeep } from 'lodash';
 import moment from 'moment';
 import React, { createContext, useEffect, useImperativeHandle, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
+import TableBody from "./TableBody";
+import TableHeader from "./TableHeader";
 import { InputType } from "./components/ColumnEdit";
 import { setDefaultFilterFn } from "./components/ColumnFilter";
 import customFilterFns from "./components/ColumnFilter/customFilterFns";
 import ColumnSetting from "./components/ColumnSetting";
-// import ScrollBar from './components/ScrollBar';
-import "./index.less";
-// import TableCore from './Table';
+import "./tableMax.less";
 import { getSizeInfo } from "./utils";
-// import { useUpdateEffect } from 'ahooks';
-import TableBody from "./TableBody";
-import TableHeader from "./TableHeader";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-export { InputType } from "./components/ColumnEdit";
-export { FilterType, setDefaultFilterFn } from "./components/ColumnFilter";
 export var ColumnType = /*#__PURE__*/function (ColumnType) {
   ColumnType["Selection"] = "selection-column";
   ColumnType["Darg"] = "darg-column";
@@ -81,17 +82,18 @@ var TableMax = function TableMax(_ref) {
     changePagination = _ref.changePagination,
     _ref$defaultScrollY = _ref.defaultScrollY,
     defaultScrollY = _ref$defaultScrollY === void 0 ? 600 : _ref$defaultScrollY,
-    _ref$defaultIsSplit = _ref.defaultIsSplit,
-    defaultIsSplit = _ref$defaultIsSplit === void 0 ? true : _ref$defaultIsSplit,
+    _ref$columnResizeMode = _ref.columnResizeMode,
+    columnResizeMode = _ref$columnResizeMode === void 0 ? 'onChange' : _ref$columnResizeMode,
     rowKey = _ref.rowKey,
-    filterFn = _ref.filterFn,
     refreshFun = _ref.refreshFun,
     _ref$canRefresh = _ref.canRefresh,
     canRefresh = _ref$canRefresh === void 0 ? true : _ref$canRefresh,
     _ref$canSetting = _ref.canSetting,
     canSetting = _ref$canSetting === void 0 ? true : _ref$canSetting,
     _ref$canFilter = _ref.canFilter,
-    canFilter = _ref$canFilter === void 0 ? false : _ref$canFilter,
+    canFilter = _ref$canFilter === void 0 ? true : _ref$canFilter,
+    _ref$defaultEnableFil = _ref.defaultEnableFilters,
+    defaultEnableFilters = _ref$defaultEnableFil === void 0 ? false : _ref$defaultEnableFil,
     _ref$canSelection = _ref.canSelection,
     canSelection = _ref$canSelection === void 0 ? false : _ref$canSelection,
     _ref$canRowDrag = _ref.canRowDrag,
@@ -116,7 +118,6 @@ var TableMax = function TableMax(_ref) {
     renderOperateRight = _ref.renderOperateRight,
     _ref$loading = _ref.loading,
     loading = _ref$loading === void 0 ? false : _ref$loading,
-    global = _ref.global,
     rowClassName = _ref.rowClassName,
     cellClassName = _ref.cellClassName,
     rowStyle = _ref.rowStyle,
@@ -133,8 +134,6 @@ var TableMax = function TableMax(_ref) {
       return false;
     } : _ref$getRowCanExpand,
     renderSubComponent = _ref.renderSubComponent,
-    _ref$isAllRowExpanded = _ref.isAllRowExpanded,
-    isAllRowExpanded = _ref$isAllRowExpanded === void 0 ? false : _ref$isAllRowExpanded,
     refInstance = _ref.refInstance,
     _ref$onSelectAllChang = _ref.onSelectAllChange,
     onSelectAllChange = _ref$onSelectAllChang === void 0 ? function () {
@@ -156,7 +155,11 @@ var TableMax = function TableMax(_ref) {
     _ref$autoHeight = _ref.autoHeight,
     autoHeight = _ref$autoHeight === void 0 ? false : _ref$autoHeight,
     _ref$emptyDataHeight = _ref.emptyDataHeight,
-    emptyDataHeight = _ref$emptyDataHeight === void 0 ? 100 : _ref$emptyDataHeight;
+    emptyDataHeight = _ref$emptyDataHeight === void 0 ? 100 : _ref$emptyDataHeight,
+    _ref$rowCanDrop = _ref.rowCanDrop,
+    rowCanDrop = _ref$rowCanDrop === void 0 ? function () {
+      return true;
+    } : _ref$rowCanDrop;
   var columns = useMemo(function () {
     // 列筛选：给columns配置默认的过滤函数
     return setDefaultFilterFn(cloneDeep(originColumns));
@@ -218,32 +221,24 @@ var TableMax = function TableMax(_ref) {
     _useState18 = _slicedToArray(_useState17, 2),
     columnPinning = _useState18[0],
     setColumnPinning = _useState18[1];
-  var _useState19 = useState(defaultIsSplit),
-    _useState20 = _slicedToArray(_useState19, 2),
-    isSplit = _useState20[0],
-    setIsSplit = _useState20[1];
   /**列宽 */
-  var _useState21 = useState('onChange'),
+  var _useState19 = useState([]),
+    _useState20 = _slicedToArray(_useState19, 2),
+    columnSizes = _useState20[0],
+    setColumnSizes = _useState20[1];
+  var _useState21 = useState([]),
     _useState22 = _slicedToArray(_useState21, 2),
-    columnResizeMode = _useState22[0],
-    setColumnResizeMode = _useState22[1];
-  var _useState23 = useState([]),
+    visibleColumnSizes = _useState22[0],
+    setVisibleColumnSizes = _useState22[1];
+  /**列筛选 */
+  var _useState23 = useState(defaultColumnFilters),
     _useState24 = _slicedToArray(_useState23, 2),
-    columnSizes = _useState24[0],
-    setColumnSizes = _useState24[1];
-  var _useState25 = useState([]),
+    columnFilters = _useState24[0],
+    setColumnFilters = _useState24[1];
+  var _useState25 = useState(''),
     _useState26 = _slicedToArray(_useState25, 2),
-    visibleColumnSizes = _useState26[0],
-    setVisibleColumnSizes = _useState26[1];
-  /**列筛选 */
-  var _useState27 = useState(defaultColumnFilters),
-    _useState28 = _slicedToArray(_useState27, 2),
-    columnFilters = _useState28[0],
-    setColumnFilters = _useState28[1];
-  var _useState29 = useState(''),
-    _useState30 = _slicedToArray(_useState29, 2),
-    globalFilter = _useState30[0],
-    setGlobalFilter = _useState30[1];
+    globalFilter = _useState26[0],
+    setGlobalFilter = _useState26[1];
   /**分页 */
   var pagination = useMemo(function () {
     return typeof skipCount === 'number' && pageSize ? {
@@ -252,63 +247,118 @@ var TableMax = function TableMax(_ref) {
     } : undefined;
   }, [skipCount, pageSize]);
   /**是否有分组 */
-  var _useState31 = useState(false),
-    _useState32 = _slicedToArray(_useState31, 2),
-    hasGroup = _useState32[0],
-    setHasGroup = _useState32[1];
+  var _useState27 = useState(false),
+    _useState28 = _slicedToArray(_useState27, 2),
+    hasGroup = _useState28[0],
+    setHasGroup = _useState28[1];
 
   /**表格宽度计算 */
-  var _useState33 = useState(),
-    _useState34 = _slicedToArray(_useState33, 2),
-    tableContainerWidth = _useState34[0],
-    setTableContainerWidth = _useState34[1];
+  var _useState29 = useState(),
+    _useState30 = _slicedToArray(_useState29, 2),
+    tableContainerWidth = _useState30[0],
+    setTableContainerWidth = _useState30[1];
   var _React$useState = React.useState({}),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     expanded = _React$useState2[0],
     setExpanded = _React$useState2[1];
 
   /**table-head高度 */
-  var _useState35 = useState(0),
-    _useState36 = _slicedToArray(_useState35, 2),
-    tableHeadHeight = _useState36[0],
-    setTableHeadHeight = _useState36[1];
+  var _useState31 = useState(0),
+    _useState32 = _slicedToArray(_useState31, 2),
+    tableHeadHeight = _useState32[0],
+    setTableHeadHeight = _useState32[1];
 
   /**table-body 高度 */
-  var _useState37 = useState(defaultScrollY),
-    _useState38 = _slicedToArray(_useState37, 2),
-    tableBodyHeight = _useState38[0],
-    setTableBodyHeight = _useState38[1];
+  var _useState33 = useState(defaultScrollY),
+    _useState34 = _slicedToArray(_useState33, 2),
+    tableBodyHeight = _useState34[0],
+    setTableBodyHeight = _useState34[1];
 
   /**table-body-content 高度 */
-  var _useState39 = useState(tableDatas.length * Number(rowHeight)),
-    _useState40 = _slicedToArray(_useState39, 2),
-    bodyContentHeight = _useState40[0],
-    setBodyContentHeight = _useState40[1];
+  // const [bodyContentHeight, setBodyContentHeight] = useState(tableDatas.length * Number(rowHeight));
+  var bodyContentHeight = useMemo(function () {
+    return tableDatas.length * Number(rowHeight);
+  }, [tableDatas.length, rowHeight]);
 
   /**是否正在多行拖拽 */
-  var _useState41 = useState(false),
-    _useState42 = _slicedToArray(_useState41, 2),
-    selectedRowDragging = _useState42[0],
-    setSelectedRowDragging = _useState42[1];
-  var _useState43 = useState(true),
-    _useState44 = _slicedToArray(_useState43, 2),
-    enableFilters = _useState44[0],
-    setEnableFilters = _useState44[1];
-  var _Form$useForm = Form.useForm(),
+  var _useState35 = useState(false),
+    _useState36 = _slicedToArray(_useState35, 2),
+    selectedRowDragging = _useState36[0],
+    setSelectedRowDragging = _useState36[1];
+  var _useState37 = useState(defaultEnableFilters),
+    _useState38 = _slicedToArray(_useState37, 2),
+    enableFilters = _useState38[0],
+    setEnableFilters = _useState38[1];
+  var _Form$useForm = _Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   /**正在编辑的行id*/
-  var _useState45 = useState(''),
-    _useState46 = _slicedToArray(_useState45, 2),
-    editingRowId = _useState46[0],
-    setEditingRowId = _useState46[1];
+  var _useState39 = useState(''),
+    _useState40 = _slicedToArray(_useState39, 2),
+    editingRowId = _useState40[0],
+    setEditingRowId = _useState40[1];
 
   // 表格table-max-content元素
   var tableContentRef = useRef(null);
-  var _useState47 = useState(false),
-    _useState48 = _slicedToArray(_useState47, 2),
-    hasVerticalScrollBar = _useState48[0],
-    setHasVerticalScrollBar = _useState48[1];
+  var _useState41 = useState(false),
+    _useState42 = _slicedToArray(_useState41, 2),
+    hasVerticalScrollBar = _useState42[0],
+    setHasVerticalScrollBar = _useState42[1];
+  var table = useReactTable({
+    data: tableDatas,
+    // defaultColumn: defaultColumn,
+    // @ts-ignore
+    columns: tableColumns,
+    // 自定义的过滤函数
+    filterFns: customFilterFns,
+    // 自定义Row.id
+    getRowId: function getRowId(originalRow, index) {
+      return rowKey ? originalRow[rowKey] : index;
+    },
+    state: {
+      columnVisibility: columnVisibility,
+      // defaultColumn,
+      // @ts-ignore TODO: 传的state不在table内部已有的state范围内，待优化
+      columnSizes: columnSizes,
+      visibleColumnSizes: visibleColumnSizes,
+      columnOrder: columnOrder,
+      pagination: pagination,
+      sorting: canSorting ? sorting : undefined,
+      columnPinning: columnPinning,
+      columnFilters: columnFilters,
+      globalFilter: globalFilter,
+      rowSelection: rowSelection,
+      expanded: expanded
+    },
+    onColumnVisibilityChange: setColumnVisibility,
+    onColumnOrderChange: setColumnOrder,
+    onColumnPinningChange: setColumnPinning,
+    getCoreRowModel: getCoreRowModel(),
+    getExpandedRowModel: getExpandedRowModel(),
+    onColumnFiltersChange: setColumnFilters,
+    getFacetedUniqueValues: getFacetedUniqueValues(),
+    getFilteredRowModel: getFilteredRowModel(),
+    onGlobalFilterChange: setGlobalFilter,
+    manualPagination: true,
+    manualSorting: manualSorting,
+    manualFiltering: manualFiltering,
+    enableFilters: enableFilters,
+    debugTable: false,
+    debugHeaders: false,
+    debugColumns: false,
+    columnResizeMode: columnResizeMode,
+    getRowCanExpand: getRowCanExpand,
+    enableMultiSort: enableMultiSort,
+    isMultiSortEvent: function isMultiSortEvent() {
+      return enableMultiSort;
+    },
+    onSortingChange: setSorting,
+    getSortedRowModel: getSortedRowModel(),
+    onRowSelectionChange: setRowSelection,
+    enableRowSelection: enableRowSelection,
+    onExpandedChange: setExpanded,
+    sortDescFirst: true // 首次排序为递减排序，不加这个属性的话，有些列的排序会有问题
+  });
 
   // 暴露给外部的api
   useImperativeHandle(refInstance, function () {
@@ -328,24 +378,28 @@ var TableMax = function TableMax(_ref) {
 
   // 设置table-body高度
   useEffect(function () {
-    var _tableContentRef$curr, _tableContentRef$curr2;
+    var _tableContentRef$curr, _tableContentRef$curr2, _tableContentRef$curr3;
     if (datas.length === 0) {
       setTableBodyHeight(emptyDataHeight);
       return;
     }
     var horizontalScrollHeight = table.getCenterTotalSize() > (tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.offsetWidth) ? 10 : 0;
-    var maxBodyHeight = autoHeight ? (tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr2 = tableContentRef.current) === null || _tableContentRef$curr2 === void 0 ? void 0 : _tableContentRef$curr2.clientHeight) - tableHeadHeight - horizontalScrollHeight : defaultScrollY - tableHeadHeight - horizontalScrollHeight;
-    setTableBodyHeight(Math.min(datas.length * rowHeight, maxBodyHeight));
-    setHasVerticalScrollBar(datas.length * rowHeight > maxBodyHeight);
-  }, [tableHeadHeight, datas.length, tableContainerWidth, defaultScrollY]);
+    console.log('horizontalScrollHeight---------', table.getCenterTotalSize(), tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr2 = tableContentRef.current) === null || _tableContentRef$curr2 === void 0 ? void 0 : _tableContentRef$curr2.offsetWidth);
+    var maxBodyHeight = autoHeight ? (tableContentRef === null || tableContentRef === void 0 || (_tableContentRef$curr3 = tableContentRef.current) === null || _tableContentRef$curr3 === void 0 ? void 0 : _tableContentRef$curr3.clientHeight) - tableHeadHeight - horizontalScrollHeight : defaultScrollY - tableHeadHeight - horizontalScrollHeight;
+    setTableBodyHeight(Math.min(bodyContentHeight, maxBodyHeight));
+    setHasVerticalScrollBar(bodyContentHeight > maxBodyHeight);
+  }, [tableHeadHeight, bodyContentHeight, defaultScrollY]);
 
   // 单选多选-控制选中行
   useEffect(function () {
-    canSelection && setRowSelection(defaultSelectedRowIds.reduce(function (accumulator, currentValue) {
-      accumulator[currentValue] = true;
-      return accumulator;
-    }, {}));
-    !canSelection && setRowSelectedId(defaultSelectedRowId);
+    if (canSelection) {
+      setRowSelection(defaultSelectedRowIds.reduce(function (accumulator, currentValue) {
+        accumulator[currentValue] = true;
+        return accumulator;
+      }, {}));
+    } else {
+      setRowSelectedId(defaultSelectedRowId);
+    }
   }, [defaultSelectedRowId, JSON.stringify(defaultSelectedRowIds), canSelection]);
 
   /** 列表行是否支持展开 和 多选 */
@@ -381,7 +435,7 @@ var TableMax = function TableMax(_ref) {
         id: ColumnType.Selection,
         header: function header(_ref3) {
           var table = _ref3.table;
-          return /*#__PURE__*/_jsx(Checkbox, {
+          return /*#__PURE__*/_jsx(_Checkbox, {
             checked: table.getIsAllRowsSelected(),
             indeterminate: table.getIsSomeRowsSelected(),
             onChange: selectAllChange.bind(_this, table),
@@ -393,7 +447,7 @@ var TableMax = function TableMax(_ref) {
         },
         cell: function cell(_ref4) {
           var row = _ref4.row;
-          return /*#__PURE__*/_jsx(Checkbox, {
+          return /*#__PURE__*/_jsx(_Checkbox, {
             checked: row.getIsSelected(),
             disabled: !row.getCanSelect(),
             indeterminate: row.getIsSomeSelected(),
@@ -464,60 +518,6 @@ var TableMax = function TableMax(_ref) {
     }
     setColumnOrder(arr);
   };
-  var table = useReactTable({
-    data: tableDatas,
-    // defaultColumn: defaultColumn,
-    columns: tableColumns,
-    // 自定义的过滤函数
-    filterFns: customFilterFns,
-    // 自定义Row.id
-    getRowId: function getRowId(originalRow, index) {
-      return rowKey ? originalRow[rowKey] : index;
-    },
-    state: {
-      columnVisibility: columnVisibility,
-      // defaultColumn,
-      columnSizes: columnSizes,
-      visibleColumnSizes: visibleColumnSizes,
-      columnOrder: columnOrder,
-      pagination: pagination,
-      sorting: canSorting ? sorting : undefined,
-      columnPinning: columnPinning,
-      columnFilters: columnFilters,
-      globalFilter: globalFilter,
-      rowSelection: rowSelection,
-      expanded: expanded
-    },
-    onColumnVisibilityChange: setColumnVisibility,
-    onColumnOrderChange: setColumnOrder,
-    onColumnPinningChange: setColumnPinning,
-    getCoreRowModel: getCoreRowModel(),
-    getExpandedRowModel: getExpandedRowModel(),
-    onColumnFiltersChange: setColumnFilters,
-    getFacetedUniqueValues: getFacetedUniqueValues(),
-    getFilteredRowModel: getFilteredRowModel(),
-    onGlobalFilterChange: setGlobalFilter,
-    manualPagination: true,
-    manualSorting: manualSorting,
-    manualFiltering: manualFiltering,
-    enableFilters: enableFilters,
-    debugTable: false,
-    debugHeaders: false,
-    debugColumns: false,
-    columnResizeMode: columnResizeMode,
-    getRowCanExpand: getRowCanExpand,
-    enableMultiSort: enableMultiSort,
-    isMultiSortEvent: function isMultiSortEvent() {
-      return enableMultiSort;
-    },
-    onSortingChange: setSorting,
-    getSortedRowModel: getSortedRowModel(),
-    onRowSelectionChange: setRowSelection,
-    enableRowSelection: enableRowSelection,
-    onExpandedChange: setExpanded,
-    sortDescFirst: true // 首次排序为递减排序，不加这个属性的话，有些列的排序会有问题
-  });
-
   useEffect(function () {
     var _localStorage$getItem2, _document$getElementB;
     // 列宽度计算-初始化
@@ -538,7 +538,7 @@ var TableMax = function TableMax(_ref) {
       allCount = _getSizeInfo.allCount,
       hasSizeCount = _getSizeInfo.hasSizeCount,
       hasSizeAllWidth = _getSizeInfo.hasSizeAllWidth;
-    //表格宽度，offsetWidth?下面监听里用的scrollWidth
+    //表格宽度，offsetWidth?下面监听里用的clientWidth
     var tableContainerWidth = ((_document$getElementB = document.getElementById("".concat(tableId, "-TableCore"))) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.offsetWidth) || 1000;
     console.log('tableContainerWidth initColumn', tableContainerWidth);
     // 空白宽度
@@ -555,10 +555,10 @@ var TableMax = function TableMax(_ref) {
         });
       });
     } else {
-      // TODO: 什么作用？
       newColumns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
         return _objectSpread({
-          size: (item === null || item === void 0 ? void 0 : item.type) === 'date' ? 160 : getTextWidth(item.header, 14) + 50,
+          size: 60,
+          // 默认宽度60
           maxSize: 500
         }, item);
       });
@@ -572,6 +572,8 @@ var TableMax = function TableMax(_ref) {
       return (column === null || column === void 0 ? void 0 : column.columns) && ((_column$columns = column.columns) === null || _column$columns === void 0 ? void 0 : _column$columns.length) > 0;
     }) > -1);
   }, [columns]);
+
+  // 添加空白列
   useEffect(function () {
     var _table$getAllColumns, _table$getVisibleLeaf;
     // 未固定列的宽度总和
@@ -710,9 +712,12 @@ var TableMax = function TableMax(_ref) {
       columnFilters: tableState.columnFilters,
       columnSorting: tableState.sorting,
       enableFilters: enableFilters,
+      // @ts-ignore
       columnSizes: tableState.columnSizes
     }));
-  }, [table.getState().columnVisibility, table.getState().columnPinning, table.getState().columnOrder, table.getState().columnFilters, table.getState().sorting, enableFilters, table.getState().columnSizes]);
+  }, [table.getState().columnVisibility, table.getState().columnPinning, table.getState().columnOrder, table.getState().columnFilters, table.getState().sorting, enableFilters,
+  // @ts-ignore
+  table.getState().columnSizes]);
 
   // const reorderRow = (dragFromRowIndex: number, targetRowIndex: number) => {
   //   const draggedRows = table.getSelectedRowModel()?.rows || [];
@@ -762,6 +767,7 @@ var TableMax = function TableMax(_ref) {
       sourceTableId = fromDatas.sourceTableId;
     var hoverRow = toDatas.hoverRow,
       targetTableId = toDatas.targetTableId;
+    if (!rowCanDrop(toDatas, fromDatas)) return;
     var dragFromRowIndex = draggedRow.index;
     var targetRowIndex = hoverRow.index;
     var draggedRowsIndexList = draggedRows === null || draggedRows === void 0 ? void 0 : draggedRows.map(function (row) {
@@ -808,7 +814,7 @@ var TableMax = function TableMax(_ref) {
       newTableDatas = tableDatas.filter(function (data, idx) {
         return !draggedRowsIndexList.includes(idx);
       });
-      (_newTableDatas2 = newTableDatas).splice.apply(_newTableDatas2, [targetRowIndex - aheadOfTargetRowNumber, 0].concat(draggedDatas));
+      (_newTableDatas2 = newTableDatas).splice.apply(_newTableDatas2, [targetRowIndex > dragFromRowIndex ? targetRowIndex - aheadOfTargetRowNumber + 1 : targetRowIndex - aheadOfTargetRowNumber, 0].concat(draggedDatas));
       setTableDatas(_toConsumableArray(newTableDatas));
     } else {
       // 单选行拖动
@@ -827,31 +833,6 @@ var TableMax = function TableMax(_ref) {
       updatedTableDatas: newTableDatas
     });
   };
-  /**纵向滚动高度 */
-  var _useState49 = useState(0),
-    _useState50 = _slicedToArray(_useState49, 2),
-    scroll = _useState50[0],
-    setScroll = _useState50[1];
-  var onScroll = function onScroll(event) {
-    // if (!event?.currentTarget) return;
-    // event.preventDefault();
-    // event.stopPropagation();
-    // const scrollLeft = event?.currentTarget?.scrollLeft;
-    // const clientWidth = event?.currentTarget.clientWidth;
-    // const scrollWidth = event?.currentTarget?.scrollWidth;
-    // const elementLeft = document.querySelector(`.${tableId}-left`) as Element;
-    // const elementRight = document.querySelector(`.${tableId}-right`) as Element;
-    // if (!scrollLeft) {
-    //   !!elementLeft && (elementLeft.style.boxShadow = 'none');
-    //   !!elementRight && (elementRight.style.boxShadow = 'inset -10px 0 8px -8px rgba(0, 0, 0, 0.15)');
-    // } else if (scrollLeft + clientWidth >= scrollWidth) {
-    //   !!elementLeft && (elementLeft.style.boxShadow = 'inset 10px 0 8px -8px rgba(0, 0, 0, 0.15)');
-    //   !!elementRight && (elementRight.style.boxShadow = 'none');
-    // } else {
-    //   !!elementLeft && (elementLeft.style.boxShadow = 'inset 10px 0 8px -8px rgba(0, 0, 0, 0.15)');
-    //   !!elementRight && (elementRight.style.boxShadow = 'inset -10px 0 8px -8px rgba(0, 0, 0, 0.15)');
-    // }
-  };
 
   // 是否可点击编辑按钮:当且仅当选中一行时可点击编辑按钮
   var canClickEditIcon = useMemo(function () {
@@ -912,6 +893,7 @@ var TableMax = function TableMax(_ref) {
       save();
     }
   };
+
   // 编辑时，监听click事件，点击其他行时，触发保存;
   useEffect(function () {
     var tableBodyTBodyDom = document.getElementById("table-max-tableBody-tbody-".concat(tableId));
@@ -955,22 +937,19 @@ var TableMax = function TableMax(_ref) {
     canSelection: canSelection,
     canRowDrag: canRowDrag,
     canFilter: canFilter,
-    rowSelectionChange: rowSelectionChange,
     tableBodyHeight: tableBodyHeight,
-    setScroll: setScroll,
-    scroll: scroll,
+    // setScroll,
+    // scroll,
     rowHeight: rowHeight,
     tableHeadHeight: tableHeadHeight,
     setTableHeadHeight: setTableHeadHeight,
     bodyContentHeight: bodyContentHeight,
-    setBodyContentHeight: setBodyContentHeight,
+    // setBodyContentHeight,
     tableContainerWidth: tableContainerWidth,
     rowKey: rowKey,
-    filterFn: filterFn,
     hasGroup: hasGroup,
     tableDatas: tableDatas,
     canSorting: canSorting,
-    loading: loading,
     rowClassName: rowClassName,
     cellClassName: cellClassName,
     rowStyle: rowStyle,
@@ -978,7 +957,7 @@ var TableMax = function TableMax(_ref) {
     getHeaderCellProps: getHeaderCellProps,
     editingRowId: editingRowId,
     renderSubComponent: renderSubComponent,
-    isAllRowExpanded: isAllRowExpanded,
+    // isAllRowExpanded,
     selectedRowDragging: selectedRowDragging,
     setSelectedRowDragging: setSelectedRowDragging,
     onRowMouseEnter: onRowMouseEnter,
@@ -1002,20 +981,18 @@ var TableMax = function TableMax(_ref) {
     onSelectChange: onSelectChange,
     canFilter: canFilter,
     canSelection: canSelection,
-    rowSelectionChange: rowSelectionChange,
-    scroll: scroll,
-    setScroll: setScroll,
+    // scroll,
+    // setScroll,
     tableBodyHeight: tableBodyHeight,
     tableHeadHeight: tableHeadHeight,
     setTableHeadHeight: setTableHeadHeight,
     bodyContentHeight: bodyContentHeight,
-    setBodyContentHeight: setBodyContentHeight,
+    // setBodyContentHeight,
     tableContainerWidth: tableContainerWidth,
     selectedRowDragging: selectedRowDragging,
     setSelectedRowDragging: setSelectedRowDragging,
     canRowDrag: canRowDrag,
     rowKey: rowKey,
-    filterFn: filterFn,
     hasGroup: hasGroup,
     tableDatas: tableDatas,
     canSorting: canSorting,
@@ -1029,7 +1006,7 @@ var TableMax = function TableMax(_ref) {
     editingRowId: editingRowId,
     handleEditRowWhenDClick: handleEditRowWhenDClick,
     renderSubComponent: renderSubComponent,
-    isAllRowExpanded: isAllRowExpanded,
+    // isAllRowExpanded,
     onRowMouseEnter: onRowMouseEnter,
     onRowMouseLeave: onRowMouseLeave,
     onRowMouseClick: onRowMouseClick,
@@ -1055,16 +1032,16 @@ var TableMax = function TableMax(_ref) {
     table: table,
     canFilter: canFilter,
     enableFilters: enableFilters,
-    filterFn: filterFn,
     canSorting: canSorting,
     rowHeight: rowHeight,
     hasGroup: hasGroup,
     headerGroups: table.getHeaderGroups(),
-    getHeaderCellProps: getHeaderCellProps
+    getHeaderCellProps: getHeaderCellProps,
+    columnResizeMode: columnResizeMode
     // hasVerticalScrollBar
   };
 
-  return /*#__PURE__*/_jsx(Form, {
+  return /*#__PURE__*/_jsx(_Form, {
     form: form,
     component: false,
     children: /*#__PURE__*/_jsx(DndProvider, {
@@ -1090,14 +1067,14 @@ var TableMax = function TableMax(_ref) {
             className: "table-max-header-right",
             children: /*#__PURE__*/_jsxs("span", {
               className: "handleRightEditBtn",
-              children: [/*#__PURE__*/_jsx(Button, {
+              children: [/*#__PURE__*/_jsx(_Button, {
                 type: "default",
                 onClick: handleClickCancelEdit,
                 style: {
                   marginRight: 12
                 },
                 children: "\u53D6\u6D88"
-              }), /*#__PURE__*/_jsx(Button, {
+              }), /*#__PURE__*/_jsx(_Button, {
                 type: "primary",
                 onClick: save,
                 children: "\u4FDD\u5B58"
@@ -1127,7 +1104,6 @@ var TableMax = function TableMax(_ref) {
             }), canSetting && /*#__PURE__*/_jsx(ColumnSetting, {
               table: table,
               tableId: tableId,
-              isSplit: isSplit,
               canFilter: canFilter,
               enableFilters: enableFilters,
               canRowDrag: canRowDrag,
@@ -1149,7 +1125,6 @@ var TableMax = function TableMax(_ref) {
             value: _objectSpread({}, TableContextProps),
             children: /*#__PURE__*/_jsxs("div", {
               className: "table-center",
-              onScroll: onScroll,
               ref: tableContentRef,
               children: [/*#__PURE__*/_jsx("div", {
                 ref: tableHeaderRef,
@@ -1172,7 +1147,7 @@ var TableMax = function TableMax(_ref) {
           })
         }), pagination && /*#__PURE__*/_jsx("div", {
           className: "table-max-footer",
-          children: /*#__PURE__*/_jsx(Pagination, {
+          children: /*#__PURE__*/_jsx(_Pagination, {
             pageSize: pageSize,
             total: totalCount,
             defaultPageSize: pageSize,
@@ -1194,14 +1169,8 @@ var TableMax = function TableMax(_ref) {
     })
   });
 };
-
-// const Component = connect(({ global }: any) => ({
-//   global,
-// }))(TableMax);
-
-var Component = TableMax;
 export default /*#__PURE__*/React.forwardRef(function (props, ref) {
-  return /*#__PURE__*/_jsx(Component, _objectSpread(_objectSpread({}, props), {}, {
+  return /*#__PURE__*/_jsx(TableMax, _objectSpread(_objectSpread({}, props), {}, {
     refInstance: ref
   }));
 });