vxe-table 3.21.15 → 3.21.16

package/es/table/module/export/mixin.js

@@ -478,7 +478,7 @@ function toHtml($xeTable, opts, columns, datas) {
     const internalData = $xeTable;
     const { id, border, treeConfig, headerAlign: allHeaderAlign, align: allAlign, footerAlign: allFooterAlign, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow } = props;
     const { isAllSelected, isIndeterminate } = reactData;
-    const { mergeBodyCellMaps } = internalData;
+    const { mergeBodyCellMaps, mergeFooterCellMaps } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const { print: isPrint, isHeader, isFooter, isColgroup, isMerge, colgroups, original } = opts;
     const allCls = 'check-all';
@@ -616,15 +616,34 @@ function toHtml($xeTable, opts, columns, datas) {
         const footers = getFooterData($xeTable, opts, footerTableData);
         if (footers.length) {
             tables.push('<tfoot>');
-            footers.forEach((row) => {
+            footers.forEach((row, rIndex) => {
                 tables.push(`<tr>${columns.map(column => {
                     const footAlign = column.footerAlign || column.align || allFooterAlign || allAlign;
                     const classNames = hasEllipsis($xeTable, column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : [];
                     const cellValue = getFooterCellValue($xeTable, opts, row, column);
+                    let rowSpan = 1;
+                    let colSpan = 1;
+                    if (isMerge) {
+                        const _rowIndex = rIndex;
+                        const _columnIndex = $xeTable.getVTColumnIndex(column);
+                        const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`];
+                        if (spanRest) {
+                            const { rowspan, colspan } = spanRest;
+                            if (!rowspan || !colspan) {
+                                return '';
+                            }
+                            if (rowspan > 1) {
+                                rowSpan = rowspan;
+                            }
+                            if (colspan > 1) {
+                                colSpan = colspan;
+                            }
+                        }
+                    }
                     if (footAlign) {
                         classNames.push(`col--${footAlign}`);
                     }
-                    return `<td class="${classNames.join(' ')}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${formatText(cellValue, true)}</div></td>`;
+                    return `<td class="${classNames.join(' ')}" rowspan="${rowSpan}" colspan="${colSpan}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${formatText(cellValue, true)}</div></td>`;
                 }).join('')}</tr>`);
             });
             tables.push('</tfoot>');

package/es/table/src/header.js

@@ -215,6 +215,8 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
     const cellOpts = $xeTable.computeCellOpts;
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
     const headerCellOpts = $xeTable.computeHeaderCellOpts;
+    const floatingFilterOpts = $xeTable.computeFloatingFilterOpts;
+    const { cellClassName } = floatingFilterOpts;
     const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight;
     return cols.map((column, $columnIndex) => {
         const { type, showHeaderOverflow, headerAlign, align, filters, editRender, cellRender, floatingFilters, filterRender, slots } = column;
@@ -269,7 +271,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
             tcStyle.minHeight = `${currCellHeight}px`;
         }
         return h('th', {
-            class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
+            class: ['vxe-table--column vxe-header--column is--floating-filters', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
                     [`col--${headAlign}`]: headAlign,
                     [`col--${type}`]: type,
                     'col--last': isLastColumn,
@@ -285,7 +287,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
             attrs: thAttrs
         }, [
             h('div', {
-                class: ['vxe-cell', {
+                class: ['vxe-cell', '' + (cellClassName || ''), {
                         'c--title': showTitle,
                         'c--tooltip': showTooltip,
                         'c--ellipsis': showEllipsis
@@ -330,7 +332,8 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups, renderColumn
         rowVNs.push(h('tr', {
             key: 'ff',
             class: [
-                'vxe-header--row'
+                'vxe-header--row is--floating-filters',
+                '' + (floatingFilterOpts.rowClassName || '')
             ]
         }, renderFilterRows(h, _vm, isOptimizeMode, renderColumnList)));
     }

package/es/table/src/methods.js

@@ -2862,11 +2862,39 @@ function handleTooltip($xeTable, evnt, tipOpts, type, tdEl, overflowElem, tipEle
     const { tooltipStore } = reactData;
     const { column, row } = params;
     const { showAll, contentMethod } = tipOpts;
-    const customContent = contentMethod ? contentMethod(params) : null;
-    const useCustom = contentMethod && !XEUtils.eqNull(customContent);
-    const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
+    const cellText = XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
     const isOver = tipOverEl.scrollWidth > tipOverEl.clientWidth;
-    if (content && (showAll || useCustom || isOver)) {
+    let isShow = false;
+    let customContent = null;
+    let content = '';
+    if (contentMethod) {
+        customContent = contentMethod(params);
+    }
+    // 是否全部展示
+    if (showAll) {
+        // 如果为 null 默认显示
+        if (XEUtils.eqNull(customContent)) {
+            isShow = true;
+            content = cellText;
+        }
+        else if (customContent !== '' && customContent !== false) {
+            // 如果为 '' | false 则不显示
+            isShow = true;
+            content = '' + customContent;
+        }
+    }
+    else {
+        // 如果为 null 使用默认逻辑
+        if (XEUtils.eqNull(customContent)) {
+            isShow = isOver;
+        }
+        else if (customContent !== '' && customContent !== false) {
+            // 如果为 '' | false 则不显示
+            isShow = true;
+        }
+        content = cellText;
+    }
+    if (isShow && content) {
         const tipContent = formatText(content);
         Object.assign(tooltipStore, {
             row,

package/es/table/src/table.js

@@ -529,6 +529,9 @@ export default {
         };
     },
     inject: {
+        $xeModal: {
+            default: null
+        },
         $xeTabs: {
             default: null
         },
@@ -548,7 +551,7 @@ export default {
         const reactData = createReactData();
         return Object.assign(Object.assign({ xID }, reactData), { 
             // 私有属性
-            reScrollFlag: 0, reLayoutFlag: 0, footFlag: 0, kfFlag: 0, mergeFooteCellFlag: 0, crossTableDragRowInfo: crossTableDragRowGlobal });
+            reScrollFlag: 0, reLayoutFlag: 0, footFlag: 0, kfFlag: 0, layoutReFlag: 0, mergeFooteCellFlag: 0, crossTableDragRowInfo: crossTableDragRowGlobal });
     },
     computed: Object.assign(Object.assign({}, {}), { tableId() {
             return this.computeTableId;
@@ -1363,11 +1366,21 @@ export default {
             const props = $xeTable;
             return Object.assign({}, getConfig().table.undoRedoHistoryConfig, props.undoRedoHistoryConfig);
         },
-        tabsResizeFlag() {
+        combineTabsResizeFlag() {
             const $xeTable = this;
             const $xeTabs = $xeTable.$xeTabs;
             return $xeTabs ? $xeTabs.reactData.resizeFlag : null;
         },
+        combineModalResizeFlag() {
+            const $xeTable = this;
+            const $xeModal = $xeTable.$xeModal;
+            return $xeModal ? $xeModal.reactData.resizeFlag : null;
+        },
+        combineSplitterResizeFlag() {
+            const $xeTable = this;
+            const $xeSplitter = $xeTable.$xeSplitter;
+            return $xeSplitter ? $xeSplitter.reactData.resizeFlag : null;
+        },
         computeVxeLanguage() {
             return VxeUI.getLanguage();
         },
@@ -1498,7 +1511,16 @@ export default {
                 });
             }
         },
-        tabsResizeFlag() {
+        combineTabsResizeFlag() {
+            this.layoutReFlag++;
+        },
+        combineModalResizeFlag() {
+            this.layoutReFlag++;
+        },
+        combineSplitterResizeFlag() {
+            this.layoutReFlag++;
+        },
+        layoutReFlag() {
             this.handleGlobalResizeEvent();
         },
         mergeCells(value) {

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -3311,7 +3311,7 @@ function getClass(property, params) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.21.15";
+const version = "3.21.16";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -4074,7 +4074,7 @@ function wheelScrollTopTo(diffNum, cb) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.21.15"}`;
+const log_version = `table v${"3.21.16"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -7857,7 +7857,12 @@ remainList.forEach(column=>{const width=Math.max(meanWidth,minCellWidth);column.
  * 处理显示 tooltip
  * @param {Event} evnt 事件
  * @param {Row} row 行对象
- */function handleTooltip($xeTable,evnt,tipOpts,type,tdEl,overflowElem,tipElem,params){const reactData=$xeTable;const tipOverEl=overflowElem||tdEl;if(!tipOverEl){return $xeTable.$nextTick();}params.cell=tdEl;const{tooltipStore}=reactData;const{column,row}=params;const{showAll,contentMethod}=tipOpts;const customContent=contentMethod?contentMethod(params):null;const useCustom=contentMethod&&!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContent);const content=useCustom?customContent:external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toString(column.type==='html'?tipOverEl.innerText:tipOverEl.textContent).trim();const isOver=tipOverEl.scrollWidth>tipOverEl.clientWidth;if(content&&(showAll||useCustom||isOver)){const tipContent=formatText(content);Object.assign(tooltipStore,{row,column,visible:true,content:tipContent,type,currOpts:tipOpts});$xeTable.$nextTick(()=>{const $tooltip=$xeTable.$refs.refTooltip;if($tooltip&&$tooltip.open){$tooltip.open(isOver?tipOverEl:tipElem,tipContent);}});}return $xeTable.$nextTick();}function handleScrollToRowColumn($xeTable,fieldOrColumn,row,options){const internalData=$xeTable;const{fullColumnIdData}=internalData;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(column&&fullColumnIdData[column.id]){return colToVisible($xeTable,options?options.colAlign!==false:true,column,row);}return $xeTable.$nextTick();}function handleRowExpandReserve($xeTable,row,expanded){const internalData=$xeTable;const{rowExpandedReserveRowMap}=internalData;const expandOpts=$xeTable.computeExpandOpts;if(expandOpts.reserve){const rowid=getRowid($xeTable,row);if(expanded){rowExpandedReserveRowMap[rowid]=row;}else if(rowExpandedReserveRowMap[rowid]){delete rowExpandedReserveRowMap[rowid];}}}function handleDefaultMergeCells($xeTable){const props=$xeTable;const{mergeCells}=props;if(mergeCells){$xeTable.setMergeCells(mergeCells);}}function handleDefaultMergeHeaderItems($xeTable){const props=$xeTable;const{mergeHeaderCells}=props;if(mergeHeaderCells){$xeTable.setMergeHeaderCells(mergeHeaderCells);}}function handleDefaultMergeFooterItems($xeTable){const props=$xeTable;const{mergeFooterCells,mergeFooterItems}=props;const mFooterCells=mergeFooterCells||mergeFooterItems;if(mFooterCells){$xeTable.setMergeFooterCells(mFooterCells);}}// 计算可视渲染相关数据
+ */function handleTooltip($xeTable,evnt,tipOpts,type,tdEl,overflowElem,tipElem,params){const reactData=$xeTable;const tipOverEl=overflowElem||tdEl;if(!tipOverEl){return $xeTable.$nextTick();}params.cell=tdEl;const{tooltipStore}=reactData;const{column,row}=params;const{showAll,contentMethod}=tipOpts;const cellText=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toString(column.type==='html'?tipOverEl.innerText:tipOverEl.textContent).trim();const isOver=tipOverEl.scrollWidth>tipOverEl.clientWidth;let isShow=false;let customContent=null;let content='';if(contentMethod){customContent=contentMethod(params);}// 是否全部展示
+if(showAll){// 如果为 null 默认显示
+if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContent)){isShow=true;content=cellText;}else if(customContent!==''&&customContent!==false){// 如果为 '' | false 则不显示
+isShow=true;content=''+customContent;}}else{// 如果为 null 使用默认逻辑
+if(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(customContent)){isShow=isOver;}else if(customContent!==''&&customContent!==false){// 如果为 '' | false 则不显示
+isShow=true;}content=cellText;}if(isShow&&content){const tipContent=formatText(content);Object.assign(tooltipStore,{row,column,visible:true,content:tipContent,type,currOpts:tipOpts});$xeTable.$nextTick(()=>{const $tooltip=$xeTable.$refs.refTooltip;if($tooltip&&$tooltip.open){$tooltip.open(isOver?tipOverEl:tipElem,tipContent);}});}return $xeTable.$nextTick();}function handleScrollToRowColumn($xeTable,fieldOrColumn,row,options){const internalData=$xeTable;const{fullColumnIdData}=internalData;const column=handleFieldOrColumn($xeTable,fieldOrColumn);if(column&&fullColumnIdData[column.id]){return colToVisible($xeTable,options?options.colAlign!==false:true,column,row);}return $xeTable.$nextTick();}function handleRowExpandReserve($xeTable,row,expanded){const internalData=$xeTable;const{rowExpandedReserveRowMap}=internalData;const expandOpts=$xeTable.computeExpandOpts;if(expandOpts.reserve){const rowid=getRowid($xeTable,row);if(expanded){rowExpandedReserveRowMap[rowid]=row;}else if(rowExpandedReserveRowMap[rowid]){delete rowExpandedReserveRowMap[rowid];}}}function handleDefaultMergeCells($xeTable){const props=$xeTable;const{mergeCells}=props;if(mergeCells){$xeTable.setMergeCells(mergeCells);}}function handleDefaultMergeHeaderItems($xeTable){const props=$xeTable;const{mergeHeaderCells}=props;if(mergeHeaderCells){$xeTable.setMergeHeaderCells(mergeHeaderCells);}}function handleDefaultMergeFooterItems($xeTable){const props=$xeTable;const{mergeFooterCells,mergeFooterItems}=props;const mFooterCells=mergeFooterCells||mergeFooterItems;if(mFooterCells){$xeTable.setMergeFooterCells(mFooterCells);}}// 计算可视渲染相关数据
 function computeScrollLoad($xeTable){const reactData=$xeTable;const internalData=$xeTable;return $xeTable.$nextTick().then(()=>{const{scrollXLoad,scrollYLoad}=reactData;const{scrollXStore,scrollYStore}=internalData;const virtualYOpts=$xeTable.computeVirtualYOpts;const virtualXOpts=$xeTable.computeVirtualXOpts;// 计算 X 逻辑
 if(scrollXLoad){const{toVisibleIndex:toXVisibleIndex,visibleSize:visibleXSize}=handleVirtualXVisible($xeTable);const offsetXSize=Math.max(0,virtualXOpts.oSize?external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(virtualXOpts.oSize):0);scrollXStore.preloadSize=external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(virtualXOpts.preSize);scrollXStore.offsetSize=offsetXSize;scrollXStore.visibleSize=visibleXSize;scrollXStore.endIndex=Math.max(scrollXStore.startIndex+scrollXStore.visibleSize+offsetXSize,scrollXStore.endIndex);scrollXStore.visibleStartIndex=Math.max(scrollXStore.startIndex,toXVisibleIndex);scrollXStore.visibleEndIndex=Math.min(scrollXStore.endIndex,toXVisibleIndex+visibleXSize);$xeTable.updateScrollXData().then(()=>{loadScrollXData($xeTable);});}else{$xeTable.updateScrollXSpace();}// 计算 Y 逻辑
 const rowHeight=computeRowHeight($xeTable);scrollYStore.rowHeight=rowHeight;// 已废弃
@@ -9888,6 +9893,10 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
   const cellOpts = $xeTable.computeCellOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const headerCellOpts = $xeTable.computeHeaderCellOpts;
+  const floatingFilterOpts = $xeTable.computeFloatingFilterOpts;
+  const {
+    cellClassName
+  } = floatingFilterOpts;
   const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight;
   return cols.map((column, $columnIndex) => {
     const {
@@ -9952,7 +9961,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
       tcStyle.minHeight = `${currCellHeight}px`;
     }
     return h('th', {
-      class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
+      class: ['vxe-table--column vxe-header--column is--floating-filters', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
         [`col--${headAlign}`]: headAlign,
         [`col--${type}`]: type,
         'col--last': isLastColumn,
@@ -9966,7 +9975,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
       key: colid,
       attrs: thAttrs
     }, [h('div', {
-      class: ['vxe-cell', {
+      class: ['vxe-cell', '' + (cellClassName || ''), {
         'c--title': showTitle,
         'c--tooltip': showTooltip,
         'c--ellipsis': showEllipsis
@@ -10008,7 +10017,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups, renderColumn
   if (floatingFilterOpts.enabled) {
     rowVNs.push(h('tr', {
       key: 'ff',
-      class: ['vxe-header--row']
+      class: ['vxe-header--row is--floating-filters', '' + (floatingFilterOpts.rowClassName || '')]
     }, renderFilterRows(h, _vm, isOptimizeMode, renderColumnList)));
   }
   return rowVNs;
@@ -16675,7 +16684,8 @@ function toHtml($xeTable, opts, columns, datas) {
     isIndeterminate
   } = reactData;
   const {
-    mergeBodyCellMaps
+    mergeBodyCellMaps,
+    mergeFooterCellMaps
   } = internalData;
   const treeOpts = $xeTable.computeTreeOpts;
   const {
@@ -16816,15 +16826,37 @@ function toHtml($xeTable, opts, columns, datas) {
     const footers = getFooterData($xeTable, opts, footerTableData);
     if (footers.length) {
       tables.push('<tfoot>');
-      footers.forEach(row => {
+      footers.forEach((row, rIndex) => {
         tables.push(`<tr>${columns.map(column => {
           const footAlign = column.footerAlign || column.align || allFooterAlign || allAlign;
           const classNames = hasEllipsis($xeTable, column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : [];
           const cellValue = getFooterCellValue($xeTable, opts, row, column);
+          let rowSpan = 1;
+          let colSpan = 1;
+          if (isMerge) {
+            const _rowIndex = rIndex;
+            const _columnIndex = $xeTable.getVTColumnIndex(column);
+            const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`];
+            if (spanRest) {
+              const {
+                rowspan,
+                colspan
+              } = spanRest;
+              if (!rowspan || !colspan) {
+                return '';
+              }
+              if (rowspan > 1) {
+                rowSpan = rowspan;
+              }
+              if (colspan > 1) {
+                colSpan = colspan;
+              }
+            }
+          }
           if (footAlign) {
             classNames.push(`col--${footAlign}`);
           }
-          return `<td class="${classNames.join(' ')}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${formatText(cellValue, true)}</div></td>`;
+          return `<td class="${classNames.join(' ')}" rowspan="${rowSpan}" colspan="${colSpan}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${formatText(cellValue, true)}</div></td>`;
         }).join('')}</tr>`);
       });
       tables.push('</tfoot>');
@@ -20519,6 +20551,9 @@ function renderBody(h, $xeTable) {
     };
   },
   inject: {
+    $xeModal: {
+      default: null
+    },
     $xeTabs: {
       default: null
     },
@@ -20544,6 +20579,7 @@ function renderBody(h, $xeTable) {
       reLayoutFlag: 0,
       footFlag: 0,
       kfFlag: 0,
+      layoutReFlag: 0,
       mergeFooteCellFlag: 0,
       crossTableDragRowInfo: crossTableDragRowGlobal
     };
@@ -21494,11 +21530,21 @@ function renderBody(h, $xeTable) {
       const props = $xeTable;
       return Object.assign({}, table_getConfig().table.undoRedoHistoryConfig, props.undoRedoHistoryConfig);
     },
-    tabsResizeFlag() {
+    combineTabsResizeFlag() {
       const $xeTable = this;
       const $xeTabs = $xeTable.$xeTabs;
       return $xeTabs ? $xeTabs.reactData.resizeFlag : null;
     },
+    combineModalResizeFlag() {
+      const $xeTable = this;
+      const $xeModal = $xeTable.$xeModal;
+      return $xeModal ? $xeModal.reactData.resizeFlag : null;
+    },
+    combineSplitterResizeFlag() {
+      const $xeTable = this;
+      const $xeSplitter = $xeTable.$xeSplitter;
+      return $xeSplitter ? $xeSplitter.reactData.resizeFlag : null;
+    },
     computeVxeLanguage() {
       return core_.VxeUI.getLanguage();
     },
@@ -21636,7 +21682,16 @@ function renderBody(h, $xeTable) {
         });
       }
     },
-    tabsResizeFlag() {
+    combineTabsResizeFlag() {
+      this.layoutReFlag++;
+    },
+    combineModalResizeFlag() {
+      this.layoutReFlag++;
+    },
+    combineSplitterResizeFlag() {
+      this.layoutReFlag++;
+    },
+    layoutReFlag() {
       this.handleGlobalResizeEvent();
     },
     mergeCells(value) {