vxe-table 3.18.7 → 3.18.9

package/es/table/src/methods.js

@@ -252,6 +252,7 @@ function cacheColumnMap($xeTable) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
+    const { treeConfig, showOverflow } = props;
     const { tableFullColumn, collectColumn } = internalData;
     const fullColIdData = internalData.fullColumnIdData = {};
     const fullColFieldData = internalData.fullColumnFieldData = {};
@@ -259,12 +260,14 @@ function cacheColumnMap($xeTable) {
     const expandOpts = $xeTable.computeExpandOpts;
     const columnOpts = $xeTable.computeColumnOpts;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
+    const virtualYOpts = $xeTable.computeVirtualYOpts;
     const { isCrossDrag, isSelfToChildDrag } = columnDragOpts;
     const customOpts = $xeTable.computeCustomOpts;
+    const treeOpts = $xeTable.computeTreeOpts;
     const { storage } = customOpts;
     const rowOpts = $xeTable.computeRowOpts;
     const isGroup = collectColumn.some(hasChildrenList);
-    let isAllOverflow = !!props.showOverflow;
+    let isAllOverflow = !!showOverflow;
     let rowGroupColumn;
     let expandColumn;
     let treeNodeColumn;
@@ -352,9 +355,15 @@ function cacheColumnMap($xeTable) {
     else {
         tableFullColumn.forEach(handleFunc);
     }
+    if (expandColumn && expandOpts.mode !== 'fixed' && virtualYOpts.enabled) {
+        warnLog('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false']);
+    }
     if ((expandColumn && expandOpts.mode !== 'fixed') && mouseOpts.area) {
         errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
     }
+    if (expandColumn && expandOpts.mode !== 'inside' && (treeConfig && !treeOpts.transform)) {
+        errLog('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=fixed']);
+    }
     if (htmlColumn) {
         if (!columnOpts.useKey) {
             errLog('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true']);
@@ -2695,7 +2704,7 @@ function clearRowDragData($xeTable) {
  * @param {Event} evnt 事件
  * @param {Row} row 行对象
  */
-function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
+function handleTooltip($xeTable, evnt, type, tdEl, overflowElem, tipElem, params) {
     const reactData = $xeTable;
     const tipOverEl = overflowElem || tdEl;
     if (!tipOverEl) {
@@ -2711,16 +2720,19 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
     const content = useCustom ? customContent : XEUtils.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: {}
         });
         $xeTable.$nextTick(() => {
             const $tooltip = $xeTable.$refs.refTooltip;
             if ($tooltip && $tooltip.open) {
-                $tooltip.open(isOver ? tipOverEl : tipElem, formatText(content));
+                $tooltip.open(isOver ? tipOverEl : tipElem, tipContent);
             }
         });
     }
@@ -6886,7 +6898,7 @@ const Methods = {
         }
         if (tooltipStore.column !== column || !tooltipStore.visible) {
             const ctEl = thEl.querySelector('.vxe-cell--title');
-            handleTooltip($xeTable, evnt, thEl, (hasClass(thEl, 'col--ellipsis') ? ctEl : cWrapperEl) || cWrapperEl, ctEl || cellEl, params);
+            handleTooltip($xeTable, evnt, 'header', thEl, (hasClass(thEl, 'col--ellipsis') ? ctEl : cWrapperEl) || cWrapperEl, ctEl || cellEl, params);
         }
     },
     /**
@@ -6925,7 +6937,7 @@ const Methods = {
             if (!tipEl) {
                 tipEl = ctEl;
             }
-            handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tipEl, params);
+            handleTooltip($xeTable, evnt, 'body', tdEl, ovEl || ctEl, tipEl, params);
         }
     },
     /**
@@ -6948,7 +6960,7 @@ const Methods = {
             if (!tipEl) {
                 tipEl = ctEl;
             }
-            handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tipEl, params);
+            handleTooltip($xeTable, evnt, 'footer', tdEl, ovEl || ctEl, tipEl, params);
         }
     },
     openTooltip(target, content) {
@@ -6974,6 +6986,7 @@ const Methods = {
                 column: null,
                 content: null,
                 visible: false,
+                type: null,
                 currOpts: {}
             });
             if (tooltip) {

package/es/table/src/table.js

@@ -631,6 +631,7 @@ export default {
                 column: null,
                 content: null,
                 visible: false,
+                type: null,
                 currOpts: {}
             },
             // 存放数据校验相关信息
@@ -1865,9 +1866,15 @@ export default {
         const reactData = $xeTable;
         const { xID } = $xeTable;
         const { loading, stripe, showHeader, height, treeConfig, mouseConfig, showFooter, highlightCell, highlightHoverRow, highlightHoverColumn, editConfig, editRules } = props;
-        const { isGroup, overflowX, overflowY, scrollXLoad, scrollYLoad, tableData, initStore, isRowGroupStatus, columnStore, filterStore, customStore } = reactData;
+        const { isGroup, overflowX, overflowY, scrollXLoad, scrollYLoad, tableData, initStore, isRowGroupStatus, columnStore, filterStore, customStore, tooltipStore } = reactData;
         const { leftList, rightList } = columnStore;
         const loadingSlot = slots.loading;
+        const tipSlots = {
+            header: slots.headerTooltip || slots['header-tooltip'],
+            body: slots.tooltip,
+            footer: slots.footerTooltip || slots['footer-tooltip']
+        };
+        const currTooltipSlot = tooltipStore.visible && tooltipStore.type ? tipSlots[tooltipStore.type] : null;
         const rowDragOpts = $xeTable.computeRowDragOpts;
         const tableTipConfig = $xeTable.computeTableTipConfig;
         const validTipConfig = $xeTable.computeValidTipConfig;
@@ -2141,8 +2148,39 @@ export default {
                             enterable: tableTipConfig.enterable,
                             enterDelay: tableTipConfig.enterDelay,
                             leaveDelay: tableTipConfig.leaveDelay,
-                            useHTML: tableTipConfig.useHTML
-                        }
+                            useHTML: tableTipConfig.useHTML,
+                            width: tableTipConfig.width,
+                            height: tableTipConfig.height,
+                            minWidth: tableTipConfig.minWidth,
+                            minHeight: tableTipConfig.minHeight,
+                            maxWidth: tableTipConfig.maxWidth,
+                            maxHeight: tableTipConfig.maxHeight
+                        },
+                        scopedSlots: currTooltipSlot
+                            ? {
+                                content: () => {
+                                    const { type, row, column, content: tooltipContent } = tooltipStore;
+                                    if (currTooltipSlot) {
+                                        if (column && type === 'header') {
+                                            return h('div', {
+                                                key: type
+                                            }, currTooltipSlot({ column, tooltipContent, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }));
+                                        }
+                                        if (row && column && type === 'body') {
+                                            return h('div', {
+                                                key: type
+                                            }, currTooltipSlot({ row, column, tooltipContent, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }));
+                                        }
+                                        if (row && column && type === 'footer') {
+                                            return h('div', {
+                                                key: type
+                                            }, currTooltipSlot({ row, column, tooltipContent, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }));
+                                        }
+                                    }
+                                    return renderEmptyElement($xeTable);
+                                }
+                            }
+                            : {}
                     })
                     : renderEmptyElement($xeTable),
                 /**

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.18.7";
+export const version = "3.18.9";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -239,9 +239,6 @@ VxeUI.setConfig({
             }
         }
     },
-    // export: {
-    //   types: {}
-    // },
     grid: {
         // size: null,
         // zoomConfig: {

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.7";
+const version = "3.18.9";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2241,9 +2241,6 @@ core_.VxeUI.setConfig({
       }
     }
   },
-  // export: {
-  //   types: {}
-  // },
   grid: {
     // size: null,
     // zoomConfig: {
@@ -2678,7 +2675,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.7"}`;
+const log_version = `table v${"3.18.9"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6155,6 +6152,10 @@ function cacheColumnMap($xeTable) {
   const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
+  const {
+    treeConfig,
+    showOverflow
+  } = props;
   const {
     tableFullColumn,
     collectColumn
@@ -6165,17 +6166,19 @@ function cacheColumnMap($xeTable) {
   const expandOpts = $xeTable.computeExpandOpts;
   const columnOpts = $xeTable.computeColumnOpts;
   const columnDragOpts = $xeTable.computeColumnDragOpts;
+  const virtualYOpts = $xeTable.computeVirtualYOpts;
   const {
     isCrossDrag,
     isSelfToChildDrag
   } = columnDragOpts;
   const customOpts = $xeTable.computeCustomOpts;
+  const treeOpts = $xeTable.computeTreeOpts;
   const {
     storage
   } = customOpts;
   const rowOpts = $xeTable.computeRowOpts;
   const isGroup = collectColumn.some(hasChildrenList);
-  let isAllOverflow = !!props.showOverflow;
+  let isAllOverflow = !!showOverflow;
   let rowGroupColumn;
   let expandColumn;
   let treeNodeColumn;
@@ -6277,9 +6280,15 @@ function cacheColumnMap($xeTable) {
   } else {
     tableFullColumn.forEach(handleFunc);
   }
+  if (expandColumn && expandOpts.mode !== 'fixed' && virtualYOpts.enabled) {
+    warnLog('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false']);
+  }
   if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
     errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
   }
+  if (expandColumn && expandOpts.mode !== 'inside' && treeConfig && !treeOpts.transform) {
+    errLog('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=fixed']);
+  }
   if (htmlColumn) {
     if (!columnOpts.useKey) {
       errLog('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true']);
@@ -9067,7 +9076,7 @@ function clearRowDragData($xeTable) {
  * @param {Event} evnt 事件
  * @param {Row} row 行对象
  */
-function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
+function handleTooltip($xeTable, evnt, type, tdEl, overflowElem, tipElem, params) {
   const reactData = $xeTable;
   const tipOverEl = overflowElem || tdEl;
   if (!tipOverEl) {
@@ -9091,16 +9100,19 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
   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: {}
     });
     $xeTable.$nextTick(() => {
       const $tooltip = $xeTable.$refs.refTooltip;
       if ($tooltip && $tooltip.open) {
-        $tooltip.open(isOver ? tipOverEl : tipElem, formatText(content));
+        $tooltip.open(isOver ? tipOverEl : tipElem, tipContent);
       }
     });
   }
@@ -13857,7 +13869,7 @@ const Methods = {
     }
     if (tooltipStore.column !== column || !tooltipStore.visible) {
       const ctEl = thEl.querySelector('.vxe-cell--title');
-      handleTooltip($xeTable, evnt, thEl, (hasClass(thEl, 'col--ellipsis') ? ctEl : cWrapperEl) || cWrapperEl, ctEl || cellEl, params);
+      handleTooltip($xeTable, evnt, 'header', thEl, (hasClass(thEl, 'col--ellipsis') ? ctEl : cWrapperEl) || cWrapperEl, ctEl || cellEl, params);
     }
   },
   /**
@@ -13907,7 +13919,7 @@ const Methods = {
       if (!tipEl) {
         tipEl = ctEl;
       }
-      handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tipEl, params);
+      handleTooltip($xeTable, evnt, 'body', tdEl, ovEl || ctEl, tipEl, params);
     }
   },
   /**
@@ -13934,7 +13946,7 @@ const Methods = {
       if (!tipEl) {
         tipEl = ctEl;
       }
-      handleTooltip($xeTable, evnt, tdEl, ovEl || ctEl, tipEl, params);
+      handleTooltip($xeTable, evnt, 'footer', tdEl, ovEl || ctEl, tipEl, params);
     }
   },
   openTooltip(target, content) {
@@ -13964,6 +13976,7 @@ const Methods = {
         column: null,
         content: null,
         visible: false,
+        type: null,
         currOpts: {}
       });
       if (tooltip) {
@@ -30169,6 +30182,7 @@ function renderBody(h, $xeTable) {
         column: null,
         content: null,
         visible: false,
+        type: null,
         currOpts: {}
       },
       // 存放数据校验相关信息
@@ -31539,13 +31553,20 @@ function renderBody(h, $xeTable) {
       isRowGroupStatus,
       columnStore,
       filterStore,
-      customStore
+      customStore,
+      tooltipStore
     } = reactData;
     const {
       leftList,
       rightList
     } = columnStore;
     const loadingSlot = slots.loading;
+    const tipSlots = {
+      header: slots.headerTooltip || slots['header-tooltip'],
+      body: slots.tooltip,
+      footer: slots.footerTooltip || slots['footer-tooltip']
+    };
+    const currTooltipSlot = tooltipStore.visible && tooltipStore.type ? tipSlots[tooltipStore.type] : null;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const tableTipConfig = $xeTable.computeTableTipConfig;
     const validTipConfig = $xeTable.computeValidTipConfig;
@@ -31782,8 +31803,62 @@ function renderBody(h, $xeTable) {
         enterable: tableTipConfig.enterable,
         enterDelay: tableTipConfig.enterDelay,
         leaveDelay: tableTipConfig.leaveDelay,
-        useHTML: tableTipConfig.useHTML
-      }
+        useHTML: tableTipConfig.useHTML,
+        width: tableTipConfig.width,
+        height: tableTipConfig.height,
+        minWidth: tableTipConfig.minWidth,
+        minHeight: tableTipConfig.minHeight,
+        maxWidth: tableTipConfig.maxWidth,
+        maxHeight: tableTipConfig.maxHeight
+      },
+      scopedSlots: currTooltipSlot ? {
+        content: () => {
+          const {
+            type,
+            row,
+            column,
+            content: tooltipContent
+          } = tooltipStore;
+          if (currTooltipSlot) {
+            if (column && type === 'header') {
+              return h('div', {
+                key: type
+              }, currTooltipSlot({
+                column,
+                tooltipContent,
+                $table: $xeTable,
+                $grid: $xeGrid,
+                $gantt: $xeGantt
+              }));
+            }
+            if (row && column && type === 'body') {
+              return h('div', {
+                key: type
+              }, currTooltipSlot({
+                row,
+                column,
+                tooltipContent,
+                $table: $xeTable,
+                $grid: $xeGrid,
+                $gantt: $xeGantt
+              }));
+            }
+            if (row && column && type === 'footer') {
+              return h('div', {
+                key: type
+              }, currTooltipSlot({
+                row,
+                column,
+                tooltipContent,
+                $table: $xeTable,
+                $grid: $xeGrid,
+                $gantt: $xeGantt
+              }));
+            }
+          }
+          return table_renderEmptyElement($xeTable);
+        }
+      } : {}
     }) : table_renderEmptyElement($xeTable),
     /**
      * 校验提示