vxe-table 4.13.7 → 4.13.9

package/es/table/src/footer.js

@@ -35,7 +35,7 @@ export default defineComponent({
         const refFooterColgroup = ref();
         const refFooterTFoot = ref();
         const refFooterXSpace = ref();
-        const renderRows = (tableColumn, footerTableData, row, $rowIndex, _rowIndex) => {
+        const renderRows = (isOptimizeMode, tableColumn, footerTableData, row, $rowIndex, _rowIndex) => {
             const $xeGrid = $xeTable.xeGrid;
             const { fixedType } = props;
             const { resizable: allResizable, border, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, footerSpanMethod, align: allAlign, columnKey, showFooterOverflow: allColumnFooterOverflow } = tableProps;
@@ -62,10 +62,10 @@ export default defineComponent({
                 const isPadding = XEUtils.isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
                 const footOverflow = XEUtils.eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
                 const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : '') || allFooterAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
-                let showEllipsis = footOverflow === 'ellipsis';
+                const showEllipsis = footOverflow === 'ellipsis';
                 const showTitle = footOverflow === 'title';
                 const showTooltip = footOverflow === true || footOverflow === 'tooltip';
-                let hasEllipsis = showTitle || showTooltip || showEllipsis;
+                const hasEllipsis = showTitle || showTooltip || showEllipsis;
                 const showResizable = (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable));
                 const attrs = { colid };
                 const tfOns = {};
@@ -89,10 +89,6 @@ export default defineComponent({
                     type: renderType,
                     data: footerTableData
                 };
-                // 纵向虚拟滚动不支持动态行高
-                if (scrollXLoad && !hasEllipsis) {
-                    showEllipsis = hasEllipsis = true;
-                }
                 if (showTitle || showTooltip || showAllTip) {
                     tfOns.onMouseenter = (evnt) => {
                         if (showTitle) {
@@ -151,7 +147,7 @@ export default defineComponent({
                 const isLastColumn = $columnIndex === tableColumn.length - 1;
                 const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
                 let isVNPreEmptyStatus = false;
-                if (!isMergeCell) {
+                if (isOptimizeMode && !isMergeCell) {
                     if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
                         isVNPreEmptyStatus = true;
                     }
@@ -203,7 +199,7 @@ export default defineComponent({
                 ]);
             });
         };
-        const renderHeads = (renderColumnList) => {
+        const renderHeads = (isOptimizeMode, renderColumnList) => {
             const { fixedType, footerTableData } = props;
             const { footerRowClassName, footerRowStyle } = tableProps;
             const { isColLoading, isDragColMove } = tableReactData;
@@ -223,7 +219,7 @@ export default defineComponent({
                         ],
                         style: footerRowStyle ? (XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle) : null
                     }, {
-                        default: () => renderRows(renderColumnList, footerTableData, row, $rowIndex, _rowIndex)
+                        default: () => renderRows(isOptimizeMode, renderColumnList, footerTableData, row, $rowIndex, _rowIndex)
                     });
                 }
                 return h('tr', {
@@ -233,18 +229,18 @@ export default defineComponent({
                         footerRowClassName ? XEUtils.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''
                     ],
                     style: footerRowStyle ? (XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle) : null
-                }, renderRows(renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
+                }, renderRows(isOptimizeMode, renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
             });
         };
         const renderVN = () => {
             const { fixedType, fixedColumn, tableColumn } = props;
             const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = tableProps;
             const { visibleColumn, fullColumnIdData } = tableInternalData;
-            const { isGroup, isColLoading, overflowX, scrollXLoad, scrollYLoad, dragCol } = tableReactData;
+            const { isGroup, isColLoading, overflowX, scrollXLoad, dragCol } = tableReactData;
             let renderColumnList = tableColumn;
             let isOptimizeMode = false;
             // 如果是使用优化模式
-            if (scrollXLoad || scrollYLoad || allColumnFooterOverflow) {
+            if (scrollXLoad && allColumnFooterOverflow) {
                 if (spanMethod || footerSpanMethod) {
                     // 如果不支持优化模式
                 }
@@ -252,7 +248,7 @@ export default defineComponent({
                     isOptimizeMode = true;
                 }
             }
-            if (!isColLoading && (fixedType || !overflowX)) {
+            if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
                 renderColumnList = visibleColumn;
             }
             if (fixedType) {
@@ -330,7 +326,7 @@ export default defineComponent({
                      */
                         h('tfoot', {
                             ref: refFooterTFoot
-                        }, renderHeads(renderColumnList))
+                        }, renderHeads(isOptimizeMode, renderColumnList))
                     ])
                 ])
             ]);

package/es/table/src/header.js

@@ -57,10 +57,10 @@ export default defineComponent({
                 const isPadding = XEUtils.isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
                 const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
                 const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
-                let showEllipsis = headOverflow === 'ellipsis';
+                const showEllipsis = headOverflow === 'ellipsis';
                 const showTitle = headOverflow === 'title';
                 const showTooltip = headOverflow === true || headOverflow === 'tooltip';
-                let hasEllipsis = showTitle || showTooltip || showEllipsis;
+                const hasEllipsis = showTitle || showTooltip || showEllipsis;
                 let hasFilter = false;
                 let firstFilterOption = null;
                 if (filters) {
@@ -69,7 +69,20 @@ export default defineComponent({
                 }
                 const columnIndex = colRest.index;
                 const _columnIndex = colRest._index;
-                const cellParams = { $table: $xeTable, $grid: $xeGrid, $rowIndex, column, columnIndex, $columnIndex, _columnIndex, firstFilterOption, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, hasFilter };
+                const cellParams = {
+                    $table: $xeTable,
+                    $grid: $xeGrid,
+                    $rowIndex,
+                    column,
+                    columnIndex,
+                    $columnIndex,
+                    _columnIndex,
+                    firstFilterOption,
+                    fixed: fixedType,
+                    type: renderType,
+                    isHidden: fixedHiddenColumn,
+                    hasFilter
+                };
                 const thAttrs = {
                     colid,
                     colspan: column.colSpan > 1 ? column.colSpan : null,
@@ -79,10 +92,6 @@ export default defineComponent({
                     onClick: (evnt) => $xeTable.triggerHeaderCellClickEvent(evnt, cellParams),
                     onDblclick: (evnt) => $xeTable.triggerHeaderCellDblclickEvent(evnt, cellParams)
                 };
-                // 横向虚拟滚动不支持动态行高
-                if (scrollXLoad && !hasEllipsis) {
-                    showEllipsis = hasEllipsis = true;
-                }
                 const isColDragCell = columnOpts.drag && columnDragOpts.trigger === 'cell';
                 let isDisabledDrag = false;
                 if (isColDragCell) {
@@ -105,7 +114,7 @@ export default defineComponent({
                 const showResizable = (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable));
                 const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
                 let isVNPreEmptyStatus = false;
-                if (!isGroup) {
+                if (isOptimizeMode && !isGroup) {
                     if (!dragCol || dragCol.id !== colid) {
                         if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
                             isVNPreEmptyStatus = true;
@@ -202,7 +211,7 @@ export default defineComponent({
         const renderVN = () => {
             const { fixedType, fixedColumn, tableColumn } = props;
             const { mouseConfig, showHeaderOverflow: allColumnHeaderOverflow, spanMethod, footerSpanMethod } = tableProps;
-            const { isGroup, isColLoading, overflowX, scrollXLoad, scrollYLoad, dragCol } = tableReactData;
+            const { isGroup, isColLoading, overflowX, scrollXLoad, dragCol } = tableReactData;
             const { visibleColumn, fullColumnIdData } = tableInternalData;
             const mouseOpts = computeMouseOpts.value;
             let renderHeaderList = headerColumn.value;
@@ -213,7 +222,7 @@ export default defineComponent({
             }
             else {
                 // 如果是使用优化模式
-                if (scrollXLoad || scrollYLoad || allColumnHeaderOverflow) {
+                if (scrollXLoad && allColumnHeaderOverflow) {
                     if (spanMethod || footerSpanMethod) {
                         // 如果不支持优化模式
                     }
@@ -221,7 +230,7 @@ export default defineComponent({
                         isOptimizeMode = true;
                     }
                 }
-                if (!isColLoading && (fixedType || !overflowX)) {
+                if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
                     renderColumnList = visibleColumn;
                 }
                 if (fixedType) {

package/es/table/src/table.js

@@ -1963,7 +1963,7 @@ export default defineComponent({
         };
         const updateStyle = () => {
             const { showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props;
-            const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn } = reactData;
+            const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn, isColLoading } = reactData;
             const { visibleColumn, tableHeight, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData;
             const el = refElem.value;
             if (!el) {
@@ -2073,7 +2073,7 @@ export default defineComponent({
                         }
                         else {
                             // 如果是使用优化模式
-                            if (scrollXLoad || scrollYLoad || allColumnHeaderOverflow) {
+                            if (scrollXLoad && allColumnHeaderOverflow) {
                                 if (spanMethod || footerSpanMethod) {
                                     // 如果不支持优化模式
                                 }
@@ -2081,8 +2081,10 @@ export default defineComponent({
                                     isOptimizeMode = true;
                                 }
                             }
-                            if (fixedType) {
+                            if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
                                 renderColumnList = visibleColumn;
+                            }
+                            if (fixedType) {
                                 // 如果是使用优化模式
                                 if (isOptimizeMode) {
                                     renderColumnList = fixedColumn || [];
@@ -2174,7 +2176,7 @@ export default defineComponent({
                         let renderColumnList = tableColumn;
                         let isOptimizeMode = false;
                         // 如果是使用优化模式
-                        if (scrollXLoad || scrollYLoad || allColumnFooterOverflow) {
+                        if (scrollXLoad && allColumnFooterOverflow) {
                             if (spanMethod || footerSpanMethod) {
                                 // 如果不支持优化模式
                             }

package/es/table/style.css

@@ -2493,11 +2493,6 @@
   line-height: var(--vxe-ui-table-row-line-height);
   text-align: left;
 }
-.vxe-table--render-default .vxe-header--column.col--current,
-.vxe-table--render-default .vxe-body--column.col--current,
-.vxe-table--render-default .vxe-footer--column.col--current {
-  background-color: var(--vxe-ui-table-column-current-background-color);
-}
 .vxe-table--render-default .vxe-header--column.col--center,
 .vxe-table--render-default .vxe-body--column.col--center,
 .vxe-table--render-default .vxe-footer--column.col--center {
@@ -2529,6 +2524,18 @@
 .vxe-table--render-default .vxe-body--row.row--stripe > .vxe-body--column {
   background-color: var(--vxe-ui-table-row-striped-background-color);
 }
+.vxe-table--render-default .vxe-header--column,
+.vxe-table--render-default .vxe-body--column,
+.vxe-table--render-default .vxe-footer--column {
+  position: relative;
+  line-height: var(--vxe-ui-table-row-line-height);
+  text-align: left;
+}
+.vxe-table--render-default .vxe-header--column.col--current,
+.vxe-table--render-default .vxe-body--column.col--current,
+.vxe-table--render-default .vxe-footer--column.col--current {
+  background-color: var(--vxe-ui-table-column-current-background-color);
+}
 .vxe-table--render-default .vxe-body--row.row--radio > .vxe-body--column {
   background-color: var(--vxe-ui-table-row-radio-checked-background-color);
 }