vxe-table 4.13.2 → 4.13.4

package/packages/table/src/header.ts

@@ -25,7 +25,7 @@ export default defineComponent({
     const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods)
 
     const { xID, props: tableProps, reactData: tableReactData, internalData: tableInternalData } = $xeTable
-    const { computeColumnOpts, computeColumnDragOpts, computeCellOpts, computeMouseOpts, computeHeaderCellOpts, computeDefaultRowHeight } = $xeTable.getComputeMaps()
+    const { computeColumnOpts, computeColumnDragOpts, computeCellOpts, computeMouseOpts, computeHeaderCellOpts, computeDefaultRowHeight, computeVirtualXOpts } = $xeTable.getComputeMaps()
 
     const headerColumn = ref([] as VxeTableDefines.ColumnInfo[][])
 
@@ -49,6 +49,7 @@ export default defineComponent({
       const { resizable: allResizable, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps
       const { currentColumn, dragCol, scrollXLoad, scrollYLoad, overflowX } = tableReactData
       const { fullColumnIdData, scrollXStore } = tableInternalData
+      const virtualXOpts = computeVirtualXOpts.value
       const columnOpts = computeColumnOpts.value
       const columnDragOpts = computeColumnDragOpts.value
       const cellOpts = computeCellOpts.value
@@ -120,7 +121,7 @@ export default defineComponent({
         let isVNPreEmptyStatus = false
         if (!isGroup) {
           if (!dragCol || dragCol.id !== colid) {
-            if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+            if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
               isVNPreEmptyStatus = true
             }
           }

package/packages/table/src/table.ts

@@ -3293,8 +3293,8 @@ export default defineComponent({
       const childrenField = treeOpts.children || treeOpts.childrenField
       const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
       const result: any[] = []
-      const columnIndex = tableMethods.getColumnIndex(treeNodeColumn)
-      const $columnIndex = tableMethods.getVMColumnIndex(treeNodeColumn)
+      const columnIndex = $xeTable.getColumnIndex(treeNodeColumn)
+      const $columnIndex = $xeTable.getVMColumnIndex(treeNodeColumn)
       const { handleGetRowId } = createHandleGetRowId($xeTable)
       let validRows = toggleMethod ? rows.filter((row: any) => toggleMethod({ $table: $xeTable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows
       if (accordion) {
@@ -3341,7 +3341,7 @@ export default defineComponent({
       }
       reactData.treeExpandedFlag++
       return Promise.all(result).then(() => {
-        return tableMethods.recalculate()
+        return $xeTable.recalculate()
       })
     }
 
@@ -3354,14 +3354,14 @@ export default defineComponent({
     const handleVirtualTreeExpand = (rows: any[], expanded: boolean) => {
       return handleBaseTreeExpand(rows, expanded).then(() => {
         handleVirtualTreeToList()
-        tablePrivateMethods.handleTableData()
+        $xeTable.handleTableData()
         updateAfterDataIndex()
         return nextTick()
       }).then(() => {
-        return tableMethods.recalculate(true)
+        return $xeTable.recalculate(true)
       }).then(() => {
         setTimeout(() => {
-          tableMethods.updateCellAreas()
+          $xeTable.updateCellAreas()
         }, 30)
       })
     }
@@ -5547,7 +5547,7 @@ export default defineComponent({
             internalData.rowExpandedMaps = rowExpandedMaps
             rows = rows.slice(rows.length - 1, rows.length)
           }
-          const validRows: any[] = toggleMethod ? rows.filter((row: any) => toggleMethod({ $table: $xeTable, expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) })) : rows
+          const validRows: any[] = toggleMethod ? rows.filter((row: any) => toggleMethod({ $table: $xeTable, expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: $xeTable.getRowIndex(row), $rowIndex: $xeTable.getVMRowIndex(row) })) : rows
           if (expanded) {
             validRows.forEach((row: any) => {
               const rowid = handleGetRowId(row)
@@ -8336,7 +8336,7 @@ export default defineComponent({
               internalData.treeEATime = setTimeout(() => {
                 internalData.treeEATime = undefined
                 $xeTable.scrollToRow(row)
-              }, 20)
+              }, 30)
             }
           })
           dispatchEvent('toggle-tree-expand', { expanded, column, columnIndex, $columnIndex, row }, evnt)
@@ -10683,6 +10683,9 @@ export default defineComponent({
         if (props.highlightHoverColumn) {
           warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
         }
+        if (props.resizable) {
+          warnLog('vxe.error.delProp', ['resizable', 'column-config.resizable'])
+        }
         // if (props.scrollY) {
         //   warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
         // }

package/styles/components/table.scss

@@ -1620,9 +1620,9 @@
     z-index: 1;
     user-select: none;
     cursor: pointer;
-    & > i {
-      background-color: var(--vxe-ui-layout-background-color);
-    }
+    // & > i {
+    //   background-color: var(--vxe-ui-layout-background-color); // 影响选择行相关
+    // }
   }
   .vxe-tree--node-btn {
     display: block;