vxe-table 4.13.2 → 4.13.4

package/es/table/src/footer.js

@@ -28,7 +28,7 @@ export default defineComponent({
     setup(props) {
         const $xeTable = inject('$xeTable', {});
         const { xID, props: tableProps, reactData: tableReactData, internalData: tableInternalData } = $xeTable;
-        const { computeTooltipOpts, computeColumnOpts, computeColumnDragOpts, computeCellOpts, computeFooterCellOpts, computeDefaultRowHeight, computeResizableOpts } = $xeTable.getComputeMaps();
+        const { computeTooltipOpts, computeColumnOpts, computeColumnDragOpts, computeCellOpts, computeFooterCellOpts, computeDefaultRowHeight, computeResizableOpts, computeVirtualXOpts } = $xeTable.getComputeMaps();
         const refElem = ref();
         const refFooterScroll = ref();
         const refFooterTable = ref();
@@ -41,6 +41,7 @@ export default defineComponent({
             const { resizable: allResizable, border, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, footerSpanMethod, align: allAlign, columnKey, showFooterOverflow: allColumnFooterOverflow } = tableProps;
             const { scrollXLoad, scrollYLoad, overflowX, currentColumn } = tableReactData;
             const { fullColumnIdData, mergeFooterList, mergeFooterCellMaps, scrollXStore } = tableInternalData;
+            const virtualXOpts = computeVirtualXOpts.value;
             const tooltipOpts = computeTooltipOpts.value;
             const resizableOpts = computeResizableOpts.value;
             const { isAllColumnDrag } = resizableOpts;
@@ -151,7 +152,7 @@ export default defineComponent({
                 const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
                 let isVNPreEmptyStatus = false;
                 if (!isMergeCell) {
-                    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/es/table/src/header.js

@@ -19,7 +19,7 @@ export default defineComponent({
     setup(props) {
         const $xeTable = inject('$xeTable', {});
         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([]);
         const refElem = ref();
         const refHeaderScroll = ref();
@@ -38,6 +38,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;
@@ -106,7 +107,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/es/table/src/table.js

@@ -3145,8 +3145,8 @@ export default defineComponent({
             const childrenField = treeOpts.children || treeOpts.childrenField;
             const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
             const result = [];
-            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) => toggleMethod({ $table: $xeTable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows;
             if (accordion) {
@@ -3195,7 +3195,7 @@ export default defineComponent({
             }
             reactData.treeExpandedFlag++;
             return Promise.all(result).then(() => {
-                return tableMethods.recalculate();
+                return $xeTable.recalculate();
             });
         };
         /**
@@ -3207,14 +3207,14 @@ export default defineComponent({
         const handleVirtualTreeExpand = (rows, expanded) => {
             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);
             });
         };
@@ -5405,7 +5405,7 @@ export default defineComponent({
                         internalData.rowExpandedMaps = rowExpandedMaps;
                         rows = rows.slice(rows.length - 1, rows.length);
                     }
-                    const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) })) : rows;
+                    const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: $xeTable.getRowIndex(row), $rowIndex: $xeTable.getVMRowIndex(row) })) : rows;
                     if (expanded) {
                         validRows.forEach((row) => {
                             const rowid = handleGetRowId(row);
@@ -8228,7 +8228,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);
@@ -10515,6 +10515,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/es/table/style.css

@@ -3009,9 +3009,6 @@
           user-select: none;
   cursor: pointer;
 }
-.vxe-table--render-default .vxe-tree--btn-wrapper > i {
-  background-color: var(--vxe-ui-layout-background-color);
-}
 .vxe-table--render-default .vxe-tree--node-btn {
   display: block;
   color: var(--vxe-ui-font-lighten-color);