stk-table-vue 0.4.15 → 0.5.0

package/README.md

@@ -10,11 +10,6 @@ repo:
 
 [<span style="font-size: 16px;font-weight: bold;">Online Demo</span>](https://stackblitz.com/edit/vitejs-vite-ad91hh?file=src%2FDemo%2Findex.vue)
 
-## Bug TODO:
-* [x] props.dataSource 为 shallowRef 时，高亮行不生效。(bug:2024.02.21)(resolved:0.2.3)
-* [x] 右侧固定列列宽拖动目标。（v0.4.10）
-* [] 惯性滚动优化。
-
 ## Feature TODO:
 * [x] 高亮行，单元格。
   - [x] 使用 `Web Animations API` 实现高亮。(`v0.3.4` 变更为默认值)
@@ -27,6 +22,7 @@ repo:
   - [x] 固定列阴影。
     - [x] 多级表头固定列阴影。
     - [x] sticky column 动态计算阴影位置。(`v0.4.0`)
+* [x] 列展开。(`v0.5.0`)
 * [] 列筛选。
 * [x] 斑马纹。
 * [x] 拖动更改列顺序。
@@ -44,6 +40,7 @@ repo:
   - [x] `props.optimizeVue2Scroll` 优化vue2虚拟滚动流畅度。(`v0.2.0`)
 * [x] 支持配置序号列。`StkTableColumn['type']`。(`v0.3.0`)
 * [x] `props.cellHover`单元格悬浮样式。(`v0.3.2`)
+* [] 惯性滚动优化。
 
 
 ## Usage
@@ -176,16 +173,29 @@ export type StkProps = {
   /** 单元格再次点击否可以取消选中 (cellActive=true)*/
   selectedCellRevokable?: boolean;
   /** 表头是否可拖动。支持回调函数。 */
-  headerDrag?: boolean | ((col: StkTableColumn<DT>) => boolean);
+  headerDrag?:
+    | boolean
+    | {
+        /**
+         * 列交换模式
+         * - none - 不做任何事
+         * - insert - 插入(默认值)
+         * - swap - 交换
+         */
+        mode?: 'none' | 'insert' | 'swap';
+        /** 禁用拖动的列 */
+        disabled?: (col: StkTableColumn<DT>) => boolean;
+      };
   /**
    * 给行附加className<br>
    * FIXME: 是否需要优化，因为不传此prop会使表格行一直执行空函数，是否有影响
    */
   rowClassName?: (row: any, i: number) => string;
   /**
-   * 列宽是否可拖动<br>
+   * 列宽是否可拖动(需要设置v-model:columns)<br>
    * **不要设置**列minWidth，**必须**设置width<br>
    * 列宽拖动时，每一列都必须要有width，且minWidth/maxWidth不生效。table width会变为"fit-content"。
+   * - 会自动更新props.columns中的with属性
    */
   colResizable?: boolean;
   /** 可拖动至最小的列宽 */
@@ -237,6 +247,14 @@ export type StkProps = {
     /** 序号列起始下标 用于适配分页 */
     startIndex?: number;
   };
+  /** 展开行配置 */
+  expandConfig?: {
+    height?: number;
+  };
+  /** 列拖动配置 */
+  dragRowConfig?: {
+    mode?: 'none' | 'insert' | 'swap';
+  };
   /**
    * 固定头，固定列实现方式。
    * [非响应式]
@@ -349,11 +367,25 @@ export type StkProps = {
      * 列宽变动时触发
      */
     (e: 'col-resize', cols: StkTableColumn<DT>): void;
+     /**
+     * 展开行触发
+     * ```( data: { expanded: boolean; row: DT; col: StkTableColumn<DT> })```
+     */
+    (e: 'toggle-row-expand', data: { expanded: boolean; row: DT; col: StkTableColumn<DT> | null }): void;
     /** v-model:columns col resize 时更新宽度*/
     (e: 'update:columns', cols: StkTableColumn<DT>[]): void;
 }
 ```
 
+#### Slots
+
+| slots | props | describe |
+| ---- | ---- | ---- |
+| `tableHeader` | `{col}` | table header slot |
+| `empty` | --| no data status |
+| `expand` |  `{col, row}` | expand row |
+
+
 #### Expose
 ```js
 defineExpose({
@@ -383,6 +415,8 @@ defineExpose({
   scrollTo,
   /** 获取表格数据 */
   getTableData,
+  /** 设置展开行*/
+  setRowExpand,
 });
 ```
 
@@ -390,11 +424,18 @@ defineExpose({
 ``` ts
 type Sorter<T> = boolean | ((data: T[], option: { order: Order; column: any }) => T[]);
 export type StkTableColumn<T extends Record<string, any>> = {
+   /**
+     * 用于区分相同dataIndex 的列。
+     * 需要自行配置colKey="(col: StkTableColumn<any>) => col.key ?? col.dataIndex"
+     */
+    key?: any;
     /**
      * 列类型
      * - seq 序号列
+     * - expand 展开列
+     * - dragRow 拖拽列(使用sktTableRef.getTableData 获取改变后的顺序)
      */
-    type?: 'seq';
+    type?: 'seq' | 'expand' | 'dragRow';
     /** 取值id */
     dataIndex: keyof T & string;
     /** 表头文字 */

package/lib/src/StkTable/StkTable.vue.d.ts

@@ -1,11 +1,11 @@
-import { HighlightConfig, Order, SeqConfig, SortConfig, SortOption, SortState, StkTableColumn, UniqKeyProp } from './types/index';
+import { DragRowConfig, ExpandConfig, HeaderDragConfig, HighlightConfig, Order, PrivateRowDT, SeqConfig, SortConfig, SortOption, SortState, StkTableColumn, UniqKeyProp } from './types/index';
 
 /** Generic stands for DataType */
-type DT = any;
+type DT = any & PrivateRowDT;
 /**
  * 选中一行
  * @param {string} rowKeyOrRow selected rowKey, undefined to unselect
- * @param {boolean} option.silent if emit current-change. default:false(not emit `current-change`)
+ * @param {boolean} option.silent if set true not emit `current-change`. default:false
  */
 declare function setCurrentRow(rowKeyOrRow: string | undefined | DT, option?: {
     silent: boolean;
@@ -34,18 +34,28 @@ declare function setSorter(dataIndex: string, order: Order, option?: {
     silent?: boolean;
     sort?: boolean;
 }): any[];
-/** 重置排序 */
 declare function resetSorter(): void;
 /**
- * 设置滚动条位置
- * @param top 传null 则不变动位置
- * @param left 传null 则不变动位置
+ * set scroll bar position
+ * @param top null to not change
+ * @param left null to not change
  */
 declare function scrollTo(top?: number | null, left?: number | null): void;
-/** 获取当前状态的表格数据 */
+/** get current table data */
 declare function getTableData(): any[];
-/** 获取当前排序列的信息 */
+/** get current sort info */
 declare function getSortColumns(): Partial<SortState<DT>>[];
+/**
+ *
+ * @param rowKeyOrRow rowKey or row
+ * @param expand expand or collapse
+ * @param data { col?: StkTableColumn<DT> }
+ * @param data.silent if set true, not emit `toggle-row-expand`, default:false
+ */
+declare function setRowExpand(rowKeyOrRow: string | undefined | DT, expand?: boolean, data?: {
+    col?: StkTableColumn<DT>;
+    silent?: boolean;
+}): void;
 declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
     width?: string | undefined;
     /** 最小表格宽度 */
@@ -106,16 +116,17 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
     /** 单元格再次点击否可以取消选中 (cellActive=true)*/
     selectedCellRevokable?: boolean | undefined;
     /** 表头是否可拖动。支持回调函数。 */
-    headerDrag?: boolean | ((col: StkTableColumn<any>) => boolean) | undefined;
+    headerDrag?: HeaderDragConfig | undefined;
     /**
      * 给行附加className<br>
      * FIXME: 是否需要优化，因为不传此prop会使表格行一直执行空函数，是否有影响
      */
     rowClassName?: ((row: any, i: number) => string) | undefined;
     /**
-     * 列宽是否可拖动<br>
+     * 列宽是否可拖动(需要设置v-model:columns)<br>
      * **不要设置**列minWidth，**必须**设置width<br>
      * 列宽拖动时，每一列都必须要有width，且minWidth/maxWidth不生效。table width会变为"fit-content"。
+     * - 会自动更新props.columns中的with属性
      */
     colResizable?: boolean | undefined;
     /** 可拖动至最小的列宽 */
@@ -146,6 +157,10 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
     highlightConfig?: HighlightConfig | undefined;
     /** 序号列配置 */
     seqConfig?: SeqConfig | undefined;
+    /** 展开行配置 */
+    expandConfig?: ExpandConfig | undefined;
+    /** 列拖动配置 */
+    dragRowConfig?: DragRowConfig | undefined;
     /**
      * 固定头，固定列实现方式。(非响应式)
      *
@@ -206,6 +221,8 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
     hideHeaderTitle: boolean;
     highlightConfig: () => {};
     seqConfig: () => {};
+    expandConfig: () => {};
+    dragRowConfig: () => {};
     cellFixedMode: string;
     smoothScroll: boolean;
 }>, {
@@ -246,6 +263,8 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
     scrollTo: typeof scrollTo;
     /** @see {@link getTableData} */
     getTableData: typeof getTableData;
+    /** @see {@link setRowExpand} */
+    setRowExpand: typeof setRowExpand;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     "sort-change": (col: StkTableColumn<any> | null, order: Order, data: any[], sortConfig: SortConfig<any>) => void;
     "row-click": (ev: MouseEvent, row: any) => void;
@@ -273,7 +292,13 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
     "col-order-change": (dragStartKey: string, targetColKey: string) => void;
     "th-drag-start": (dragStartKey: string) => void;
     "th-drop": (targetColKey: string) => void;
+    "row-order-change": (dragStartKey: string, targetRowKey: string) => void;
     "col-resize": (cols: StkTableColumn<any>) => void;
+    "toggle-row-expand": (data: {
+        expanded: boolean;
+        row: any;
+        col: StkTableColumn<any> | null;
+    }) => void;
     "update:columns": (cols: StkTableColumn<any>[]) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<{
     width?: string | undefined;
@@ -335,16 +360,17 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
     /** 单元格再次点击否可以取消选中 (cellActive=true)*/
     selectedCellRevokable?: boolean | undefined;
     /** 表头是否可拖动。支持回调函数。 */
-    headerDrag?: boolean | ((col: StkTableColumn<any>) => boolean) | undefined;
+    headerDrag?: HeaderDragConfig | undefined;
     /**
      * 给行附加className<br>
      * FIXME: 是否需要优化，因为不传此prop会使表格行一直执行空函数，是否有影响
      */
     rowClassName?: ((row: any, i: number) => string) | undefined;
     /**
-     * 列宽是否可拖动<br>
+     * 列宽是否可拖动(需要设置v-model:columns)<br>
      * **不要设置**列minWidth，**必须**设置width<br>
      * 列宽拖动时，每一列都必须要有width，且minWidth/maxWidth不生效。table width会变为"fit-content"。
+     * - 会自动更新props.columns中的with属性
      */
     colResizable?: boolean | undefined;
     /** 可拖动至最小的列宽 */
@@ -375,6 +401,10 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
     highlightConfig?: HighlightConfig | undefined;
     /** 序号列配置 */
     seqConfig?: SeqConfig | undefined;
+    /** 展开行配置 */
+    expandConfig?: ExpandConfig | undefined;
+    /** 列拖动配置 */
+    dragRowConfig?: DragRowConfig | undefined;
     /**
      * 固定头，固定列实现方式。(非响应式)
      *
@@ -435,6 +465,8 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
     hideHeaderTitle: boolean;
     highlightConfig: () => {};
     seqConfig: () => {};
+    expandConfig: () => {};
+    dragRowConfig: () => {};
     cellFixedMode: string;
     smoothScroll: boolean;
 }>>> & {
@@ -445,8 +477,9 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
     "onUpdate:columns"?: ((cols: StkTableColumn<any>[]) => any) | undefined;
     "onCol-resize"?: ((cols: StkTableColumn<any>) => any) | undefined;
     "onTh-drag-start"?: ((dragStartKey: string) => any) | undefined;
-    "onCol-order-change"?: ((dragStartKey: string, targetColKey: string) => any) | undefined;
     "onTh-drop"?: ((targetColKey: string) => any) | undefined;
+    "onCol-order-change"?: ((dragStartKey: string, targetColKey: string) => any) | undefined;
+    "onRow-order-change"?: ((dragStartKey: string, targetRowKey: string) => any) | undefined;
     "onSort-change"?: ((col: StkTableColumn<any> | null, order: Order, data: any[], sortConfig: SortConfig<any>) => any) | undefined;
     "onRow-click"?: ((ev: MouseEvent, row: any) => any) | undefined;
     "onCurrent-change"?: ((ev: MouseEvent | null, row: any, data: {
@@ -466,6 +499,11 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
     "onCell-mouseover"?: ((ev: MouseEvent, row: any, col: StkTableColumn<any>) => any) | undefined;
     "onHeader-cell-click"?: ((ev: MouseEvent, col: StkTableColumn<any>) => any) | undefined;
     "onScroll-x"?: ((ev: Event) => any) | undefined;
+    "onToggle-row-expand"?: ((data: {
+        expanded: boolean;
+        row: any;
+        col: StkTableColumn<any> | null;
+    }) => any) | undefined;
 }, {
     width: string;
     minWidth: string;
@@ -473,6 +511,7 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
     rowHeight: number;
     headerRowHeight: number | null;
     headless: boolean;
+    colKey: UniqKeyProp;
     stripe: boolean;
     fixedMode: boolean;
     theme: "light" | "dark";
@@ -484,7 +523,6 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
     columns: StkTableColumn<any>[];
     dataSource: any[];
     rowKey: UniqKeyProp;
-    colKey: UniqKeyProp;
     emptyCellText: string | ((option: {
         row: any;
         col: StkTableColumn<any>;
@@ -498,7 +536,7 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
     cellHover: boolean;
     cellActive: boolean;
     selectedCellRevokable: boolean;
-    headerDrag: boolean | ((col: StkTableColumn<any>) => boolean);
+    headerDrag: HeaderDragConfig;
     rowClassName: (row: any, i: number) => string;
     colResizable: boolean;
     colMinWidth: number;
@@ -510,12 +548,18 @@ declare const _default: __VLS_WithTemplateSlots<import('vue').DefineComponent<__
     hideHeaderTitle: boolean | string[];
     highlightConfig: HighlightConfig;
     seqConfig: SeqConfig;
+    expandConfig: ExpandConfig;
+    dragRowConfig: DragRowConfig;
     cellFixedMode: "sticky" | "relative";
     smoothScroll: boolean;
 }, {}>, {
     tableHeader?(_: {
         col: StkTableColumn<any>;
     }): any;
+    expand?(_: {
+        row: any;
+        col: any;
+    }): any;
     empty?(_: {}): any;
 }>;
 export default _default;

package/lib/src/StkTable/components/DragHandle.vue.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
+export default _default;

package/lib/src/StkTable/components/SortIcon.vue.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
+export default _default;

package/lib/src/StkTable/const.d.ts

@@ -2,7 +2,7 @@ export declare const DEFAULT_COL_WIDTH = "100";
 export declare const DEFAULT_TABLE_HEIGHT = 100;
 export declare const DEFAULT_TABLE_WIDTH = 200;
 export declare const DEFAULT_ROW_HEIGHT = 28;
-/** 高亮背景色 */
+/** highlight background */
 export declare const HIGHLIGHT_COLOR: {
     light: {
         from: string;
@@ -13,16 +13,15 @@ export declare const HIGHLIGHT_COLOR: {
         to: string;
     };
 };
-/** 高亮持续时间 */
 export declare const HIGHLIGHT_DURATION = 2000;
-/** 高亮变更频率 */
+/** highlight change frequency 1000/30 -> 30FPS */
 export declare const HIGHLIGHT_FREQ: number;
-/** 高亮行class */
 export declare const HIGHLIGHT_ROW_CLASS = "highlight-row";
-/** 高连单元格class */
 export declare const HIGHLIGHT_CELL_CLASS = "highlight-cell";
-/** 低版本sticky兼容模式  */
+/** legacy sticky compatible mode  */
 export declare const IS_LEGACY_MODE: boolean;
-/** 默认props.smoothDefault */
+/** default props.smoothDefault */
 export declare const DEFAULT_SMOOTH_SCROLL: boolean;
 export declare const STK_ID_PREFIX = "stk";
+/** expanded row key prefix */
+export declare const EXPANDED_ROW_KEY_PREFIX = "expanded-";

package/lib/src/StkTable/types/index.d.ts

@@ -1,4 +1,4 @@
-import { Component, ConcreteComponent, VNode } from 'vue';
+import { Component, ConcreteComponent } from 'vue';
 
 /** 排序方式，asc-正序，desc-倒序，null-默认顺序 */
 export type Order = null | 'asc' | 'desc';
@@ -13,22 +13,18 @@ export type CustomCellProps<T extends Record<string, any>> = {
     cellValue: any;
     rowIndex: number;
     colIndex: number;
+    /**
+     * 当前行是否展开
+     * - 不展开: null
+     * - 展开: 返回column配置
+     */
+    expanded?: PrivateRowDT['__EXPANDED__'];
 };
-/**
- * $*$自定义单元格渲染函数
- * @deprecated
- */
-export type CustomCellFunc<T extends Record<string, any>> = (props: CustomCellProps<T>) => VNode;
 export type CustomHeaderCellProps<T extends Record<string, any>> = {
     col: StkTableColumn<T>;
     rowIndex: number;
     colIndex: number;
 };
-/**
- * $*$自定义表头渲染函数
- * @deprecated
- */
-export type CustomHeaderCellFunc<T extends Record<string, any>> = (props: CustomHeaderCellProps<T>) => VNode;
 /**
  * 自定义渲染单元格
  *
@@ -41,11 +37,18 @@ export type CustomHeaderCellFunc<T extends Record<string, any>> = (props: Custom
 export type CustomCell<T extends CustomCellProps<U> | CustomHeaderCellProps<U>, U extends Record<string, any>> = ConcreteComponent<T> | Exclude<Component<Partial<T>>, ConcreteComponent> | string;
 /** 表格列配置 */
 export type StkTableColumn<T extends Record<string, any>> = {
+    /**
+     * 用于区分相同dataIndex 的列。
+     * 需要自行配置colKey="(col: StkTableColumn<any>) => col.key ?? col.dataIndex"
+     */
+    key?: any;
     /**
      * 列类型
      * - seq 序号列
+     * - expand 展开列
+     * - dragRow 拖拽列(使用sktTableRef.getTableData 获取改变后的顺序)
      */
-    type?: 'seq';
+    type?: 'seq' | 'expand' | 'dragRow';
     /** 取值id */
     dataIndex: keyof T & string;
     /** 表头文字 */
@@ -96,23 +99,44 @@ export type StkTableColumn<T extends Record<string, any>> = {
     customHeaderCell?: CustomCell<CustomHeaderCellProps<T>, T>;
     /** 二级表头 */
     children?: StkTableColumn<T>[];
-    /** private 父节点引用 */
+};
+/** private StkTableColumn type. Add some private key */
+export type PrivateStkTableColumn<T extends Record<string, any>> = StkTableColumn<T> & {
+    /**
+     * 父节点引用
+     * @private
+     */
     __PARENT__?: StkTableColumn<T> | null;
-    /** private 保存计算的宽度。横向虚拟滚动用。 */
+    /**
+     * 保存计算的宽度。横向虚拟滚动用。
+     * @private
+     */
     __WIDTH__?: number;
 };
+/** private row keys */
+export type PrivateRowDT = {
+    /**
+     * Only expanded row will add this key
+     *
+     * If user define the `__ROW_KEY__` in table data, this value will be used as the row key
+     * @private
+     */
+    __ROW_KEY__: string;
+    /**
+     * if row expanded
+     * @private
+     */
+    __EXPANDED__?: StkTableColumn<any> | null;
+};
 export type SortOption<T extends Record<string, any>> = Pick<StkTableColumn<T>, 'sorter' | 'dataIndex' | 'sortField' | 'sortType'>;
-/** 排序状态 */
 export type SortState<T> = {
     dataIndex: keyof T;
     order: Order;
     sortType?: 'number' | 'string';
 };
-/** 唯一键 */
 export type UniqKey = string | number;
 export type UniqKeyFun = (param: any) => UniqKey;
 export type UniqKeyProp = UniqKey | UniqKeyFun;
-/** 排序配置 */
 export type SortConfig<T extends Record<string, any>> = {
     /** 空值始终排在列表末尾 */
     emptyToBottom?: boolean;
@@ -135,21 +159,46 @@ export type SortConfig<T extends Record<string, any>> = {
      */
     stringLocaleCompare?: boolean;
 };
-/** th td类型 */
+/** th td type */
 export declare const enum TagType {
     TH = 0,
     TD = 1
 }
-/** 高亮配置 */
 export type HighlightConfig = {
-    /** 高亮持续时间(s) */
+    /** Duration of the highlight in seconds */
     duration?: number;
-    /** 高亮帧率 */
+    /** Frame rate of the highlight */
     fps?: number;
 };
-/** 序号列配置 */
+/**
+ * Configuration options for the sequence column.
+ */
 export type SeqConfig = {
     /** 序号列起始下标 用于适配分页 */
     startIndex?: number;
 };
+/** Configuration options for the expand column  */
+export type ExpandConfig = {
+    height?: number;
+};
+export type ExpandedRow = PrivateRowDT & {
+    __EXPANDED_ROW__: any;
+    __EXPANDED_COL__: any;
+};
+/** drag row config */
+export type DragRowConfig = {
+    mode?: 'none' | 'insert' | 'swap';
+};
+/** header drag config */
+export type HeaderDragConfig<DT extends Record<string, any> = any> = boolean | {
+    /**
+     * 列交换模式
+     * - none - 不做任何事
+     * - insert - 插入(默认值)
+     * - swap - 交换
+     */
+    mode?: 'none' | 'insert' | 'swap';
+    /** 禁用拖动的列 */
+    disabled?: (col: StkTableColumn<DT>) => boolean;
+};
 export {};

package/lib/src/StkTable/useThDrag.d.ts

@@ -1,18 +1,20 @@
-import { StkTableColumn } from './types';
+import { ComputedRef } from 'vue';
+import { StkTableColumn, UniqKey } from './types';
 
-type Params = {
+type Params<T extends Record<string, any>> = {
     props: any;
     emits: any;
+    colKeyGen: ComputedRef<(col: StkTableColumn<T>) => UniqKey>;
 };
 /**
  * 列顺序拖动
- * @param param0
  * @returns
  */
-export declare function useThDrag<DT extends Record<string, any>>({ props, emits }: Params): {
-    onThDragStart: (e: MouseEvent) => void;
-    onThDragOver: (e: MouseEvent) => void;
-    onThDrop: (e: MouseEvent) => void;
-    isHeaderDraggable: (col: StkTableColumn<DT>) => any;
+export declare function useThDrag<DT extends Record<string, any>>({ props, emits, colKeyGen }: Params<DT>): {
+    onThDragStart: (e: DragEvent) => void;
+    onThDragOver: (e: DragEvent) => void;
+    onThDrop: (e: DragEvent) => void;
+    /** 是否可拖拽 */
+    isHeaderDraggable: any;
 };
 export {};

package/lib/src/StkTable/useTrDrag.d.ts

@@ -0,0 +1,21 @@
+import { ShallowRef } from 'vue';
+import { DragRowConfig } from './types';
+
+type Params = {
+    props: any;
+    emits: any;
+    dataSourceCopy: ShallowRef<any[]>;
+};
+/**
+ * 拖拽行
+ * TODO: 不在虚拟滚动的情况下，从上面拖拽到下面，跨页的时候，滚动条会自适应位置。没有顶上去
+ */
+export declare function useTrDrag({ props, emits, dataSourceCopy }: Params): {
+    dragRowConfig: import('vue').ComputedRef<DragRowConfig>;
+    onTrDragStart: (e: DragEvent, rowIndex: number) => void;
+    onTrDragEnter: (e: DragEvent) => void;
+    onTrDragOver: (e: DragEvent) => void;
+    onTrDrop: (e: DragEvent, rowIndex: number) => void;
+    onTrDragEnd: (e: DragEvent) => void;
+};
+export {};

package/lib/src/StkTable/useVirtualScroll.d.ts

@@ -4,7 +4,6 @@ import { StkTableColumn } from './types';
 type Option<DT extends Record<string, any>> = {
     props: any;
     tableContainerRef: Ref<HTMLElement | undefined>;
-    theadRef: Ref<HTMLElement | undefined>;
     dataSourceCopy: ShallowRef<DT[]>;
     tableHeaderLast: ShallowRef<StkTableColumn<DT>[]>;
     tableHeaders: ShallowRef<StkTableColumn<DT>[][]>;
@@ -48,7 +47,7 @@ export type VirtualScrollXStore = {
  * @param param0
  * @returns
  */
-export declare function useVirtualScroll<DT extends Record<string, any>>({ props, tableContainerRef, theadRef, dataSourceCopy, tableHeaderLast, tableHeaders, }: Option<DT>): {
+export declare function useVirtualScroll<DT extends Record<string, any>>({ props, tableContainerRef, dataSourceCopy, tableHeaderLast, tableHeaders, }: Option<DT>): {
     virtualScroll: Ref<{
         containerHeight: number;
         pageSize: number;

package/lib/src/StkTable/utils/index.d.ts

@@ -1,4 +1,4 @@
-import { Order, SortConfig, SortOption, SortState, StkTableColumn } from '../types';
+import { Order, PrivateStkTableColumn, SortConfig, SortOption, SortState, StkTableColumn } from '../types';
 
 /**
  * 对有序数组插入新数据
@@ -44,7 +44,7 @@ export declare function howDeepTheHeader(arr: StkTableColumn<any>[], level?: num
  */
 export declare function getColWidth(col: StkTableColumn<any> | null): number;
 /** 获取计算后的宽度 */
-export declare function getCalculatedColWidth(col: StkTableColumn<any> | null): number;
+export declare function getCalculatedColWidth(col: PrivateStkTableColumn<any> | null): number;
 /** number列宽+px */
 export declare function transformWidthToStr(width?: string | number): string | undefined;
 /** 创建组件唯一标识 */