vxe-table 4.9.34 → 4.9.35

package/es/table/src/body.js

@@ -1,4 +1,4 @@
-import { createCommentVNode, defineComponent, TransitionGroup, h, ref, inject, nextTick, onBeforeUnmount, onMounted, onUnmounted } from 'vue';
+import { defineComponent, TransitionGroup, h, ref, inject, nextTick, onBeforeUnmount, onMounted, onUnmounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { mergeBodyMethod, getRowid, getRefElem } from './util';
@@ -28,7 +28,7 @@ export default defineComponent({
         const xesize = inject('xesize', null);
         const { xID, props: tableProps, context: tableContext, reactData: tableReactData, internalData: tableInternalData } = $xeTable;
         const { refTableBody, refTableHeader, refTableFooter, refTableLeftBody, refTableRightBody, refScrollXHandleElem, refScrollYHandleElem } = $xeTable.getRefMaps();
-        const { computeEditOpts, computeMouseOpts, computeAreaOpts, computeSYOpts, computeEmptyOpts, computeKeyboardOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeCellOpts, computeValidOpts, computeRowOpts, computeColumnOpts, computeRowDragOpts, computeColumnDragOpts } = $xeTable.getComputeMaps();
+        const { computeEditOpts, computeMouseOpts, computeAreaOpts, computeSYOpts, computeEmptyOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeCellOpts, computeValidOpts, computeRowOpts, computeColumnOpts, computeRowDragOpts, computeColumnDragOpts } = $xeTable.getComputeMaps();
         const refElem = ref();
         const refBodyTable = ref();
         const refBodyColgroup = ref();
@@ -700,41 +700,29 @@ export default defineComponent({
             elemStore[`${prefix}emptyBlock`] = null;
         });
         const renderVN = () => {
-            let { fixedColumn, fixedType, tableColumn } = props;
-            const { keyboardConfig, showOverflow: allColumnOverflow, spanMethod, mouseConfig } = tableProps;
-            const { tableData, mergeList, scrollYLoad, isAllOverflow, isDragRowMove } = tableReactData;
+            const { fixedColumn, fixedType, tableColumn } = props;
+            const { showOverflow: allColumnOverflow, spanMethod, footerSpanMethod, mouseConfig } = tableProps;
+            const { tableData, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn } = tableReactData;
             const { visibleColumn } = tableInternalData;
             const { slots } = tableContext;
             const rowOpts = computeRowOpts.value;
             const sYOpts = computeSYOpts.value;
             const emptyOpts = computeEmptyOpts.value;
-            const keyboardOpts = computeKeyboardOpts.value;
             const mouseOpts = computeMouseOpts.value;
             const rowDragOpts = computeRowDragOpts.value;
-            // const isMergeLeftFixedExceeded = computeIsMergeLeftFixedExceeded.value
-            // const isMergeRightFixedExceeded = computeIsMergeRightFixedExceeded.value
-            // 如果是使用优化模式
+            let renderColumnList = tableColumn;
             if (fixedType) {
-                // 如果存在展开行使用全量渲染
-                if (!tableReactData.expandColumn && (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
-                    if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-                        tableColumn = fixedColumn;
+                renderColumnList = visibleColumn;
+                // 如果是使用优化模式
+                if (scrollXLoad || scrollYLoad || (allColumnOverflow && isAllOverflow)) {
+                    // 如果不支持优化模式
+                    if (expandColumn || spanMethod || footerSpanMethod) {
+                        renderColumnList = visibleColumn;
                     }
                     else {
-                        tableColumn = visibleColumn;
-                        // 检查固定列是否被合并，合并范围是否超出固定列
-                        // if (mergeList.length && !isMergeLeftFixedExceeded && fixedType === 'left') {
-                        //   tableColumn = fixedColumn
-                        // } else if (mergeList.length && !isMergeRightFixedExceeded && fixedType === 'right') {
-                        //   tableColumn = fixedColumn
-                        // } else {
-                        //   tableColumn = visibleColumn
-                        // }
+                        renderColumnList = fixedColumn || [];
                     }
                 }
-                else {
-                    tableColumn = visibleColumn;
-                }
             }
             let emptyContent;
             const emptySlot = slots ? slots.empty : null;
@@ -759,7 +747,7 @@ export default defineComponent({
             }
             return h('div', Object.assign({ ref: refElem, class: ['vxe-table--body-wrapper', fixedType ? `fixed-${fixedType}--wrapper` : 'body--wrapper'], xid: xID }, ons), [
                 fixedType
-                    ? createCommentVNode()
+                    ? renderEmptyElement($xeTable)
                     : h('div', {
                         ref: refBodyXSpace,
                         class: 'vxe-body--x-space'
@@ -781,7 +769,7 @@ export default defineComponent({
                      */
                     h('colgroup', {
                         ref: refBodyColgroup
-                    }, tableColumn.map((column, $columnIndex) => {
+                    }, renderColumnList.map((column, $columnIndex) => {
                         return h('col', {
                             name: column.id,
                             key: $columnIndex
@@ -796,11 +784,11 @@ export default defineComponent({
                             name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`,
                             tag: 'tbody'
                         }, {
-                            default: () => renderRows(fixedType, tableData, tableColumn)
+                            default: () => renderRows(fixedType, tableData, renderColumnList)
                         })
                         : h('tbody', {
                             ref: refBodyTBody
-                        }, renderRows(fixedType, tableData, tableColumn))
+                        }, renderRows(fixedType, tableData, renderColumnList))
                 ]),
                 h('div', {
                     class: 'vxe-table--checkbox-range'

package/es/table/src/footer.js

@@ -1,8 +1,8 @@
-import { createCommentVNode, defineComponent, TransitionGroup, h, ref, inject, nextTick, onMounted, onUnmounted } from 'vue';
+import { defineComponent, TransitionGroup, h, ref, inject, nextTick, onMounted, onUnmounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { updateCellTitle, getPropClass, setScrollLeft } from '../../ui/src/dom';
-const { renderer } = VxeUI;
+const { renderer, renderEmptyElement } = VxeUI;
 const renderType = 'footer';
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
     for (let mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {
@@ -211,8 +211,8 @@ export default defineComponent({
                 ]
                 : []);
         };
-        const renderHeads = (footerTableData) => {
-            const { fixedType, tableColumn } = props;
+        const renderHeads = (renderColumnList) => {
+            const { fixedType, footerTableData } = props;
             const { footerRowClassName, footerRowStyle } = tableProps;
             const { isDragColMove } = tableReactData;
             const columnOpts = computeColumnOpts.value;
@@ -231,7 +231,7 @@ export default defineComponent({
                         ],
                         style: footerRowStyle ? (XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle) : null
                     }, {
-                        default: () => renderRows(tableColumn, footerTableData, row, $rowIndex, _rowIndex)
+                        default: () => renderRows(renderColumnList, footerTableData, row, $rowIndex, _rowIndex)
                     });
                 }
                 return h('tr', {
@@ -241,28 +241,27 @@ export default defineComponent({
                         footerRowClassName ? XEUtils.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''
                     ],
                     style: footerRowStyle ? (XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle) : null
-                }, renderRows(tableColumn, footerTableData, row, $rowIndex, _rowIndex));
+                }, renderRows(renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
             });
         };
         const renderVN = () => {
-            let { fixedType, fixedColumn, tableColumn, footerTableData } = props;
-            const { footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = tableProps;
+            const { fixedType, fixedColumn, tableColumn } = props;
+            const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = tableProps;
             const { visibleColumn } = tableInternalData;
-            const { scrollXLoad, scrollbarWidth, mergeFooterList } = tableReactData;
-            // 如果是使用优化模式
+            const { scrollbarWidth } = tableReactData;
+            let renderColumnList = tableColumn;
             if (fixedType) {
-                // 如果存在展开行使用全量渲染
-                if (!tableReactData.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
-                    if (!mergeFooterList.length || !footerSpanMethod) {
-                        tableColumn = fixedColumn;
+                renderColumnList = visibleColumn;
+                // 如果是使用优化模式
+                if (allColumnFooterOverflow) {
+                    // 如果不支持优化模式
+                    if (spanMethod || footerSpanMethod) {
+                        renderColumnList = visibleColumn;
                     }
                     else {
-                        tableColumn = visibleColumn;
+                        renderColumnList = fixedColumn || [];
                     }
                 }
-                else {
-                    tableColumn = visibleColumn;
-                }
             }
             const ons = {};
             if (!fixedType) {
@@ -270,7 +269,7 @@ export default defineComponent({
             }
             return h('div', Object.assign({ ref: refElem, class: ['vxe-table--footer-wrapper', fixedType ? `fixed-${fixedType}--wrapper` : 'body--wrapper'], xid: xID }, ons), [
                 fixedType
-                    ? createCommentVNode()
+                    ? renderEmptyElement($xeTable)
                     : h('div', {
                         ref: refFooterXSpace,
                         class: 'vxe-body--x-space'
@@ -288,7 +287,7 @@ export default defineComponent({
                      */
                     h('colgroup', {
                         ref: refFooterColgroup
-                    }, tableColumn.map((column, $columnIndex) => {
+                    }, renderColumnList.map((column, $columnIndex) => {
                         return h('col', {
                             name: column.id,
                             key: $columnIndex
@@ -305,7 +304,7 @@ export default defineComponent({
                      */
                     h('tfoot', {
                         ref: refFooterTFoot
-                    }, renderHeads(footerTableData))
+                    }, renderHeads(renderColumnList))
                 ])
             ]);
         };

package/es/table/src/header.js

@@ -1,9 +1,9 @@
-import { createCommentVNode, defineComponent, TransitionGroup, h, ref, inject, nextTick, watch, onMounted, onUnmounted } from 'vue';
+import { defineComponent, TransitionGroup, h, ref, inject, nextTick, watch, onMounted, onUnmounted } from 'vue';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { convertHeaderColumnToRows, getColReMinWidth } from './util';
 import { hasClass, getOffsetPos, addClass, removeClass } from '../../ui/src/dom';
-const { renderer } = VxeUI;
+const { renderer, renderEmptyElement } = VxeUI;
 const renderType = 'header';
 export default defineComponent({
     name: 'VxeTableHeader',
@@ -290,8 +290,8 @@ export default defineComponent({
         };
         const renderVN = () => {
             const { fixedType, fixedColumn, tableColumn } = props;
-            const { showHeaderOverflow: allColumnHeaderOverflow } = tableProps;
-            const { isGroup, scrollXLoad, scrollbarWidth } = tableReactData;
+            const { showHeaderOverflow: allColumnHeaderOverflow, spanMethod, footerSpanMethod } = tableProps;
+            const { isGroup, scrollbarWidth } = tableReactData;
             const { visibleColumn } = tableInternalData;
             let headerGroups = headerColumn.value;
             let renderColumnList = tableColumn;
@@ -299,10 +299,17 @@ export default defineComponent({
                 renderColumnList = visibleColumn;
             }
             else {
-                // 如果是使用优化模式
                 if (fixedType) {
-                    if (scrollXLoad || allColumnHeaderOverflow) {
-                        renderColumnList = fixedColumn;
+                    renderColumnList = visibleColumn;
+                    // 如果是使用优化模式
+                    if (allColumnHeaderOverflow) {
+                        // 如果不支持优化模式
+                        if (spanMethod || footerSpanMethod) {
+                            renderColumnList = visibleColumn;
+                        }
+                        else {
+                            renderColumnList = fixedColumn || [];
+                        }
                     }
                 }
                 headerGroups = [renderColumnList];
@@ -313,7 +320,7 @@ export default defineComponent({
                 xid: xID
             }, [
                 fixedType
-                    ? createCommentVNode()
+                    ? renderEmptyElement($xeTable)
                     : h('div', {
                         ref: refHeaderXSpace,
                         class: 'vxe-body--x-space'

package/es/table/src/table.js

@@ -1637,14 +1637,13 @@ export default defineComponent({
             updateAfterDataIndex();
         };
         const updateStyle = () => {
-            const { border, showFooter, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod, keyboardConfig } = props;
-            const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, scrollbarHeight, columnStore, editStore, mergeList, mergeFooterList, isAllOverflow } = reactData;
+            const { border, showFooter, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props;
+            const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, scrollbarHeight, columnStore, editStore, isAllOverflow, expandColumn } = reactData;
             let { visibleColumn, fullColumnIdData, tableHeight, tableWidth, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData;
             const containerList = ['main', 'left', 'right'];
             const emptyPlaceholderElem = refEmptyPlaceholder.value;
             const cellOffsetWidth = computeCellOffsetWidth.value;
             const mouseOpts = computeMouseOpts.value;
-            const keyboardOpts = computeKeyboardOpts.value;
             const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
             if (emptyPlaceholderElem) {
                 emptyPlaceholderElem.style.top = `${headerHeight}px`;
@@ -1701,10 +1700,17 @@ export default defineComponent({
                             renderColumnList = visibleColumn;
                         }
                         else {
-                            // 如果是使用优化模式
                             if (fixedType) {
-                                if (scrollXLoad || allColumnHeaderOverflow) {
-                                    renderColumnList = fixedColumn;
+                                renderColumnList = visibleColumn;
+                                // 如果是使用优化模式
+                                if (allColumnHeaderOverflow) {
+                                    // 如果不支持优化模式
+                                    if (spanMethod || footerSpanMethod) {
+                                        renderColumnList = visibleColumn;
+                                    }
+                                    else {
+                                        renderColumnList = fixedColumn || [];
+                                    }
                                 }
                             }
                         }
@@ -1783,20 +1789,18 @@ export default defineComponent({
                         }
                         let tWidth = tableWidth;
                         let renderColumnList = tableColumn;
-                        // 如果是使用优化模式
                         if (fixedType) {
-                            // 如果存在展开行使用全量渲染
-                            if (!reactData.expandColumn && (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
-                                if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-                                    renderColumnList = fixedColumn;
+                            renderColumnList = visibleColumn;
+                            // 如果是使用优化模式
+                            if (scrollXLoad || scrollYLoad || (allColumnOverflow && isAllOverflow)) {
+                                // 如果不支持优化模式
+                                if (expandColumn || spanMethod || footerSpanMethod) {
+                                    renderColumnList = visibleColumn;
                                 }
                                 else {
-                                    renderColumnList = visibleColumn;
+                                    renderColumnList = fixedColumn || [];
                                 }
                             }
-                            else {
-                                renderColumnList = visibleColumn;
-                            }
                         }
                         tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
                         if (tableElem) {
@@ -1811,20 +1815,18 @@ export default defineComponent({
                     else if (layout === 'footer') {
                         let tWidth = tableWidth;
                         let renderColumnList = tableColumn;
-                        // 如果是使用优化模式
                         if (fixedType) {
-                            // 如果存在展开行使用全量渲染
-                            if (!reactData.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
-                                if (!mergeFooterList.length || !footerSpanMethod) {
-                                    renderColumnList = fixedColumn;
+                            renderColumnList = visibleColumn;
+                            // 如果是使用优化模式
+                            if (allColumnFooterOverflow) {
+                                // 如果不支持优化模式
+                                if (spanMethod || footerSpanMethod) {
+                                    renderColumnList = visibleColumn;
                                 }
                                 else {
-                                    renderColumnList = visibleColumn;
+                                    renderColumnList = fixedColumn || [];
                                 }
                             }
-                            else {
-                                renderColumnList = visibleColumn;
-                            }
                         }
                         tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
                         if (isNodeElement(wrapperElem)) {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.9.34";
+export const version = "4.9.35";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.9.34"}`;
+const version = `table v${"4.9.35"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);