vxe-table 3.20.11 → 3.20.13

package/packages/table/src/body.ts

@@ -1,6 +1,7 @@
 import { PropType, CreateElement } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
+import { defineVxeComponent } from '../../ui/src/comp'
 import { isEnableConf, getClass } from '../../ui/src/utils'
 import { getRowid, createHandleGetRowId, getCellRestHeight } from './util'
 import { updateCellTitle } from '../../ui/src/dom'
@@ -710,7 +711,7 @@ function renderRows (h: CreateElement, _vm: any, fixedType: 'left' | 'right' | '
   return rows
 }
 
-export default {
+export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeTableBody',
   props: {
     tableData: Array as PropType<any[]>,
@@ -718,10 +719,10 @@ export default {
     fixedColumn: Array as PropType<VxeTableDefines.ColumnInfo[]>,
     fixedType: {
       type: String as PropType<'right' | 'left' | ''>,
-      default: ''
+      default: '' as 'right' | 'left' | ''
     }
   },
-  mounted (this: any) {
+  mounted () {
     const _vm = this
     const props = _vm
     const $xeTable = _vm.$parent as VxeTableConstructor & VxeTablePrivateMethods
@@ -739,7 +740,7 @@ export default {
     elemStore[`${prefix}ySpace`] = _vm.$refs.refBodyYSpace
     elemStore[`${prefix}emptyBlock`] = _vm.$refs.refBodyEmptyBlock
   },
-  destroyed (this: any) {
+  destroyed () {
     const props = this
     const $xeTable = this.$parent as VxeTableConstructor & VxeTablePrivateMethods
     const tableInternalData = $xeTable as unknown as TableInternalData
@@ -756,7 +757,7 @@ export default {
     elemStore[`${prefix}ySpace`] = null
     elemStore[`${prefix}emptyBlock`] = null
   },
-  render (this: any, h: CreateElement) {
+  render (h: CreateElement) {
     const props = this
     const $xeTable = this.$parent as VxeTableConstructor & VxeTablePrivateMethods
     const tableProps = $xeTable
@@ -969,4 +970,4 @@ export default {
       ])
     ])
   }
-}
+}) /* define-vxe-component end */

package/packages/table/src/footer.ts

@@ -1,6 +1,7 @@
 import { PropType, CreateElement } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
+import { defineVxeComponent } from '../../ui/src/comp'
 import { getClass } from '../../ui/src/utils'
 import { updateCellTitle } from '../../ui/src/dom'
 import { getCalcHeight } from './util'
@@ -222,7 +223,7 @@ function renderHeads (h: CreateElement, _vm: any, isOptimizeMode: boolean, rende
   })
 }
 
-export default {
+export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeTableFooter',
   props: {
     footerTableData: {
@@ -243,7 +244,7 @@ export default {
     }
   },
   mounted () {
-    const _vm = this as any
+    const _vm = this
     const props = _vm
     const $xeTable = _vm.$parent as VxeTableConstructor & VxeTablePrivateMethods
     const tableInternalData = $xeTable as unknown as TableInternalData
@@ -259,7 +260,7 @@ export default {
     elemStore[`${prefix}xSpace`] = _vm.$refs.refFooterXSpace
   },
   destroyed () {
-    const _vm = this as any
+    const _vm = this
     const props = _vm
     const $xeTable = _vm.$parent as VxeTableConstructor & VxeTablePrivateMethods
     const tableInternalData = $xeTable as unknown as TableInternalData
@@ -385,4 +386,4 @@ export default {
       ])
     ])
   }
-}
+}) /* define-vxe-component end */

package/packages/table/src/header.ts

@@ -1,6 +1,7 @@
 import { PropType, CreateElement } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
+import { defineVxeComponent } from '../../ui/src/comp'
 import { isEnableConf, getClass } from '../../ui/src/utils'
 import { getCalcHeight, convertHeaderColumnToRows, convertHeaderToGridRows } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
@@ -362,7 +363,7 @@ function renderHeads (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMo
   return rowVNs
 }
 
-export default {
+export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeTableHeader',
   props: {
     tableData: Array as PropType<any[]>,
@@ -375,8 +376,10 @@ export default {
     }
   },
   data () {
+    const headerColumn: VxeTableDefines.ColumnInfo[][] = []
+
     return {
-      headerColumn: []
+      headerColumn
     }
   },
   watch: {
@@ -391,7 +394,7 @@ export default {
     _vm.uploadColumn()
   },
   mounted () {
-    const _vm = this as any
+    const _vm = this
     const props = _vm
     const $xeTable = _vm.$parent as VxeTableConstructor & VxeTablePrivateMethods
     const internalData = $xeTable as unknown as TableInternalData
@@ -408,7 +411,7 @@ export default {
     elemStore[`${prefix}repair`] = _vm.$refs.refHeaderBorderRepair
   },
   destroyed () {
-    const _vm = this as any
+    const _vm = this
     const props = _vm
     const $xeTable = _vm.$parent as VxeTableConstructor & VxeTablePrivateMethods
     const internalData = $xeTable as unknown as TableInternalData
@@ -425,7 +428,7 @@ export default {
     elemStore[`${prefix}repair`] = null
   },
   render (h: CreateElement) {
-    const _vm = this as any
+    const _vm = this
     const props = _vm
     const $xeTable = _vm.$parent as VxeTableConstructor & VxeTablePrivateMethods
     const tableProps = $xeTable
@@ -434,7 +437,7 @@ export default {
 
     const { xID } = $xeTable
     const { fixedType, fixedColumn, tableColumn } = props
-    const { headerColumn } = _vm
+    const { headerColumn } = _vm as any
 
     const { mouseConfig } = tableProps
     const { isGroup, isColLoading, overflowX, scrollXLoad, dragCol } = tableReactData
@@ -577,7 +580,7 @@ export default {
   },
   methods: {
     uploadColumn () {
-      const _vm = this as any
+      const _vm = this
       const $xeTable = _vm.$parent as VxeTableConstructor & VxeTablePrivateMethods
       const tableProps = $xeTable
       const tableReactData = $xeTable as unknown as TableReactData
@@ -595,8 +598,10 @@ export default {
         visibleColgroups = convertHeaderToGridRows(spanColumns)
         spanColumns = visibleColgroups
       }
-      _vm.headerColumn = spanColumns
-      $xeTable.dispatchEvent('columns-change', { visibleColgroups, collectColumn, visibleColumn }, null)
+      (_vm as any).headerColumn = spanColumns
+      $xeTable.$nextTick(() => {
+        $xeTable.dispatchEvent('columns-change', { visibleColgroups, collectColumn, visibleColumn }, null)
+      })
     }
   }
-}
+}) /* define-vxe-component end */

package/packages/table/src/methods.ts

@@ -1394,7 +1394,7 @@ function handleDefaultRadioChecked ($xeTable: VxeTableConstructor & VxeTablePriv
     const { checkRowKey: rowid, reserve } = radioOpts
     if (rowid) {
       if (fullDataRowIdData[rowid]) {
-        handleCheckedRadioRow(fullDataRowIdData[rowid].row, true)
+        handleCheckedRadioRow($xeTable, fullDataRowIdData[rowid].row, true)
       }
       if (reserve) {
         const rowkey = getRowkey($xeTable)
@@ -1454,7 +1454,7 @@ function handleCheckboxReserveRow ($xeTable: VxeTableConstructor & VxeTablePriva
   }
 }
 
-function handleCheckedRadioRow ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, row: any, isForce?: boolean) {
+function handleCheckedRadioRow ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, row: any, isForce: boolean) {
   const reactData = $xeTable as unknown as TableReactData
 
   const radioOpts = $xeTable.computeRadioOpts
@@ -2556,10 +2556,13 @@ const calcCellHeight = ($xeTable: VxeTableConstructor) => {
   const { treeConfig } = props
   const { tableData, isAllOverflow, scrollYLoad, scrollXLoad } = reactData
   const { fullAllDataRowIdData } = internalData
+  const el = $xeTable.$refs.refElem as HTMLDivElement
+  if (!el || !el.clientWidth) {
+    return
+  }
   const treeOpts = $xeTable.computeTreeOpts
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
-  const el = $xeTable.$refs.refElem as HTMLDivElement
-  if (el && !isAllOverflow && (scrollYLoad || scrollXLoad || (treeConfig && treeOpts.showLine))) {
+  if (!isAllOverflow && (scrollYLoad || scrollXLoad || (treeConfig && treeOpts.showLine))) {
     const { handleGetRowId } = createHandleGetRowId($xeTable)
     el.setAttribute('data-calc-row', 'Y')
     tableData.forEach(row => {
@@ -3047,6 +3050,10 @@ function calcScrollbar ($xeTable: VxeTableConstructor & VxeTablePrivateMethods)
   const { scrollXWidth, scrollYHeight } = reactData
   const { elemStore } = internalData
   const scrollbarOpts = $xeTable.computeScrollbarOpts
+  const el = $xeTable.$refs.refElem as HTMLDivElement
+  if (!el || !el.clientWidth) {
+    return
+  }
   const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper'])
   const headerTableElem = getRefElem(elemStore['main-header-table'])
   const footerTableElem = getRefElem(elemStore['main-footer-table'])
@@ -4203,6 +4210,10 @@ function updateColumnOffsetLeft ($xeTable: VxeTableConstructor & VxeTablePrivate
   const internalData = $xeTable as unknown as TableInternalData
 
   const { visibleColumn, fullColumnIdData } = internalData
+  const el = $xeTable.$refs.refElem as HTMLDivElement
+  if (!el || !el.clientWidth) {
+    return
+  }
   let offsetLeft = 0
   for (let cIndex = 0, rLen = visibleColumn.length; cIndex < rLen; cIndex++) {
     const column = visibleColumn[cIndex]
@@ -4221,6 +4232,10 @@ function updateRowOffsetTop ($xeTable: VxeTableConstructor & VxeTablePrivateMeth
 
   const { expandColumn } = reactData
   const { afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData
+  const el = $xeTable.$refs.refElem as HTMLDivElement
+  if (!el || !el.clientWidth) {
+    return
+  }
   const expandOpts = $xeTable.computeExpandOpts
   const rowOpts = $xeTable.computeRowOpts
   const cellOpts = $xeTable.computeCellOpts
@@ -4248,6 +4263,10 @@ function updateRowExpandStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMe
   const internalData = $xeTable as unknown as TableInternalData
 
   const { expandColumn, scrollYLoad, scrollYTop, isScrollYBig } = reactData
+  const el = $xeTable.$refs.refElem as HTMLDivElement
+  if (!el || !el.clientWidth) {
+    return
+  }
   const expandOpts = $xeTable.computeExpandOpts
   const rowOpts = $xeTable.computeRowOpts
   const cellOpts = $xeTable.computeCellOpts
@@ -4315,6 +4334,10 @@ function updateTreeLineStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMet
   }
   const { tableData } = reactData
   const { fullAllDataRowIdData, treeExpandedMaps } = internalData
+  const el = $xeTable.$refs.refElem as HTMLDivElement
+  if (!el || !el.clientWidth) {
+    return
+  }
   const cellOpts = $xeTable.computeCellOpts
   const rowOpts = $xeTable.computeRowOpts
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
@@ -8643,14 +8666,14 @@ const tableMethods: any = {
       let newValue = row
       let isChange = oldValue !== newValue
       if (strict) {
-        handleCheckedRadioRow($xeTable, newValue)
+        handleCheckedRadioRow($xeTable, newValue, false)
       } else {
         if (oldValue === newValue) {
           newValue = null
         }
         isChange = oldValue !== newValue
         if (isChange && newValue) {
-          handleCheckedRadioRow($xeTable, newValue)
+          handleCheckedRadioRow($xeTable, newValue, false)
         } else {
           newValue = null
           $xeTable.clearRadioRow()
@@ -11437,12 +11460,12 @@ const tableMethods: any = {
     const reactData = $xeTable as unknown as TableReactData
     const internalData = $xeTable as unknown as TableInternalData
 
-    const { tableFullData } = internalData
+    const { tableFullTreeData } = internalData
     const treeOpts = $xeTable.computeTreeOpts
     const { transform, lazy } = treeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
     const expandeds: any[] = []
-    XEUtils.eachTree(tableFullData, (row) => {
+    XEUtils.eachTree(tableFullTreeData, (row) => {
       const rowChildren = row[childrenField]
       if (lazy || (rowChildren && rowChildren.length)) {
         expandeds.push(row)