@hi-ui/table 4.3.1 → 4.3.2

package/lib/esm/hooks/use-check.js

@@ -11,39 +11,34 @@ import { useCheck } from '@hi-ui/use-check';
 import React__default from 'react';
 import { useUncontrolledState } from '@hi-ui/use-uncontrolled-state';
 var DEFAULT_CHECKED_ROW_KEYS = [];
-
 var useTableCheck = function useTableCheck(_ref) {
   var rowSelection = _ref.rowSelection,
-      flattedData = _ref.flattedData,
-      fieldKey = _ref.fieldKey;
+    flattedData = _ref.flattedData,
+    fieldKey = _ref.fieldKey;
   var checkRowIsDisabledCheckbox = React__default.useCallback(function (rowItem) {
     var checkboxConfig = rowSelection && rowSelection.getCheckboxConfig && rowSelection.getCheckboxConfig(rowItem);
     return checkboxConfig && checkboxConfig.disabled || false;
   }, [rowSelection]);
-
   var _useUncontrolledState = useUncontrolledState(DEFAULT_CHECKED_ROW_KEYS, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys, rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.onChange),
-      checkedRowKeys = _useUncontrolledState[0],
-      trySetCheckedRowKeys = _useUncontrolledState[1]; // 已选中的行数据集合
-
-
+    checkedRowKeys = _useUncontrolledState[0],
+    trySetCheckedRowKeys = _useUncontrolledState[1];
+  // 已选中的行数据集合
   var checkedRowDataItemsRef = React__default.useRef([]);
-  var checkedRowDataItems = checkedRowDataItemsRef.current; // TODO: 暂时不支持正反选
-
+  var checkedRowDataItems = checkedRowDataItemsRef.current;
+  // TODO: 暂时不支持正反选
   var _useCheck = useCheck({
-    checkedIds: checkedRowKeys,
-    onCheck: function onCheck(checkedRowKeys, rowItem, checked) {
-      trySetCheckedRowKeys(checkedRowKeys, rowItem, checked, checkedRowDataItemsRef.current);
-    },
-    idFieldName: fieldKey
-  }),
-      handleCheckedRowKeysChange = _useCheck[0],
-      isCheckedRowKey = _useCheck[1]; // 选中项变化会触发该函数
-
-
+      checkedIds: checkedRowKeys,
+      onCheck: function onCheck(checkedRowKeys, rowItem, checked) {
+        trySetCheckedRowKeys(checkedRowKeys, rowItem, checked, checkedRowDataItemsRef.current);
+      },
+      idFieldName: fieldKey
+    }),
+    handleCheckedRowKeysChange = _useCheck[0],
+    isCheckedRowKey = _useCheck[1];
+  // 选中项变化会触发该函数
   var onCheckedRowKeysChange = React__default.useCallback(function (rowItem, checked) {
     // 记录选中的行数据集合
     var nextCheckedDataItems = checkedRowDataItems;
-
     if (checked) {
       if (!nextCheckedDataItems.find(function (item) {
         return item[fieldKey] === rowItem[fieldKey];
@@ -55,39 +50,33 @@ var useTableCheck = function useTableCheck(_ref) {
         return item[fieldKey] !== rowItem[fieldKey];
       });
     }
-
     handleCheckedRowKeysChange(rowItem, checked);
-  }, [checkedRowDataItems, fieldKey, handleCheckedRowKeysChange]); // 判断是否全选
-
+  }, [checkedRowDataItems, fieldKey, handleCheckedRowKeysChange]);
+  // 判断是否全选
   var _React$useMemo = React__default.useMemo(function () {
-    if (rowSelection) {
-      if (flattedData.length === 0 || checkedRowKeys.length === 0) {
-        return [false, false];
+      if (rowSelection) {
+        if (flattedData.length === 0 || checkedRowKeys.length === 0) {
+          return [false, false];
+        }
+        var idsCanBeChecked = flattedData.filter(function (item) {
+          return !checkRowIsDisabledCheckbox(item.raw);
+        }).map(function (item) {
+          return item.id;
+        });
+        // TODO: 数组项完全匹配工具函数
+        // TODO: 数组项完全匹配工具函数
+        var _checkedAll = idsCanBeChecked.every(function (id) {
+          return isCheckedRowKey(id);
+        });
+        var _semiChecked = _checkedAll ? false : checkedRowKeys.length > 0 && idsCanBeChecked.some(function (id) {
+          return isCheckedRowKey(id);
+        });
+        return [_checkedAll, _semiChecked];
       }
-
-      var idsCanBeChecked = flattedData.filter(function (item) {
-        return !checkRowIsDisabledCheckbox(item.raw);
-      }).map(function (item) {
-        return item.id;
-      }); // TODO: 数组项完全匹配工具函数
-      // TODO: 数组项完全匹配工具函数
-
-      var _checkedAll = idsCanBeChecked.every(function (id) {
-        return isCheckedRowKey(id);
-      });
-
-      var _semiChecked = _checkedAll ? false : checkedRowKeys.length > 0 && idsCanBeChecked.some(function (id) {
-        return isCheckedRowKey(id);
-      });
-
-      return [_checkedAll, _semiChecked];
-    }
-
-    return [false, false];
-  }, [flattedData, rowSelection, isCheckedRowKey, checkedRowKeys.length, checkRowIsDisabledCheckbox]),
-      checkedAll = _React$useMemo[0],
-      semiChecked = _React$useMemo[1];
-
+      return [false, false];
+    }, [flattedData, rowSelection, isCheckedRowKey, checkedRowKeys.length, checkRowIsDisabledCheckbox]),
+    checkedAll = _React$useMemo[0],
+    semiChecked = _React$useMemo[1];
   var tryCheckAllRow = React__default.useCallback(function () {
     var targetItems = flattedData.filter(function (item) {
       return !checkRowIsDisabledCheckbox(item.raw);
@@ -99,7 +88,6 @@ var useTableCheck = function useTableCheck(_ref) {
       return item.raw;
     });
     var checkedRowKeysSet = new Set(checkedRowKeys);
-
     if (checkedAll) {
       // 移除当前页所有行 ids
       trySetCheckedRowKeys(function (prev) {
@@ -109,8 +97,8 @@ var useTableCheck = function useTableCheck(_ref) {
       }, targetRowItems, false);
       return;
     }
-
-    trySetCheckedRowKeys( // 添加当前页所有行 ids
+    trySetCheckedRowKeys(
+    // 添加当前页所有行 ids
     function (prev) {
       prev.forEach(function (id) {
         return checkedRowKeysSet.add(id);
@@ -129,5 +117,4 @@ var useTableCheck = function useTableCheck(_ref) {
     checkRowIsDisabledCheckbox: checkRowIsDisabledCheckbox
   };
 };
-
 export { useTableCheck };

package/lib/esm/hooks/use-col-hidden.js

@@ -14,25 +14,22 @@ var DEFAULT_COLUMNS = [];
 /**
  * 列操作逻辑
  */
-
 var useColHidden = function useColHidden(_ref) {
   var uniqueId = _ref.uniqueId,
-      _ref$columns = _ref.columns,
-      columns = _ref$columns === void 0 ? DEFAULT_COLUMNS : _ref$columns,
-      hiddenColKeysProp = _ref.hiddenColKeys,
-      onHiddenColKeysChange = _ref.onHiddenColKeysChange;
+    _ref$columns = _ref.columns,
+    columns = _ref$columns === void 0 ? DEFAULT_COLUMNS : _ref$columns,
+    hiddenColKeysProp = _ref.hiddenColKeys,
+    onHiddenColKeysChange = _ref.onHiddenColKeysChange;
   var cacheKey = uniqueId ? uniqueId + "_hiddenColKeys" : '';
-
   var _useUncontrolledState = useUncontrolledState(function () {
-    return parseLocalArray({
-      key: cacheKey,
-      defaultValue: []
-    });
-  }, hiddenColKeysProp, onHiddenColKeysChange),
-      _hiddenColKeys = _useUncontrolledState[0],
-      setHiddenColKeys = _useUncontrolledState[1]; // 保证 includes 匹配 column，是有效的可展示的列
-
-
+      return parseLocalArray({
+        key: cacheKey,
+        defaultValue: []
+      });
+    }, hiddenColKeysProp, onHiddenColKeysChange),
+    _hiddenColKeys = _useUncontrolledState[0],
+    setHiddenColKeys = _useUncontrolledState[1];
+  // 保证 includes 匹配 column，是有效的可展示的列
   var hiddenColKeys = useMemo(function () {
     return _hiddenColKeys.filter(function (dataKey) {
       return typeof dataKey === 'string' && dataKey !== '';
@@ -41,12 +38,11 @@ var useColHidden = function useColHidden(_ref) {
   useEffect(function () {
     if (!cacheKey) return;
     window.localStorage.setItem(cacheKey, JSON.stringify(hiddenColKeys));
-  }, [cacheKey, hiddenColKeys]); // 用于维护列操作时显隐临时状态
-
+  }, [cacheKey, hiddenColKeys]);
+  // 用于维护列操作时显隐临时状态
   var _useState = useState(hiddenColKeys),
-      cacheHiddenColKeys = _useState[0],
-      setCacheHiddenColKeys = _useState[1];
-
+    cacheHiddenColKeys = _useState[0],
+    setCacheHiddenColKeys = _useState[1];
   var visibleCols = useMemo(function () {
     // TODO: 支持隐藏叶子结点，而不是根节点
     // @ts-ignore
@@ -62,5 +58,4 @@ var useColHidden = function useColHidden(_ref) {
     setCacheHiddenColKeys: setCacheHiddenColKeys
   };
 };
-
 export { useColHidden };

package/lib/esm/hooks/use-col-set.js

@@ -12,40 +12,33 @@ var DEFAULT_COLUMNS = [];
 /**
  * 列设置
  */
-
 var useColSet = function useColSet(_ref) {
   var _ref$columns = _ref.columns,
-      columns = _ref$columns === void 0 ? DEFAULT_COLUMNS : _ref$columns,
-      sortedColKeysProp = _ref.sortedColKeys,
-      hiddenColKeysProp = _ref.hiddenColKeys;
+    columns = _ref$columns === void 0 ? DEFAULT_COLUMNS : _ref$columns,
+    sortedColKeysProp = _ref.sortedColKeys,
+    hiddenColKeysProp = _ref.hiddenColKeys;
   var isColumnsEqual = useMemo(function () {
-    var _a; // 判断columns和之前的是不是一样的，如果之前columns对不上，那么认为设置数据无效。
-
-
+    var _a;
+    // 判断columns和之前的是不是一样的，如果之前columns对不上，那么认为设置数据无效。
     if (!sortedColKeysProp) {
       return true;
     }
-
     if (columns.length !== sortedColKeysProp.length) {
       return false;
     }
-
     for (var cIndex = 0; cIndex < columns.length; cIndex++) {
       var exist = false;
       var dataKey = (_a = columns[cIndex]) === null || _a === void 0 ? void 0 : _a.dataKey;
-
       for (var sIndex = 0; sIndex < sortedColKeysProp.length; sIndex++) {
         if (dataKey === sortedColKeysProp[sIndex]) {
           exist = true;
           break;
         }
       }
-
       if (!exist) {
         return false;
       }
     }
-
     return true;
   }, [columns, sortedColKeysProp]);
   return {
@@ -53,5 +46,4 @@ var useColSet = function useColSet(_ref) {
     hiddenColKeys: isColumnsEqual ? hiddenColKeysProp : undefined
   };
 };
-
 export { useColSet };

package/lib/esm/hooks/use-col-sorter.js

@@ -16,26 +16,23 @@ var DEFAULT_COLUMNS = [];
 /**
  * 列排序
  */
-
 var useColSorter = function useColSorter(_ref) {
   var uniqueId = _ref.uniqueId,
-      _ref$columns = _ref.columns,
-      columns = _ref$columns === void 0 ? DEFAULT_COLUMNS : _ref$columns,
-      sortedColKeysProp = _ref.sortedColKeys,
-      onSortedColKeysChange = _ref.onSortedColKeysChange;
+    _ref$columns = _ref.columns,
+    columns = _ref$columns === void 0 ? DEFAULT_COLUMNS : _ref$columns,
+    sortedColKeysProp = _ref.sortedColKeys,
+    onSortedColKeysChange = _ref.onSortedColKeysChange;
   var cacheKey = uniqueId ? uniqueId + "_sortCols" : '';
-
   var _useUncontrolledState = useUncontrolledState(function () {
-    return parseLocalArray({
-      key: cacheKey,
-      defaultValue: columns.map(function (column) {
-        return column.dataKey;
-      })
-    });
-  }, sortedColKeysProp, onSortedColKeysChange),
-      sortedColKeys = _useUncontrolledState[0],
-      setSortColKeys = _useUncontrolledState[1];
-
+      return parseLocalArray({
+        key: cacheKey,
+        defaultValue: columns.map(function (column) {
+          return column.dataKey;
+        })
+      });
+    }, sortedColKeysProp, onSortedColKeysChange),
+    sortedColKeys = _useUncontrolledState[0],
+    setSortColKeys = _useUncontrolledState[1];
   useUpdateEffect(function () {
     // 当column发生改变的时候，同步 setting 的 sortedCols 设置
     setSortColKeys(columns.map(function (column) {
@@ -55,13 +52,12 @@ var useColSorter = function useColSorter(_ref) {
   useEffect(function () {
     if (!cacheKey) return;
     window.localStorage.setItem(cacheKey, JSON.stringify(sortedColKeys));
-  }, [cacheKey, sortedColKeys]); // 用于维护列操作时排序临时状态（（未确认保存时））
-
+  }, [cacheKey, sortedColKeys]);
+  // 用于维护列操作时排序临时状态（（未确认保存时））
   var _useState = useState(sortedCols),
-      _cacheSortedCols = _useState[0],
-      setCacheSortedCols = _useState[1]; // 保证排序的 column，是有效的可展示的列
-
-
+    _cacheSortedCols = _useState[0],
+    setCacheSortedCols = _useState[1];
+  // 保证排序的 column，是有效的可展示的列
   var cacheSortedCols = useMemo(function () {
     return _cacheSortedCols.filter(function (col) {
       return col && typeof col.dataKey === 'string' && col.dataKey !== '';
@@ -74,5 +70,4 @@ var useColSorter = function useColSorter(_ref) {
     setCacheSortedCols: setCacheSortedCols
   };
 };
-
 export { useColSorter };

package/lib/esm/hooks/use-col-width.js

@@ -10,37 +10,29 @@
 import React__default, { useCallback } from 'react';
 import { getGroupItemWidth } from '../utils/index.js';
 import { useUpdateEffect } from '@hi-ui/use-update-effect';
-
 var useColWidth = function useColWidth(_ref) {
   var resizable = _ref.resizable,
-      columns = _ref.columns,
-      virtual = _ref.virtual;
+    columns = _ref.columns,
+    virtual = _ref.virtual;
   var measureRowElementRef = React__default.useRef(null);
-
   var _React$useState = React__default.useState(function () {
-    return getGroupItemWidth(columns);
-  }),
-      colWidths = _React$useState[0],
-      setColWidths = _React$useState[1];
-
+      return getGroupItemWidth(columns);
+    }),
+    colWidths = _React$useState[0],
+    setColWidths = _React$useState[1];
   var getVirtualWidths = useCallback(function () {
     var measureRowElement = measureRowElementRef.current;
-
     if (!measureRowElement) {
       return getGroupItemWidth(columns);
     }
     /** 虚拟滚动时，内容宽度不能用以前table自动渲染的方式获取，需要手动计算 */
-
-
     var columnDefaultWidth = 200;
     var containerWidth = measureRowElement.clientWidth;
     var totalWidth = 0;
     /** 虚拟滚动，需要根据collist的虚拟宽度来计算宽度 */
-
     columns.forEach(function (columnItem) {
       totalWidth += columnItem.width || columnDefaultWidth;
     });
-
     if (totalWidth < containerWidth) {
       // 容器宽度大于设置的宽度总和时，col宽度等比分分配占满容器。
       return columns.map(function (columnItem) {
@@ -65,15 +57,14 @@ var useColWidth = function useColWidth(_ref) {
   /**
    * 根据实际内容区（table 的第一行）渲染，再次精确收集并设置每列宽度
    */
-
   React__default.useEffect(function () {
     var measureRowElement = measureRowElementRef.current;
-
     if (measureRowElement) {
       var _resizeObserver = new ResizeObserver(function () {
         if (virtual) {
           setColWidths(getVirtualWidths());
-        } // else {
+        }
+        // else {
         //   if (measureRowElement.childNodes) {
         //     const _realColumnsWidth = Array.from(measureRowElement.childNodes).map((node) => {
         //       return (node as HTMLElement).getBoundingClientRect().width || 0
@@ -83,27 +74,22 @@ var useColWidth = function useColWidth(_ref) {
         //     }
         //   }
         // }
-
       });
 
       _resizeObserver.observe(measureRowElement);
     }
-
-    return function () {}; // 测量元素在内容列为空时会是空，切换会使测量元素变化，导致后续的resize时间无法响应,此处测量元素变化时需要重新绑定
+    return function () {};
+    // 测量元素在内容列为空时会是空，切换会使测量元素变化，导致后续的resize时间无法响应,此处测量元素变化时需要重新绑定
   }, [getVirtualWidths, virtual]);
-
   var _React$useState2 = React__default.useState(null),
-      headerTableElement = _React$useState2[0],
-      setHeaderTableElement = _React$useState2[1];
+    headerTableElement = _React$useState2[0],
+    setHeaderTableElement = _React$useState2[1];
   /**
    *  控制列最小可调整宽度
    */
-
-
   var minColWidth = React__default.useMemo(function () {
     if (resizable && headerTableElement) {
       var resizableHandlerWidth = 4;
-
       var _minColWidth = Array.from(headerTableElement.childNodes).map(function (th) {
         var thPaddingLeft = parseFloat(window.getComputedStyle(th).getPropertyValue('padding-left'));
         var childNodes = Array.from(th.childNodes);
@@ -113,16 +99,13 @@ var useColWidth = function useColWidth(_ref) {
           return prev + next;
         }) + thPaddingLeft * 2 + resizableHandlerWidth;
       });
-
       return _minColWidth;
     }
-
     return Array(columns.length).fill(0);
   }, [columns.length, headerTableElement, resizable]);
   /**
    * 列宽拖拽 resize，只处理拖拽线两边的列宽度
    */
-
   var onColumnResizable = React__default.useCallback(function (_, _ref2, index) {
     var size = _ref2.size;
     var minWidth = minColWidth[index];
@@ -131,12 +114,10 @@ var useColWidth = function useColWidth(_ref) {
     setColWidths(function (prev) {
       var nextColWidths = [].concat(prev);
       var anotherWidth = nextColWidths[index + 1] + nextColWidths[index] - nextWidth;
-
       if (anotherWidth <= anotherMinWidth) {
         anotherWidth = anotherMinWidth;
         nextWidth = nextColWidths[index + 1] - anotherMinWidth + nextColWidths[index];
       }
-
       nextColWidths[index] = nextWidth;
       nextColWidths[index + 1] = anotherWidth;
       return nextColWidths;
@@ -149,8 +130,8 @@ var useColWidth = function useColWidth(_ref) {
         width: width,
         // TODO（疑惑）: minWidth 所要解决的问题
         minWidth: width
-      } // 'data-hover-highlight': setAttrStatus(isHoveredCol(column.dataKey)),
-
+      }
+      // 'data-hover-highlight': setAttrStatus(isHoveredCol(column.dataKey)),
     };
   }, [colWidths]);
   return {
@@ -161,5 +142,4 @@ var useColWidth = function useColWidth(_ref) {
     colWidths: colWidths
   };
 };
-
 export { useColWidth };

package/lib/esm/hooks/use-colgroup.js

@@ -10,80 +10,75 @@
 import React__default from 'react';
 import { cloneTree, flattenTree, isLeaf, getLeafChildren, groupByTreeDepth } from '@hi-ui/tree-utils';
 import { isArrayNonEmpty } from '@hi-ui/type-assertion';
-
 var useColumns = function useColumns(_ref) {
-  var columns = _ref.columns; // 拉平后的数据
-
+  var columns = _ref.columns;
+  // 拉平后的数据
   var _React$useMemo = React__default.useMemo(function () {
-    var clonedColumns = cloneTree(columns);
-    var maxDepth = 0; // @ts-ignore
-    // @ts-ignore
-
-    var flattedColumns = flattenTree(clonedColumns, function (node) {
-      var _a;
-
-      if (node.depth > maxDepth) {
-        maxDepth = node.depth;
-      }
-
-      var raw = node.raw;
-      return Object.assign(Object.assign({}, node), {
-        id: raw.dataKey,
-        width: raw.width,
-        // TODO: remove it
-        dataKey: raw.dataKey,
-        title: raw.title,
-        align: (_a = raw.align) !== null && _a !== void 0 ? _a : 'left',
-        render: raw.render
-      });
-    }); // 记录下标位置，方便冻结列操作计算时快速获取更新
-    // 记录下标位置，方便冻结列操作计算时快速获取更新
-
-    flattedColumns.forEach(function (column, index) {
+      var clonedColumns = cloneTree(columns);
+      var maxDepth = 0;
       // @ts-ignore
-      column.index = index;
-    });
-    return [flattedColumns, maxDepth];
-  }, [columns]),
-      flattedColumns = _React$useMemo[0],
-      maxColumnDepth = _React$useMemo[1]; // 末级 column
-
-
+      // @ts-ignore
+      var flattedColumns = flattenTree(clonedColumns, function (node) {
+        var _a;
+        if (node.depth > maxDepth) {
+          maxDepth = node.depth;
+        }
+        var raw = node.raw;
+        return Object.assign(Object.assign({}, node), {
+          id: raw.dataKey,
+          width: raw.width,
+          // TODO: remove it
+          dataKey: raw.dataKey,
+          title: raw.title,
+          align: (_a = raw.align) !== null && _a !== void 0 ? _a : 'left',
+          render: raw.render
+        });
+      });
+      // 记录下标位置，方便冻结列操作计算时快速获取更新
+      // 记录下标位置，方便冻结列操作计算时快速获取更新
+      flattedColumns.forEach(function (column, index) {
+        // @ts-ignore
+        column.index = index;
+      });
+      return [flattedColumns, maxDepth];
+    }, [columns]),
+    flattedColumns = _React$useMemo[0],
+    maxColumnDepth = _React$useMemo[1];
+  // 末级 column
   var flattedColumnsWithoutChildren = React__default.useMemo(function () {
     return flattedColumns.filter(function (col) {
       return !isArrayNonEmpty(col.children);
     });
   }, [flattedColumns]);
-
   var _React$useMemo2 = React__default.useMemo(function () {
-    var nextColumns = [].concat( // @ts-ignore
-    // flattedColumns.filter((col) => isLeaf(col)) as FlattedTableColumnItemData[]
-    flattedColumns); // 表头分组
-    // 在最后一层，colSpan = 1, rowSpan = maxDepth - depth + 1
-    // 不在最后一层，rowSpan = 1, colSpan = 叶子节点后代数量
-    // 表头分组
-    // 在最后一层，colSpan = 1, rowSpan = maxDepth - depth + 1
-    // 不在最后一层，rowSpan = 1, colSpan = 叶子节点后代数量
-
-    flattedColumns.forEach(function (column) {
-      if (isLeaf(column)) {
-        column.rowSpan = maxColumnDepth - column.depth + 1;
-        column.colSpan = 1;
-      } else {
-        column.rowSpan = 1;
-        column.colSpan = getLeafChildren(column).length;
-      }
-    });
-    var leafColumns = flattedColumns.filter(function (col) {
-      return isLeaf(col);
-    });
-    var groupedColumns = groupByTreeDepth(nextColumns);
-    return [nextColumns, groupedColumns, leafColumns];
-  }, [flattedColumns, maxColumnDepth]),
-      mergedColumns = _React$useMemo2[0],
-      groupedColumns = _React$useMemo2[1],
-      leafColumns = _React$useMemo2[2];
-
+      var nextColumns = [].concat(
+      // @ts-ignore
+      // flattedColumns.filter((col) => isLeaf(col)) as FlattedTableColumnItemData[]
+      flattedColumns);
+      // 表头分组
+      // 在最后一层，colSpan = 1, rowSpan = maxDepth - depth + 1
+      // 不在最后一层，rowSpan = 1, colSpan = 叶子节点后代数量
+      // 表头分组
+      // 在最后一层，colSpan = 1, rowSpan = maxDepth - depth + 1
+      // 不在最后一层，rowSpan = 1, colSpan = 叶子节点后代数量
+      flattedColumns.forEach(function (column) {
+        if (isLeaf(column)) {
+          column.rowSpan = maxColumnDepth - column.depth + 1;
+          column.colSpan = 1;
+        } else {
+          column.rowSpan = 1;
+          column.colSpan = getLeafChildren(column).length;
+        }
+      });
+      var leafColumns = flattedColumns.filter(function (col) {
+        return isLeaf(col);
+      });
+      var groupedColumns = groupByTreeDepth(nextColumns);
+      return [nextColumns, groupedColumns, leafColumns];
+    }, [flattedColumns, maxColumnDepth]),
+    mergedColumns = _React$useMemo2[0],
+    groupedColumns = _React$useMemo2[1],
+    leafColumns = _React$useMemo2[2];
   return {
     // getColgroupProps,
     flattedColumns: flattedColumns,
@@ -93,5 +88,4 @@ var useColumns = function useColumns(_ref) {
     flattedColumnsWithoutChildren: flattedColumnsWithoutChildren
   };
 };
-
 export { useColumns };

package/lib/esm/hooks/use-drag.js

@@ -11,33 +11,30 @@ import React__default, { useCallback } from 'react';
 import { useLatestCallback } from '@hi-ui/use-latest';
 import { findNodeById, cloneTree, deleteNodeById, insertNodeById } from '@hi-ui/tree-utils';
 import { isFunction, isPromise } from '@hi-ui/type-assertion';
-
 var useTableDrag = function useTableDrag(_ref) {
   var cacheData = _ref.cacheData,
-      setCacheData = _ref.setCacheData,
-      draggable = _ref.draggable,
-      onDropEnd = _ref.onDropEnd,
-      onDropProp = _ref.onDrop,
-      fieldKey = _ref.fieldKey;
+    setCacheData = _ref.setCacheData,
+    draggable = _ref.draggable,
+    onDropEnd = _ref.onDropEnd,
+    onDropProp = _ref.onDrop,
+    fieldKey = _ref.fieldKey;
   var dragRowRef = React__default.useRef(null);
   var onDropEndLatest = useLatestCallback(onDropEnd);
   var onDrop = useCallback(function (evt, sourceId, targetId, dragDirection) {
     if (!draggable) return;
-    if (targetId === sourceId) return; // TODO： 根据 id 查询数据原始数据或者直接使用引用值，两者选择，避免bug
+    if (targetId === sourceId) return;
+    // TODO： 根据 id 查询数据原始数据或者直接使用引用值，两者选择，避免bug
     // const { rowData, dropRowData, level } = dragRowRef.current
-
     var sourceNode = findNodeById(cacheData, sourceId, {
       idFieldName: fieldKey
     });
     var targetNode = findNodeById(cacheData, targetId, {
       idFieldName: fieldKey
     });
-
     if (!sourceNode || !targetNode) {
       // console.log('未找到任何节点(sourceNode, targetNode)', sourceNode, targetNode)
       return;
     }
-
     var nextTreeData = cloneTree(cacheData);
     deleteNodeById(nextTreeData, sourceId, {
       idFieldName: fieldKey
@@ -45,7 +42,8 @@ var useTableDrag = function useTableDrag(_ref) {
     insertNodeById(nextTreeData, targetId, sourceNode, dragDirection === 'top' ? 0 : 1, {
       idFieldName: fieldKey
     });
-    var resultMaybePromise = isFunction(onDropProp) ? // TODO: 支持 tree 拖拽层级，第四个参数
+    var resultMaybePromise = isFunction(onDropProp) ?
+    // TODO: 支持 tree 拖拽层级，第四个参数
     onDropProp(evt, {
       dragNode: sourceNode,
       dropNode: targetNode,
@@ -54,7 +52,6 @@ var useTableDrag = function useTableDrag(_ref) {
         after: nextTreeData
       }
     }) : true;
-
     if (isPromise(resultMaybePromise)) {
       resultMaybePromise.then(function (returnResult) {
         if (returnResult === true) {
@@ -86,5 +83,4 @@ var useTableDrag = function useTableDrag(_ref) {
     dragRowRef: dragRowRef
   };
 };
-
 export { useTableDrag };