stk-table-vue 0.7.2 → 0.8.1

package/src/StkTable/useThDrag.ts

@@ -1,17 +1,17 @@
-import { computed, ComputedRef } from 'vue';
-import { StkTableColumn, UniqKey } from './types';
+import { computed } from 'vue';
+import { ColKeyGen, StkTableColumn } from './types';
 import { isEmptyValue } from './utils';
 
-type Params<T extends Record<string, any>> = {
+type Params = {
     props: any;
     emits: any;
-    colKeyGen: ComputedRef<(col: StkTableColumn<T>) => UniqKey>;
+    colKeyGen: ColKeyGen;
 };
 /**
  * 列顺序拖动
  * @returns
  */
-export function useThDrag<DT extends Record<string, any>>({ props, emits, colKeyGen }: Params<DT>) {
+export function useThDrag({ props, emits, colKeyGen }: Params) {
     const findParentTH = (e: DragEvent) => (e.target as HTMLElement).closest('th');
 
     const dragConfig = computed(() => {
@@ -97,6 +97,6 @@ export function useThDrag<DT extends Record<string, any>>({ props, emits, colKey
         onThDragOver,
         onThDrop,
         /** 是否可拖拽 */
-        isHeaderDraggable: (col: StkTableColumn<DT>) => dragConfig.value.draggable && !dragConfig.value.disabled(col),
+        isHeaderDraggable: (col: StkTableColumn<any>) => dragConfig.value.draggable && !dragConfig.value.disabled(col),
     };
 }

package/src/StkTable/useTree.ts

@@ -1,10 +1,10 @@
 import { ShallowRef } from 'vue';
-import { PrivateRowDT, TreeConfig, UniqKey } from './types';
+import { PrivateRowDT, RowKeyGen, TreeConfig, UniqKey } from './types';
 
 type DT = PrivateRowDT & { children?: DT[] };
 type Option<DT extends Record<string, any>> = {
     props: any;
-    rowKeyGen: (row: any) => UniqKey;
+    rowKeyGen: RowKeyGen;
     dataSourceCopy: ShallowRef<DT[]>;
     emits: any;
 };

package/src/StkTable/useVirtualScroll.ts

@@ -1,6 +1,6 @@
 import { Ref, ShallowRef, computed, ref } from 'vue';
 import { DEFAULT_ROW_HEIGHT, DEFAULT_TABLE_HEIGHT, DEFAULT_TABLE_WIDTH } from './const';
-import { AutoRowHeightConfig, StkTableColumn, UniqKey } from './types';
+import { AutoRowHeightConfig, PrivateStkTableColumn, RowKeyGen, StkTableColumn, UniqKey } from './types';
 import { getCalculatedColWidth } from './utils/constRefUtils';
 
 type Option<DT extends Record<string, any>> = {
@@ -8,9 +8,9 @@ type Option<DT extends Record<string, any>> = {
     tableContainerRef: Ref<HTMLElement | undefined>;
     trRef: Ref<HTMLTableRowElement[] | undefined>;
     dataSourceCopy: ShallowRef<DT[]>;
-    tableHeaderLast: ShallowRef<StkTableColumn<DT>[]>;
-    tableHeaders: ShallowRef<StkTableColumn<DT>[][]>;
-    rowKeyGen: (row: any) => UniqKey;
+    tableHeaderLast: ShallowRef<PrivateStkTableColumn<DT>[]>;
+    tableHeaders: ShallowRef<PrivateStkTableColumn<DT>[][]>;
+    rowKeyGen: RowKeyGen;
 };
 
 /** 暂存纵向虚拟滚动的数据 */
@@ -133,8 +133,8 @@ export function useVirtualScroll<DT extends Record<string, any>>({
         const tableHeaderLastValue = tableHeaderLast.value;
         if (virtualX_on.value) {
             // 虚拟横向滚动，固定列要一直保持存在
-            const leftCols: StkTableColumn<DT>[] = [];
-            const rightCols: StkTableColumn<DT>[] = [];
+            const leftCols: PrivateStkTableColumn<DT>[] = [];
+            const rightCols: PrivateStkTableColumn<DT>[] = [];
             /**
              * 存在问题：
              * table columns 从多到少时。比方原来的start=5,end=10，现在start=4,end=8。这时候endIndex就超出数组范围了。

package/src/StkTable/utils/index.ts

@@ -1,4 +1,5 @@
-import { Order, SortConfig, SortOption, SortState, StkTableColumn } from '../types';
+import { CELL_KEY_SEPARATE } from '../const';
+import { Order, SortConfig, SortOption, SortState, StkTableColumn, UniqKey } from '../types';
 
 /** 是否空值 */
 export function isEmptyValue(val: any, isNumber?: boolean) {
@@ -222,3 +223,7 @@ export function getBrowsersVersion(browserName: string) {
     }
     return 100;
 }
+
+export function pureCellKeyGen(rowKey: UniqKey, colKey: UniqKey) {
+    return rowKey + CELL_KEY_SEPARATE + colKey;
+}