vxe-table 3.25.0-beta.4 → 3.25.0-beta.5

package/packages/table/src/table.ts

@@ -26,7 +26,7 @@ import keyboardMixin from '../module/keyboard/mixin'
 import validatorMixin from '../module/validator/mixin'
 import customMixin from '../module/custom/mixin'
 
-import type { VxeTabsConstructor, VxeTabsPrivateMethods, VxeComponentStyleType, VxeModalConstructor, VxeModalMethods } from 'vxe-pc-ui'
+import type { VxeTabsConstructor, VxeTabsPrivateMethods, VxeComponentStyleType, VxeModalConstructor, VxeModalMethods, VxeUseSizeComputed, VxeUseVScrollbarComputed, VxeUseInitVScrollbarComputed } from 'vxe-pc-ui'
 import type { VxeTableConstructor, VxeTablePrivateMethods, VxeTablePropTypes, TableInternalData, TableReactData, VxeTableDefines } from '../../../types'
 
 const { warnLog, errLog } = createComponentLog('table')
@@ -624,18 +624,18 @@ function renderVirtualBody (h: CreateElement, $xeTable: VxeTableConstructor & Vx
           ref: 'refTrackXElem',
           class: 'vxe-scrollbar--track-x',
           on: {
-            click: ($xeTable as any).clickTrackXEvent
+            click: $xeTable.clickTrackXEvent
           }
         }, [
           h('div', {
             ref: 'refThumbXElem',
             class: 'vxe-scrollbar--thumb-x',
             on: {
-              pointerdown: ($xeTable as any).pointerdownThumbXEvent,
-              pointermove: ($xeTable as any).pointermoveThumbXEvent,
-              pointerup: ($xeTable as any).cleatPointerThumbEvent,
-              pointercancel: ($xeTable as any).cleatPointerThumbEvent,
-              lostpointercapture: ($xeTable as any).cleatPointerThumbEvent
+              pointerdown: $xeTable.pointerdownThumbXEvent,
+              pointermove: $xeTable.pointermoveThumbXEvent,
+              pointerup: $xeTable.cleatPointerThumbEvent,
+              pointercancel: $xeTable.cleatPointerThumbEvent,
+              lostpointercapture: $xeTable.cleatPointerThumbEvent
             }
           })
         ]),
@@ -645,18 +645,18 @@ function renderVirtualBody (h: CreateElement, $xeTable: VxeTableConstructor & Vx
           ref: 'refTrackYElem',
           class: 'vxe-scrollbar--track-y',
           on: {
-            click: ($xeTable as any).clickTrackYEvent
+            click: $xeTable.clickTrackYEvent
           }
         }, [
           h('div', {
             ref: 'refThumbYElem',
             class: 'vxe-scrollbar--thumb-y',
             on: {
-              pointerdown: ($xeTable as any).pointerdownThumbYEvent,
-              pointermove: ($xeTable as any).pointermoveThumbYEvent,
-              pointerup: ($xeTable as any).cleatPointerThumbEvent,
-              pointercancel: ($xeTable as any).cleatPointerThumbEvent,
-              lostpointercapture: ($xeTable as any).cleatPointerThumbEvent
+              pointerdown: $xeTable.pointerdownThumbYEvent,
+              pointermove: $xeTable.pointermoveThumbYEvent,
+              pointerup: $xeTable.cleatPointerThumbEvent,
+              pointercancel: $xeTable.cleatPointerThumbEvent,
+              lostpointercapture: $xeTable.cleatPointerThumbEvent
             }
           })
         ])
@@ -668,6 +668,8 @@ export default {
   name: 'VxeTable',
   mixins: [
     globalMixins.sizeMixin,
+    globalMixins.vScrollbarMixin,
+    globalMixins.initVScrollbarMixin,
     filterMixin,
     menuMixin,
     editMixin,
@@ -723,7 +725,7 @@ export default {
     }
   },
   computed: {
-    ...({} as {
+    ...({} as VxeUseSizeComputed & VxeUseVScrollbarComputed & VxeUseInitVScrollbarComputed & {
       $xeModal(): (VxeModalConstructor & VxeModalMethods)| null
       $xeTabs(): (VxeTabsConstructor & VxeTabsPrivateMethods) | null
     }),
@@ -2532,7 +2534,7 @@ export default {
       footer: slots.footerTooltip || slots['footer-tooltip']
     }
     const currTooltipSlot = tooltipStore.visible && tooltipStore.type ? tipSlots[tooltipStore.type] : null
-    const tableStyle = ($xeTable as any).computeTableStyle as VxeComponentStyleType
+    const tableStyle = $xeTable.computeTableStyle
     const rowDragOpts = $xeTable.computeRowDragOpts
     const tableTipConfig = $xeTable.computeTableTipConfig
     const validTipConfig = $xeTable.computeValidTipConfig