vxe-table 3.11.38 → 3.11.39

package/es/table/src/body.js

@@ -498,46 +498,49 @@ export default {
         elemStore[`${prefix}emptyBlock`] = null;
     },
     render(h) {
+        const props = this;
         const $xeTable = this.$parent;
-        const { _e, $parent: $xetable, fixedColumn, fixedType } = this;
+        const tableProps = $xeTable;
+        const tableReactData = $xeTable;
+        const tableInternalData = $xeTable;
+        const { tId, $scopedSlots } = $xeTable;
+        const { fixedColumn, fixedType, tableColumn } = props;
+        const { showOverflow: allColumnOverflow, spanMethod, footerSpanMethod, mouseConfig } = tableProps;
+        const { tableData, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn } = tableReactData;
+        const { visibleColumn } = tableInternalData;
         const rowOpts = $xeTable.computeRowOpts;
+        const sYOpts = $xeTable.computeSYOpts;
+        const emptyOpts = $xeTable.computeEmptyOpts;
+        const mouseOpts = $xeTable.computeMouseOpts;
         const rowDragOpts = $xeTable.computeRowDragOpts;
-        let { $scopedSlots, tId, tableData, tableColumn, visibleColumn, expandColumn, showOverflow: allColumnOverflow, keyboardConfig, keyboardOpts, mergeList, spanMethod, scrollXLoad, scrollYLoad, isAllOverflow, emptyOpts, mouseConfig, mouseOpts, sYOpts, isDragRowMove } = $xetable;
-        // 如果是使用优化模式
+        let renderColumnList = tableColumn;
         if (fixedType) {
-            // 如果存在展开行使用全量渲染
-            if (!expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
-                if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-                    tableColumn = fixedColumn;
+            // 如果是使用优化模式
+            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;
+                renderColumnList = visibleColumn;
             }
         }
         let emptyContent;
         if ($scopedSlots.empty) {
-            emptyContent = $scopedSlots.empty.call(this, { $table: $xetable }, h);
+            emptyContent = $scopedSlots.empty.call(this, { $table: $xeTable, $grid: $xeTable.xegrid }, h);
         }
         else {
             const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null;
             const rtEmptyView = compConf ? (compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty) : null;
             if (rtEmptyView) {
-                emptyContent = getSlotVNs(rtEmptyView.call(this, h, emptyOpts, { $table: $xetable }));
+                emptyContent = getSlotVNs(rtEmptyView.call(this, h, emptyOpts, { $table: $xeTable }));
             }
             else {
-                emptyContent = $xetable.emptyText || getI18n('vxe.table.emptyText');
+                emptyContent = tableProps.emptyText || getI18n('vxe.table.emptyText');
             }
         }
         const ons = {
@@ -555,7 +558,7 @@ export default {
             on: ons
         }, [
             fixedType
-                ? _e()
+                ? renderEmptyElement($xeTable)
                 : h('div', {
                     class: 'vxe-body--x-space',
                     ref: 'xSpace'
@@ -579,7 +582,7 @@ export default {
                  */
                 h('colgroup', {
                     ref: 'colgroup'
-                }, tableColumn.map((column, $columnIndex) => {
+                }, renderColumnList.map((column, $columnIndex) => {
                     return h('col', {
                         attrs: {
                             name: column.id
@@ -596,10 +599,10 @@ export default {
                             tag: 'tbody',
                             name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`
                         }
-                    }, renderRows(h, this, $xetable, fixedType, tableData, tableColumn))
+                    }, renderRows(h, this, $xeTable, fixedType, tableData, renderColumnList))
                     : h('tbody', {
                         ref: 'tbody'
-                    }, renderRows(h, this, $xetable, fixedType, tableData, tableColumn))
+                    }, renderRows(h, this, $xeTable, fixedType, tableData, renderColumnList))
             ]),
             h('div', {
                 class: 'vxe-table--checkbox-range'
@@ -616,8 +619,8 @@ export default {
                                 class: 'vxe-table--cell-main-area-btn',
                                 on: {
                                     mousedown(evnt) {
-                                        if ($xetable.triggerCellAreaExtendMousedownEvent) {
-                                            $xetable.triggerCellAreaExtendMousedownEvent(evnt, { $table: $xetable, fixed: fixedType, type: renderType });
+                                        if ($xeTable.triggerCellAreaExtendMousedownEvent) {
+                                            $xeTable.triggerCellAreaExtendMousedownEvent(evnt, { $table: $xeTable, fixed: fixedType, type: renderType });
                                         }
                                     }
                                 }

package/es/table/src/footer.js

@@ -3,7 +3,7 @@ import { VxeUI } from '../../ui';
 import { getClass } from '../../ui/src/utils';
 import { updateCellTitle, setScrollLeft } from '../../ui/src/dom';
 const renderType = 'footer';
-const { renderer } = VxeUI;
+const { renderer, renderEmptyElement } = VxeUI;
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
     for (let mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {
         const { row: mergeRowIndex, col: mergeColIndex, rowspan: mergeRowspan, colspan: mergeColspan } = mergeFooterList[mIndex];
@@ -147,15 +147,16 @@ function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIn
         ]
         : []);
 }
-function renderHeads(h, _vm, footerTableData) {
+function renderHeads(h, _vm, renderColumnList) {
     const $xeTable = _vm.$parent;
+    const props = _vm;
     const columnOpts = $xeTable.computeColumnOpts;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
-    const { $parent: $xetable, fixedType, tableColumn } = _vm;
-    const { footerRowClassName, footerRowStyle, isDragColMove } = $xetable;
+    const { fixedType, footerTableData } = props;
+    const { footerRowClassName, footerRowStyle, isDragColMove } = $xeTable;
     return footerTableData.map((row, $rowIndex) => {
         const _rowIndex = $rowIndex;
-        const rowParams = { $table: $xetable, row, _rowIndex, $rowIndex, fixed: fixedType, type: renderType };
+        const rowParams = { $table: $xeTable, row, _rowIndex, $rowIndex, fixed: fixedType, type: renderType };
         if (columnOpts.drag && columnDragOpts.animation) {
             return h('transition-group', {
                 key: $rowIndex,
@@ -168,7 +169,7 @@ function renderHeads(h, _vm, footerTableData) {
                     ],
                     style: footerRowStyle ? (XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle) : null
                 }
-            }, renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex));
+            }, renderRows(h, _vm, renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
         }
         return h('tr', {
             key: $rowIndex,
@@ -177,7 +178,7 @@ function renderHeads(h, _vm, footerTableData) {
                 footerRowClassName ? XEUtils.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''
             ],
             style: footerRowStyle ? (XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle) : null
-        }, renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex));
+        }, renderRows(h, _vm, renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
     });
 }
 export default {
@@ -210,21 +211,31 @@ export default {
         elemStore[`${prefix}xSpace`] = null;
     },
     render(h) {
-        let { _e, $parent: $xetable, fixedType, fixedColumn, tableColumn, footerTableData } = this;
-        const { tId, mergeFooterList, footerSpanMethod, scrollXLoad, showFooterOverflow: allColumnFooterOverflow, scrollbarWidth, visibleColumn, expandColumn } = $xetable;
+        const props = this;
+        const $xeTable = this.$parent;
+        const tableProps = $xeTable;
+        const tableReactData = $xeTable;
+        const tableInternalData = $xeTable;
+        const { tId } = $xeTable;
+        const { fixedType, fixedColumn, tableColumn } = props;
+        const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = tableProps;
+        const { visibleColumn } = tableInternalData;
+        const { scrollbarWidth } = tableReactData;
+        let renderColumnList = tableColumn;
         // 如果是使用优化模式
         if (fixedType) {
-            // 如果存在展开行使用全量渲染
-            if (!expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
-                if (!mergeFooterList.length || !footerSpanMethod) {
-                    tableColumn = fixedColumn;
+            // 如果是使用优化模式
+            if (allColumnFooterOverflow) {
+                // 如果不支持优化模式
+                if (spanMethod || footerSpanMethod) {
+                    renderColumnList = visibleColumn;
                 }
                 else {
-                    tableColumn = visibleColumn;
+                    renderColumnList = fixedColumn || [];
                 }
             }
             else {
-                tableColumn = visibleColumn;
+                renderColumnList = visibleColumn;
             }
         }
         const ons = {};
@@ -239,7 +250,7 @@ export default {
             on: ons
         }, [
             fixedType
-                ? _e()
+                ? renderEmptyElement($xeTable)
                 : h('div', {
                     class: 'vxe-body--x-space',
                     ref: 'xSpace'
@@ -259,7 +270,7 @@ export default {
                  */
                 h('colgroup', {
                     ref: 'colgroup'
-                }, tableColumn.map((column, $columnIndex) => {
+                }, renderColumnList.map((column, $columnIndex) => {
                     return h('col', {
                         attrs: {
                             name: column.id
@@ -280,7 +291,7 @@ export default {
                  */
                 h('tfoot', {
                     ref: 'tfoot'
-                }, renderHeads(h, this, footerTableData))
+                }, renderHeads(h, this, renderColumnList))
             ])
         ]);
     },

package/es/table/src/header.js

@@ -3,7 +3,7 @@ import { VxeUI } from '../../ui';
 import { getClass } from '../../ui/src/utils';
 import { getOffsetPos, hasClass, addClass, removeClass } from '../../ui/src/dom';
 import { convertHeaderColumnToRows, getColReMinWidth } from './util';
-const { renderer } = VxeUI;
+const { renderer, renderEmptyElement } = VxeUI;
 const cellType = 'header';
 const renderRows = (h, _vm, cols, $rowIndex) => {
     const $xeTable = _vm.$parent;
@@ -193,18 +193,36 @@ export default {
         elemStore[`${prefix}repair`] = null;
     },
     render(h) {
-        const { _e, $parent: $xetable, fixedType, headerColumn, tableColumn, fixedColumn } = this;
-        const { tId, isGroup, visibleColumn, showHeaderOverflow: allColumnHeaderOverflow, scrollXLoad, scrollbarWidth } = $xetable;
+        const props = this;
+        const $xeTable = this.$parent;
+        const tableProps = $xeTable;
+        const tableReactData = $xeTable;
+        const tableInternalData = $xeTable;
+        const { tId } = $xeTable;
+        const { fixedType, fixedColumn, tableColumn } = props;
+        const { headerColumn } = this;
+        const { showHeaderOverflow: allColumnHeaderOverflow, spanMethod, footerSpanMethod } = tableProps;
+        const { isGroup, scrollbarWidth } = tableReactData;
+        const { visibleColumn } = tableInternalData;
         let headerGroups = headerColumn;
         let renderColumnList = tableColumn;
         if (isGroup) {
             renderColumnList = visibleColumn;
         }
         else {
-            // 如果是使用优化模式
             if (fixedType) {
-                if (scrollXLoad || allColumnHeaderOverflow) {
-                    renderColumnList = fixedColumn;
+                // 如果是使用优化模式
+                if (allColumnHeaderOverflow) {
+                    // 如果不支持优化模式
+                    if (spanMethod || footerSpanMethod) {
+                        renderColumnList = visibleColumn;
+                    }
+                    else {
+                        renderColumnList = fixedColumn || [];
+                    }
+                }
+                else {
+                    renderColumnList = visibleColumn;
                 }
             }
             headerGroups = [renderColumnList];
@@ -216,7 +234,7 @@ export default {
             }
         }, [
             fixedType
-                ? _e()
+                ? renderEmptyElement($xeTable)
                 : h('div', {
                     class: 'vxe-body--x-space',
                     ref: 'xSpace'

package/es/table/src/methods.js

@@ -2930,7 +2930,7 @@ const Methods = {
     },
     updateStyle() {
         const $xeTable = this;
-        let { $refs, isGroup, fullColumnIdData, tableColumn, customHeight, customMinHeight, customMaxHeight, border, headerHeight, showFooter, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, footerHeight, tableHeight, tableWidth, scrollbarHeight, scrollbarWidth, scrollXLoad, scrollYLoad, overflowX, cellOffsetWidth, columnStore, elemStore, editStore, currentRow, mouseConfig, keyboardConfig, keyboardOpts, spanMethod, mergeList, mergeFooterList, footerSpanMethod, isAllOverflow, visibleColumn } = $xeTable;
+        let { $refs, isGroup, fullColumnIdData, tableColumn, customHeight, customMinHeight, customMaxHeight, border, headerHeight, showFooter, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, footerHeight, tableHeight, tableWidth, scrollbarHeight, scrollbarWidth, scrollXLoad, scrollYLoad, overflowX, cellOffsetWidth, columnStore, elemStore, editStore, currentRow, mouseConfig, spanMethod, expandColumn, footerSpanMethod, isAllOverflow, visibleColumn } = $xeTable;
         const containerList = ['main', 'left', 'right'];
         const emptyPlaceholderElem = $refs.emptyPlaceholder;
         const bodyWrapperElem = elemStore['main-body-wrapper'];
@@ -2984,10 +2984,19 @@ const Methods = {
                         renderColumnList = visibleColumn;
                     }
                     else {
-                        // 如果是使用优化模式
                         if (fixedType) {
-                            if (scrollXLoad || allColumnHeaderOverflow) {
-                                renderColumnList = fixedColumn;
+                            // 如果是使用优化模式
+                            if (allColumnHeaderOverflow) {
+                                // 如果不支持优化模式
+                                if (spanMethod || footerSpanMethod) {
+                                    renderColumnList = visibleColumn;
+                                }
+                                else {
+                                    renderColumnList = fixedColumn || [];
+                                }
+                            }
+                            else {
+                                renderColumnList = visibleColumn;
                             }
                         }
                     }
@@ -3074,15 +3083,15 @@ const Methods = {
                     }
                     let tWidth = tableWidth;
                     let renderColumnList = tableColumn;
-                    // 如果是使用优化模式
                     if (fixedType) {
-                        // 如果存在展开行使用全量渲染
-                        if (!this.expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
-                            if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-                                renderColumnList = fixedColumn;
+                        // 如果是使用优化模式
+                        if (scrollXLoad || scrollYLoad || (allColumnOverflow && isAllOverflow)) {
+                            // 如果不支持优化模式
+                            if (expandColumn || spanMethod || footerSpanMethod) {
+                                renderColumnList = visibleColumn;
                             }
                             else {
-                                renderColumnList = visibleColumn;
+                                renderColumnList = fixedColumn || [];
                             }
                         }
                         else {
@@ -3102,15 +3111,15 @@ const Methods = {
                 else if (layout === 'footer') {
                     let tWidth = tableWidth;
                     let renderColumnList = tableColumn;
-                    // 如果是使用优化模式
                     if (fixedType) {
-                        // 如果存在展开行使用全量渲染
-                        if (!this.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
-                            if (!mergeFooterList.length || !footerSpanMethod) {
-                                renderColumnList = fixedColumn;
+                        // 如果是使用优化模式
+                        if (allColumnFooterOverflow) {
+                            // 如果不支持优化模式
+                            if (spanMethod || footerSpanMethod) {
+                                renderColumnList = visibleColumn;
                             }
                             else {
-                                renderColumnList = visibleColumn;
+                                renderColumnList = fixedColumn || [];
                             }
                         }
                         else {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.11.38";
+export const version = "3.11.39";
 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${"3.11.38"}`;
+const version = `table v${"3.11.39"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);