stk-table-vue 0.8.6 → 0.8.8

package/src/StkTable/useVirtualScroll.ts

@@ -67,7 +67,8 @@ export function useVirtualScroll<DT extends Record<string, any>>({
     rowKeyGen,
     maxRowSpan,
 }: Option<DT>) {
-    const tableHeaderHeight = ref(props.headerRowHeight);
+    const tableHeaderHeight = computed(() => props.headerRowHeight * tableHeaders.value.length);
+
 
     const virtualScroll = ref<VirtualScrollStore>({
         containerHeight: 0,
@@ -188,10 +189,6 @@ export function useVirtualScroll<DT extends Record<string, any>>({
         return rowHeightFn;
     });
 
-    function getTableHeaderHeight() {
-        return props.headerRowHeight * tableHeaders.value.length;
-    }
-
     /**
      * 初始化虚拟滚动参数
      * @param {number} [height] 虚拟滚动的高度
@@ -210,18 +207,16 @@ export function useVirtualScroll<DT extends Record<string, any>>({
             console.warn('initVirtualScrollY: height must be a number');
             height = 0;
         }
-        const { offsetHeight, scrollHeight } = tableContainerRef.value || {};
+        const { clientHeight, scrollHeight } = tableContainerRef.value || {};
         let scrollTop = tableContainerRef.value?.scrollTop || 0;
 
         const rowHeight = getRowHeightFn.value();
-        const containerHeight = height || offsetHeight || DEFAULT_TABLE_HEIGHT;
+        const containerHeight = height || clientHeight || DEFAULT_TABLE_HEIGHT;
         const { headless } = props;
         let pageSize = Math.ceil(containerHeight / rowHeight);
-        const headerHeight = getTableHeaderHeight();
-        tableHeaderHeight.value = headerHeight;
         if (!headless) {
             /** 表头高度占几行表体高度数 */
-            const headerToBodyRowHeightCount = Math.floor(headerHeight / rowHeight);
+            const headerToBodyRowHeightCount = Math.floor(tableHeaderHeight.value / rowHeight);
             pageSize -= headerToBodyRowHeightCount; //减去表头行数
         }
         const maxScrollTop = dataSourceCopy.value.length * rowHeight + tableHeaderHeight.value - containerHeight;
@@ -487,6 +482,7 @@ export function useVirtualScroll<DT extends Record<string, any>>({
         virtualX_on,
         virtualX_columnPart,
         virtualX_offsetRight,
+        tableHeaderHeight,
         initVirtualScroll,
         initVirtualScrollY,
         initVirtualScrollX,

package/src/StkTable/utils/index.ts

@@ -1,4 +1,4 @@
-import { CELL_KEY_SEPARATE } from '../const';
+import { CELL_KEY_SEPARATE, DEFAULT_SORT_CONFIG } from '../const';
 import { Order, SortConfig, SortOption, SortState, StkTableColumn, UniqKey } from '../types';
 
 /** 是否空值 */
@@ -158,19 +158,28 @@ export function tableSort<T extends Record<string, any>>(
 ): T[] {
     if (!dataSource?.length || !sortOption) return dataSource || [];
 
-    sortConfig = { emptyToBottom: false, ...sortConfig };
+    sortConfig = { ...DEFAULT_SORT_CONFIG, ...sortConfig };
     let targetDataSource = dataSource.slice();
     let sortField = sortOption.sortField || sortOption.dataIndex;
+    const { defaultSort, stringLocaleCompare, emptyToBottom, sortChildren } = sortConfig;
 
-    if (!order && sortConfig.defaultSort) {
+    if (!order && defaultSort) {
         // 默认排序
-        order = sortConfig.defaultSort.order;
-        sortField = sortConfig.defaultSort.dataIndex;
+        order = defaultSort.order;
+        sortField = defaultSort.dataIndex;
     }
 
     if (typeof sortOption.sorter === 'function') {
         const customSorterData = sortOption.sorter(targetDataSource, { order, column: sortOption });
         if (customSorterData) targetDataSource = customSorterData;
+
+        // 如果开启了子节点排序且使用了自定义排序器，递归排序children
+        if (sortChildren) {
+            targetDataSource.forEach(item => {
+                if (!item.children?.length) return;
+                (item as any).children = tableSort(sortOption, order, item.children, sortConfig);
+            });
+        }
     } else if (order) {
         let { sortType } = sortOption;
         if (!sortType) sortType = typeof dataSource[0][sortField] as 'number' | 'string';
@@ -179,15 +188,19 @@ export function tableSort<T extends Record<string, any>>(
         const [valueArr, emptyArr] = separatedData(sortOption, targetDataSource, isNumber);
 
         if (order === 'asc') {
-            valueArr.sort((a, b) => strCompare(a[sortField], b[sortField], isNumber, sortConfig.stringLocaleCompare));
+            valueArr.sort((a, b) => strCompare(a[sortField], b[sortField], isNumber, stringLocaleCompare));
         } else {
-            valueArr.sort((a, b) => strCompare(b[sortField], a[sortField], isNumber, sortConfig.stringLocaleCompare));
+            valueArr.sort((a, b) => strCompare(b[sortField], a[sortField], isNumber, stringLocaleCompare));
         }
 
-        if (order === 'desc' || sortConfig.emptyToBottom) {
-            targetDataSource = valueArr.concat(emptyArr);
-        } else {
-            targetDataSource = emptyArr.concat(valueArr);
+        targetDataSource = order === 'desc' || emptyToBottom ? valueArr.concat(emptyArr) : emptyArr.concat(valueArr);
+
+        // 递归排序子节点
+        if (sortChildren) {
+            targetDataSource.forEach(item => {
+                if (!item.children?.length) return;
+                (item as any).children = tableSort(sortOption, order, item.children, sortConfig);
+            });
         }
     }
     return targetDataSource;