diff --git a/packages/dynamics/index.ts b/packages/dynamics/index.ts index b325320..699096e 100644 --- a/packages/dynamics/index.ts +++ b/packages/dynamics/index.ts @@ -24,7 +24,7 @@ const VxeDynamics = defineComponent({ setup () { const VxeUIModalComponent = VxeUI.getComponent('VxeModal') const VxeUIDrawerComponent = VxeUI.getComponent('VxeDrawer') - const VxeUILoadingComponent = VxeUI.getComponent('VxeTooltip') + const VxeUILoadingComponent = VxeUI.getComponent('VxeLoading') const VxeUIWatermarkComponent = VxeUI.getComponent('VxeWatermark') return () => { diff --git a/types/components/table.d.ts b/types/components/table.d.ts index faf058b..7496212 100644 --- a/types/components/table.d.ts +++ b/types/components/table.d.ts @@ -2392,61 +2392,11 @@ export interface TableInternalData { // 渲染所有列 visibleColumn: VxeTableDefines.ColumnInfo[] // 缓存数据集 - fullAllDataRowIdData: { - [key: string]: { - row: D - rowid: string - seq: string | number - index: number - $index: number - _index: number - items: any[] - parent: any - level: number - treeLoaded?: boolean - expandLoaded?: boolean - formatData?: { - [key: string]: { - value: any - label: any - } - } - } - } + fullAllDataRowIdData: Record sourceDataRowIdData: Record - fullDataRowIdData: { - [key: string]: { - row: D - rowid: string - seq: string | number - index: number - $index: number - _index: number - items: any[] - parent: any - level: number - } - } - fullColumnIdData: { - [key: string]: { - column: VxeTableDefines.ColumnInfo - colid: string - index: number - $index: number - _index: number - items: VxeTableDefines.ColumnInfo[] - parent: VxeTableDefines.ColumnInfo - } - } - fullColumnFieldData: { - [key: string]: { - column: VxeTableDefines.ColumnInfo - colid: string - index: number - items: VxeTableDefines.ColumnInfo[] - parent: VxeTableDefines.ColumnInfo - } - } + fullDataRowIdData: Record + fullColumnIdData: Record> + fullColumnFieldData: Record> // 列选取状态 columnStatusMaps: Record // 行选取状态 @@ -3306,6 +3256,36 @@ export namespace VxeTableDefines { slots?: VxeColumnPropTypes.Slots } + export interface RowCacheItem { + row: D + rowid: string + seq: string | number + index: number + $index: number + _index: number + items: any[] + parent: any + level: number + treeLoaded?: boolean + expandLoaded?: boolean + formatData?: { + [key: string]: { + value: any + label: any + } + } + } + + export interface ColumnCacheItem { + column: VxeTableDefines.ColumnInfo + colid: string + index: number + $index: number + _index: number + items: VxeTableDefines.ColumnInfo[] + parent: VxeTableDefines.ColumnInfo + } + /** * 列对象 */