stk-table-vue 0.6.9 → 0.6.12

package/src/StkTable/useGetFixedColPosition.ts

@@ -19,6 +19,7 @@ export function useGetFixedColPosition<DT extends Record<string, any>>({ tableHe
         const colKeyStore: Record<string, number> = {};
         /** 没有 colKey 的多级表头列，使用对象引用做标识 */
         const refStore = new WeakMap<StkTableColumn<DT>, number>();
+        const colKeyGenValue = colKeyGen.value;
         tableHeadersForCalc.value.forEach(cols => {
             let left = 0;
             /**遍历右侧fixed时，因为left已经遍历过一次了。所以，可以拿到right遍历边界 */
@@ -26,7 +27,7 @@ export function useGetFixedColPosition<DT extends Record<string, any>>({ tableHe
             for (let i = 0; i < cols.length; i++) {
                 const item = cols[i];
                 if (item.fixed === 'left') {
-                    const colKey = colKeyGen.value(item);
+                    const colKey = colKeyGenValue(item);
                     if (colKey) {
                         colKeyStore[colKey] = left;
                     } else {
@@ -42,7 +43,7 @@ export function useGetFixedColPosition<DT extends Record<string, any>>({ tableHe
             let right = 0;
             for (let i = cols.length - 1; i >= rightStartIndex; i--) {
                 const item = cols[i];
-                const colKey = colKeyGen.value(item);
+                const colKey = colKeyGenValue(item);
                 if (item.fixed === 'right') {
                     if (colKey) {
                         colKeyStore[colKey] = right;
@@ -55,7 +56,7 @@ export function useGetFixedColPosition<DT extends Record<string, any>>({ tableHe
         });
 
         return (col: StkTableColumn<any>) => {
-            const colKey = colKeyGen.value(col);
+            const colKey = colKeyGenValue(col);
             return colKey ? colKeyStore[colKey] : refStore.get(col) || 0;
         };
     });

package/src/StkTable/useKeyboardArrowScroll.ts

@@ -10,6 +10,8 @@ enum ScrollCodes {
     ArrowLeft = 'ArrowLeft',
     PageUp = 'PageUp',
     PageDown = 'PageDown',
+    Home = 'Home',
+    End = 'End',
 }
 /** 所有翻页按键数组 */
 const ScrollCodesValues = Object.values(ScrollCodes);
@@ -66,7 +68,7 @@ export function useKeyboardArrowScroll<DT extends Record<string, any>>(
         if (!isMouseOver) return; // 不悬浮还是要触发键盘事件的
         e.preventDefault(); // 不触发键盘默认的箭头事件
 
-        const { scrollTop, rowHeight, containerHeight } = virtualScroll.value;
+        const { scrollTop, rowHeight, containerHeight, scrollHeight } = virtualScroll.value;
         const { scrollLeft } = virtualScrollX.value;
         const { headless, headerRowHeight } = props;
 
@@ -78,15 +80,19 @@ export function useKeyboardArrowScroll<DT extends Record<string, any>>(
         if (e.code === ScrollCodes.ArrowUp) {
             scrollTo(scrollTop - rowHeight, null);
         } else if (e.code === ScrollCodes.ArrowRight) {
-            scrollTo(null, scrollLeft + rowHeight);
+            scrollTo(null, scrollLeft + 50);
         } else if (e.code === ScrollCodes.ArrowDown) {
             scrollTo(scrollTop + rowHeight, null);
         } else if (e.code === ScrollCodes.ArrowLeft) {
-            scrollTo(null, scrollLeft - rowHeight);
+            scrollTo(null, scrollLeft - 50);
         } else if (e.code === ScrollCodes.PageUp) {
             scrollTo(scrollTop - rowHeight * bodyPageSize + headerHeight, null);
         } else if (e.code === ScrollCodes.PageDown) {
             scrollTo(scrollTop + rowHeight * bodyPageSize - headerHeight, null);
+        } else if (e.code === ScrollCodes.Home) {
+            scrollTo(0, null);
+        } else if (e.code === ScrollCodes.End) {
+            scrollTo(scrollHeight, null);
         }
     }
 

package/src/StkTable/useThDrag.ts

@@ -69,7 +69,7 @@ export function useThDrag<DT extends Record<string, any>>({ props, emits, colKey
         if (isEmptyValue(dragStartKey) || isEmptyValue(dragEndKey)) return;
 
         if (dragConfig.value.mode !== 'none') {
-            const columns = [...props.columns];
+            const columns: StkTableColumn<any>[] = props.columns.slice();
 
             const dragStartIndex = columns.findIndex(col => colKeyGen.value(col) === dragStartKey);
             const dragEndIndex = columns.findIndex(col => colKeyGen.value(col) === dragEndKey);

package/src/StkTable/useTrDrag.ts

@@ -93,7 +93,7 @@ export function useTrDrag({ props, emits, dataSourceCopy }: Params) {
         if (sourceIndex === endIndex) return;
 
         if (mode !== 'none') {
-            const dataSourceTemp = [...dataSourceCopy.value];
+            const dataSourceTemp = dataSourceCopy.value.slice();
             const sourceRow = dataSourceTemp[sourceIndex];
             if (mode === 'swap') {
                 dataSourceTemp[sourceIndex] = dataSourceTemp[endIndex];
@@ -102,7 +102,7 @@ export function useTrDrag({ props, emits, dataSourceCopy }: Params) {
                 dataSourceTemp.splice(sourceIndex, 1);
                 dataSourceTemp.splice(endIndex, 0, sourceRow);
             }
-            dataSourceCopy.value = [...dataSourceTemp];
+            dataSourceCopy.value = dataSourceTemp;
         }
         emits('row-order-change', sourceIndex, endIndex);
     }

package/src/StkTable/useVirtualScroll.ts

@@ -166,9 +166,6 @@ export function useVirtualScroll<DT extends Record<string, any>>({
     function getTableHeaderHeight() {
         const { headerRowHeight } = props;
         return headerRowHeight * tableHeaders.value.length;
-        // if (props.virtual) {
-        // }
-        // return theadRef.value?.offsetHeight || 0;
     }
 
     /**
@@ -225,25 +222,26 @@ export function useVirtualScroll<DT extends Record<string, any>>({
     /** every row actual height */
     const autoRowHeightMap = new Map<UniqKey, number>();
     /** 如果行高度有变化，则要调用此方法清除保存的行高 */
-    const setAutoHeight = (rowKey: UniqKey, height?: number | null) => {
+    function setAutoHeight(rowKey: UniqKey, height?: number | null) {
         if (!height) {
             autoRowHeightMap.delete(rowKey);
         } else {
             autoRowHeightMap.set(rowKey, height);
         }
-    };
-    const clearAllAutoHeight = () => {
+    }
+
+    function clearAllAutoHeight() {
         autoRowHeightMap.clear();
-    };
+    }
 
-    const getAutoRowHeight = (row: DT) => {
+    function getAutoRowHeight(row: DT) {
         const rowKey = String(rowKeyGen(row));
         const storedHeight = autoRowHeightMap.get(rowKey);
-        let expectedHeight;
         if (storedHeight) {
             return storedHeight;
         }
-        if ((expectedHeight = props.autoRowHeight?.expectedHeight)) {
+        const expectedHeight = props.autoRowHeight?.expectedHeight;
+        if (expectedHeight) {
             if (typeof expectedHeight === 'function') {
                 return expectedHeight(row);
             } else {
@@ -251,9 +249,9 @@ export function useVirtualScroll<DT extends Record<string, any>>({
             }
         }
         return props.rowHeight || DEFAULT_ROW_HEIGHT;
-    };
+    }
 
-    const createGetRowHeightFn: () => (row: DT) => number = () => {
+    function createGetRowHeightFn(): (row: DT) => number {
         if (props.autoRowHeight) {
             return (row: DT) => getAutoRowHeight(row);
         }
@@ -263,7 +261,7 @@ export function useVirtualScroll<DT extends Record<string, any>>({
             return (row: DT) => (row.__EXPANDED_ROW__ ? expandedRowHeight : rowHeight);
         }
         return () => props.rowHeight || (DEFAULT_ROW_HEIGHT as number);
-    };
+    }
 
     /** 通过滚动条位置，计算虚拟滚动的参数 */
     function updateVirtualScrollY(sTop = 0) {
@@ -368,7 +366,7 @@ export function useVirtualScroll<DT extends Record<string, any>>({
         const headerLength = tableHeaderLastValue?.length;
         if (!headerLength) return;
 
-        const { scrollLeft } = virtualScrollX.value;
+        const { scrollLeft, containerWidth } = virtualScrollX.value;
         let startIndex = 0;
         let offsetLeft = 0;
         /** 列宽累加 */
@@ -398,13 +396,13 @@ export function useVirtualScroll<DT extends Record<string, any>>({
         }
         // -----
         colWidthSum = leftFirstColRestWidth;
-        const containerWidth = virtualScrollX.value.containerWidth - leftColWidthSum;
+        const containerW = containerWidth - leftColWidthSum;
         let endIndex = headerLength;
         for (let colIndex = startIndex + 1; colIndex < headerLength; colIndex++) {
             const col = tableHeaderLastValue[colIndex];
             colWidthSum += getCalculatedColWidth(col);
             // 列宽大于容器宽度则停止
-            if (colWidthSum >= containerWidth) {
+            if (colWidthSum >= containerW) {
                 endIndex = colIndex + 1; // slice endIndex + 1
                 break;
             }

package/src/StkTable/utils/constRefUtils.ts

@@ -16,7 +16,7 @@ export function getColWidth(col: StkTableColumn<any> | null): number {
 
 /** 获取计算后的宽度 */
 export function getCalculatedColWidth(col: PrivateStkTableColumn<any> | null) {
-    return col?.__WIDTH__ ?? +DEFAULT_COL_WIDTH;
+    return (col && col.__WIDTH__) ?? +DEFAULT_COL_WIDTH;
 }
 
 /** 创建组件唯一标识 */

package/src/StkTable/utils/index.ts

@@ -26,7 +26,7 @@ export function insertToOrderedArray<T extends object>(sortState: SortState<T>,
     sortConfig = { emptyToBottom: false, ...sortConfig };
     let { sortType } = sortState;
     if (!sortType) sortType = typeof newItem[dataIndex] as 'number' | 'string';
-    const data = [...targetArray];
+    const data = targetArray.slice();
 
     if (!order || !data.length) {
         // 没有排序的情况，插入在最上方
@@ -146,7 +146,7 @@ export function tableSort<T extends Record<string, any>>(
     if (!dataSource?.length || !sortOption) return dataSource || [];
 
     sortConfig = { emptyToBottom: false, ...sortConfig };
-    let targetDataSource = [...dataSource];
+    let targetDataSource = dataSource.slice();
     let sortField = sortOption.sortField || sortOption.dataIndex;
 
     if (!order && sortConfig.defaultSort) {
@@ -172,9 +172,9 @@ export function tableSort<T extends Record<string, any>>(
         }
 
         if (order === 'desc' || sortConfig.emptyToBottom) {
-            targetDataSource = [...valueArr, ...emptyArr];
+            targetDataSource = valueArr.concat(emptyArr);
         } else {
-            targetDataSource = [...emptyArr, ...valueArr];
+            targetDataSource = emptyArr.concat(valueArr);
         }
     }
     return targetDataSource;