vxe-table 3.14.0-beta.26 → 3.14.0-beta.27

package/es/table/src/methods.js

@@ -1695,9 +1695,10 @@ function hideDropTip($xeTable) {
  * @param {Event} evnt 事件
  * @param {Row} row 行对象
  */
-function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
+function handleTooltip($xeTable, evnt, tdEl, overflowElem, params) {
     const reactData = $xeTable;
-    if (!overflowElem) {
+    const tipOverEl = overflowElem || tdEl;
+    if (!tipOverEl) {
         return $xeTable.$nextTick();
     }
     params.cell = tdEl;
@@ -1707,9 +1708,8 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
     const { showAll, contentMethod } = tooltipOpts;
     const customContent = contentMethod ? contentMethod(params) : null;
     const useCustom = contentMethod && !XEUtils.eqNull(customContent);
-    const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim();
-    const isCellOverflow = overflowElem.scrollWidth > overflowElem.clientWidth;
-    if (content && (showAll || useCustom || isCellOverflow)) {
+    const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
+    if (content && (showAll || useCustom || (tipOverEl.scrollWidth > tipOverEl.clientWidth))) {
         Object.assign(tooltipStore, {
             row,
             column,
@@ -1719,7 +1719,7 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
         $xeTable.$nextTick(() => {
             const $tooltip = $xeTable.$refs.refTooltip;
             if ($tooltip && $tooltip.open) {
-                $tooltip.open(isCellOverflow ? overflowElem : (tipElem || overflowElem), formatText(content));
+                $tooltip.open(tipOverEl, formatText(content));
             }
         });
     }
@@ -5431,7 +5431,7 @@ const Methods = {
             return;
         }
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-            handleTooltip($xeTable, evnt, thEl, cellEl, null, params);
+            handleTooltip($xeTable, evnt, thEl, thEl.querySelector('.vxe-cell--title') || cellEl, params);
         }
     },
     /**
@@ -5461,7 +5461,7 @@ const Methods = {
             }
         }
         if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-            handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), null, params);
+            handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
         }
     },
     /**
@@ -5472,10 +5472,10 @@ const Methods = {
         const reactData = $xeTable;
         const { column } = params;
         const { tooltipStore } = reactData;
-        const cell = evnt.currentTarget;
+        const tdEl = evnt.currentTarget;
         handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row);
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-            handleTooltip($xeTable, evnt, cell, cell.querySelector('.vxe-cell--wrapper') || cell.children[0], null, params);
+            handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
         }
     },
     openTooltip(target, content) {

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.14.0-beta.26";
+const version = "3.14.0-beta.27";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2844,7 +2844,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.14.0-beta.26"}`;
+const log_version = `table v${"3.14.0-beta.27"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -7129,9 +7129,10 @@ function hideDropTip($xeTable) {
  * @param {Event} evnt 事件
  * @param {Row} row 行对象
  */
-function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
+function handleTooltip($xeTable, evnt, tdEl, overflowElem, params) {
   const reactData = $xeTable;
-  if (!overflowElem) {
+  const tipOverEl = overflowElem || tdEl;
+  if (!tipOverEl) {
     return $xeTable.$nextTick();
   }
   params.cell = tdEl;
@@ -7149,9 +7150,8 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
   } = tooltipOpts;
   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' ? overflowElem.innerText : overflowElem.textContent).trim();
-  const isCellOverflow = overflowElem.scrollWidth > overflowElem.clientWidth;
-  if (content && (showAll || useCustom || isCellOverflow)) {
+  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();
+  if (content && (showAll || useCustom || tipOverEl.scrollWidth > tipOverEl.clientWidth)) {
     Object.assign(tooltipStore, {
       row,
       column,
@@ -7161,7 +7161,7 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
     $xeTable.$nextTick(() => {
       const $tooltip = $xeTable.$refs.refTooltip;
       if ($tooltip && $tooltip.open) {
-        $tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, formatText(content));
+        $tooltip.open(tipOverEl, formatText(content));
       }
     });
   }
@@ -11456,7 +11456,7 @@ const Methods = {
       return;
     }
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, thEl, cellEl, null, params);
+      handleTooltip($xeTable, evnt, thEl, thEl.querySelector('.vxe-cell--title') || cellEl, params);
     }
   },
   /**
@@ -11497,7 +11497,7 @@ const Methods = {
       }
     }
     if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), null, params);
+      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
     }
   },
   /**
@@ -11512,10 +11512,10 @@ const Methods = {
     const {
       tooltipStore
     } = reactData;
-    const cell = evnt.currentTarget;
+    const tdEl = evnt.currentTarget;
     handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row);
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, cell, cell.querySelector('.vxe-cell--wrapper') || cell.children[0], null, params);
+      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
     }
   },
   openTooltip(target, content) {
@@ -16817,7 +16817,10 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         attrs: {
           name: column.id
         },
-        key: $columnIndex
+        key: $columnIndex,
+        style: {
+          width: `${column.renderWidth}px`
+        }
       });
     })),
     /**
@@ -17291,7 +17294,10 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
         attrs: {
           name: column.id
         },
-        key: $columnIndex
+        key: $columnIndex,
+        style: {
+          width: `${column.renderWidth}px`
+        }
       });
     })),
     /**
@@ -17783,7 +17789,10 @@ function footer_renderHeads(h, _vm, renderColumnList) {
         attrs: {
           name: column.id
         },
-        key: $columnIndex
+        key: $columnIndex,
+        style: {
+          width: `${column.renderWidth}px`
+        }
       });
     })),
     /**