fix 修复全局 loading 无效问题 #39

x-extends · Oct 8, 2024 · 637a492 · 637a492
1 parent 0c4899e
commit 637a492
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 55 deletions.
diff --git a/packages/dynamics/index.ts b/packages/dynamics/index.ts
@@ -24,7 +24,7 @@ const VxeDynamics = defineComponent({
   setup () {
     const VxeUIModalComponent = VxeUI.getComponent<VxeModalComponent>('VxeModal')
     const VxeUIDrawerComponent = VxeUI.getComponent<VxeDrawerComponent>('VxeDrawer')
-    const VxeUILoadingComponent = VxeUI.getComponent<VxeLoadingComponent>('VxeTooltip')
+    const VxeUILoadingComponent = VxeUI.getComponent<VxeLoadingComponent>('VxeLoading')
     const VxeUIWatermarkComponent = VxeUI.getComponent<VxeWatermarkComponent>('VxeWatermark')
 
     return () => {

diff --git a/types/components/table.d.ts b/types/components/table.d.ts
@@ -2392,61 +2392,11 @@ export interface TableInternalData<D = any> {
   // 渲染所有列
   visibleColumn: VxeTableDefines.ColumnInfo<D>[]
   // 缓存数据集
-  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<string, VxeTableDefines.RowCacheItem>
   sourceDataRowIdData: Record<string, D>
-  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<D>
-      colid: string
-      index: number
-      $index: number
-      _index: number
-      items: VxeTableDefines.ColumnInfo<D>[]
-      parent: VxeTableDefines.ColumnInfo<D>
-    }
-  }
-  fullColumnFieldData: {
-    [key: string]: {
-      column: VxeTableDefines.ColumnInfo<D>
-      colid: string
-      index: number
-      items: VxeTableDefines.ColumnInfo<D>[]
-      parent: VxeTableDefines.ColumnInfo<D>
-    }
-  }
+  fullDataRowIdData: Record<string, VxeTableDefines.RowCacheItem>
+  fullColumnIdData: Record<string, VxeTableDefines.ColumnCacheItem<D>>
+  fullColumnFieldData: Record<string, VxeTableDefines.ColumnCacheItem<D>>
   // 列选取状态
   columnStatusMaps: Record<string, boolean>
   // 行选取状态
@@ -3306,6 +3256,36 @@ export namespace VxeTableDefines {
     slots?: VxeColumnPropTypes.Slots<D>
   }
 
+  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<D = any> {
+    column: VxeTableDefines.ColumnInfo<D>
+    colid: string
+    index: number
+    $index: number
+    _index: number
+    items: VxeTableDefines.ColumnInfo<D>[]
+    parent: VxeTableDefines.ColumnInfo<D>
+  }
+
   /**
    * 列对象
    */