vxe-table 4.12.1 → 4.12.2

package/es/table/src/table.js

@@ -1,6 +1,6 @@
 import { defineComponent, h, reactive, ref, provide, inject, nextTick, onActivated, onDeactivated, onBeforeUnmount, onUnmounted, watch, computed, onMounted } from 'vue';
 import XEUtils from 'xe-utils';
-import { browse, initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, getOffsetPos, setScrollTop, setScrollLeft, toCssUnit } from '../../ui/src/dom';
+import { initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, getOffsetPos, setScrollTop, setScrollLeft, toCssUnit } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import Cell from './cell';
@@ -29,6 +29,7 @@ export default defineComponent({
     setup(props, context) {
         const { slots, emit } = context;
         const xID = XEUtils.uniqueId();
+        const browseObj = XEUtils.browse();
         // 使用已安装的组件，如果未安装则不渲染
         const VxeUILoadingComponent = VxeUI.getComponent('VxeLoading');
         const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
@@ -1980,7 +1981,7 @@ export default defineComponent({
                         if (tableElem) {
                             tableElem.style.width = tWidth ? `${tWidth}px` : '';
                             // 兼容性处理
-                            tableElem.style.paddingRight = osbWidth && fixedType && (browse['-moz'] || browse.safari) ? `${osbWidth}px` : '';
+                            tableElem.style.paddingRight = osbWidth && fixedType && (browseObj['-moz'] || browseObj.safari) ? `${osbWidth}px` : '';
                         }
                         const emptyBlockElem = getRefElem(elemStore[`${name}-${layout}-emptyBlock`]);
                         if (emptyBlockElem) {
@@ -6656,7 +6657,7 @@ export default defineComponent({
          * @param {Event} evnt 事件
          * @param {Row} row 行对象
          */
-        const handleTooltip = (evnt, tdEl, overflowElem, params) => {
+        const handleTooltip = (evnt, tdEl, overflowElem, tipElem, params) => {
             const tipOverEl = overflowElem || tdEl;
             if (!tipOverEl) {
                 return nextTick();
@@ -6669,7 +6670,8 @@ export default defineComponent({
             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();
-            if (content && (showAll || useCustom || (tipOverEl.scrollWidth > tipOverEl.clientWidth))) {
+            const isOver = tipOverEl.scrollWidth > tipOverEl.clientWidth;
+            if (content && (showAll || useCustom || isOver)) {
                 Object.assign(tooltipStore, {
                     row,
                     column,
@@ -6679,7 +6681,7 @@ export default defineComponent({
                 nextTick(() => {
                     const $tooltip = refTooltip.value;
                     if ($tooltip && $tooltip.open) {
-                        $tooltip.open(tipOverEl, formatText(content));
+                        $tooltip.open(isOver ? tipOverEl : tipElem, formatText(content));
                     }
                 });
             }
@@ -7646,7 +7648,7 @@ export default defineComponent({
                     return;
                 }
                 if (tooltipStore.column !== column || !tooltipStore.visible) {
-                    handleTooltip(evnt, thEl, thEl.querySelector('.vxe-cell--title') || cellEl, params);
+                    handleTooltip(evnt, thEl, thEl.querySelector('.vxe-cell--wrapper'), thEl.querySelector('.vxe-cell--title') || cellEl, params);
                 }
             },
             /**
@@ -7673,7 +7675,7 @@ export default defineComponent({
                     }
                 }
                 if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-                    handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+                    handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
                 }
             },
             /**
@@ -7685,7 +7687,7 @@ export default defineComponent({
                 const tdEl = evnt.currentTarget;
                 handleTargetEnterEvent(tooltipStore.column !== column || !!tooltipStore.row);
                 if (tooltipStore.column !== column || !tooltipStore.visible) {
-                    handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+                    handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
                 }
             },
             handleTargetLeaveEvent() {
@@ -10164,6 +10166,9 @@ export default defineComponent({
         watch(computeScrollbarYToLeft, () => {
             reLayoutFlag.value++;
         });
+        watch(() => VxeUI.getLanguage(), () => {
+            reLayoutFlag.value++;
+        });
         watch(reLayoutFlag, () => {
             nextTick(() => tableMethods.recalculate(true));
         });

package/es/ui/index.js

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

package/es/ui/src/dom.js

@@ -1,6 +1,5 @@
 import XEUtils from 'xe-utils';
 const reClsMap = {};
-export const browse = XEUtils.browse();
 let tpImgEl;
 export function initTpImg() {
     if (!tpImgEl) {

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.12.1";
+const version = "4.12.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3587,7 +3587,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.12.1"}`;
+const log_version = `table v${"4.12.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3771,7 +3771,6 @@ class ColumnInfo {
 ;// ./packages/ui/src/dom.ts
 
 const reClsMap = {};
-const browse = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().browse();
 let tpImgEl;
 function initTpImg() {
   if (!tpImgEl) {
@@ -10495,6 +10494,7 @@ const maxXWidth = 5e6;
       emit
     } = context;
     const xID = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId();
+    const browseObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().browse();
     // 使用已安装的组件，如果未安装则不渲染
     const VxeUILoadingComponent = core_.VxeUI.getComponent('VxeLoading');
     const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
@@ -12777,7 +12777,7 @@ const maxXWidth = 5e6;
             if (tableElem) {
               tableElem.style.width = tWidth ? `${tWidth}px` : '';
               // 兼容性处理
-              tableElem.style.paddingRight = osbWidth && fixedType && (browse['-moz'] || browse.safari) ? `${osbWidth}px` : '';
+              tableElem.style.paddingRight = osbWidth && fixedType && (browseObj['-moz'] || browseObj.safari) ? `${osbWidth}px` : '';
             }
             const emptyBlockElem = getRefElem(elemStore[`${name}-${layout}-emptyBlock`]);
             if (emptyBlockElem) {
@@ -18137,7 +18137,7 @@ const maxXWidth = 5e6;
      * @param {Event} evnt 事件
      * @param {Row} row 行对象
      */
-    const handleTooltip = (evnt, tdEl, overflowElem, params) => {
+    const handleTooltip = (evnt, tdEl, overflowElem, tipElem, params) => {
       const tipOverEl = overflowElem || tdEl;
       if (!tipOverEl) {
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -18158,7 +18158,8 @@ const maxXWidth = 5e6;
       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();
-      if (content && (showAll || useCustom || tipOverEl.scrollWidth > tipOverEl.clientWidth)) {
+      const isOver = tipOverEl.scrollWidth > tipOverEl.clientWidth;
+      if (content && (showAll || useCustom || isOver)) {
         Object.assign(tooltipStore, {
           row,
           column,
@@ -18168,7 +18169,7 @@ const maxXWidth = 5e6;
         (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
           const $tooltip = refTooltip.value;
           if ($tooltip && $tooltip.open) {
-            $tooltip.open(tipOverEl, formatText(content));
+            $tooltip.open(isOver ? tipOverEl : tipElem, formatText(content));
           }
         });
       }
@@ -19300,7 +19301,7 @@ const maxXWidth = 5e6;
           return;
         }
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-          handleTooltip(evnt, thEl, thEl.querySelector('.vxe-cell--title') || cellEl, params);
+          handleTooltip(evnt, thEl, thEl.querySelector('.vxe-cell--wrapper'), thEl.querySelector('.vxe-cell--title') || cellEl, params);
         }
       },
       /**
@@ -19338,7 +19339,7 @@ const maxXWidth = 5e6;
           }
         }
         if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-          handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+          handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
         }
       },
       /**
@@ -19354,7 +19355,7 @@ const maxXWidth = 5e6;
         const tdEl = evnt.currentTarget;
         handleTargetEnterEvent(tooltipStore.column !== column || !!tooltipStore.row);
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-          handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+          handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
         }
       },
       handleTargetLeaveEvent() {
@@ -22162,6 +22163,9 @@ const maxXWidth = 5e6;
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(computeScrollbarYToLeft, () => {
       reLayoutFlag.value++;
     });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => core_.VxeUI.getLanguage(), () => {
+      reLayoutFlag.value++;
+    });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(reLayoutFlag, () => {
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => tableMethods.recalculate(true));
     });
@@ -23412,6 +23416,7 @@ edit_hook_hooks.add('tableEditModule', {
       computeTreeOpts,
       computeValidOpts
     } = $xeTable.getComputeMaps();
+    const browseObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().browse();
     let editMethods = {};
     let editPrivateMethods = {};
     const getEditColumnModel = (row, column) => {
@@ -24509,7 +24514,7 @@ edit_hook_hooks.add('tableEditModule', {
               inputElem.select();
             } else {
               // 保持一致行为，光标移到末端
-              if (browse.msie) {
+              if (browseObj.msie) {
                 const textRange = inputElem.createTextRange();
                 textRange.collapse(false);
                 textRange.select();
@@ -26449,10 +26454,11 @@ export_hook_hooks.add('tableExportModule', {
 const {
   hooks: keyboard_hook_hooks
 } = core_.VxeUI;
+const browseObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().browse();
 function getTargetOffset(target, container) {
   let offsetTop = 0;
   let offsetLeft = 0;
-  const triggerCheckboxLabel = !browse.firefox && hasClass(target, 'vxe-checkbox--label');
+  const triggerCheckboxLabel = !browseObj.firefox && hasClass(target, 'vxe-checkbox--label');
   if (triggerCheckboxLabel) {
     const checkboxLabelStyle = getComputedStyle(target);
     offsetTop -= external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(checkboxLabelStyle.paddingTop);