vxe-table 3.14.1 → 3.14.2

package/es/table/src/methods.js

@@ -1,5 +1,5 @@
 import XEUtils from 'xe-utils';
-import { browse, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, getOffsetPos, setScrollTop, setScrollLeft, toCssUnit } from '../../ui/src/dom';
+import { 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';
@@ -7,6 +7,7 @@ import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible,
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeUI;
+const browseObj = XEUtils.browse();
 const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;
@@ -614,7 +615,7 @@ function updateStyle($xeTable) {
                 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) {
@@ -1769,7 +1770,7 @@ function hideDropTip($xeTable) {
  * @param {Event} evnt 事件
  * @param {Row} row 行对象
  */
-function handleTooltip($xeTable, evnt, tdEl, overflowElem, params) {
+function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
     const reactData = $xeTable;
     const tipOverEl = overflowElem || tdEl;
     if (!tipOverEl) {
@@ -1783,7 +1784,8 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, params) {
     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,
@@ -1793,7 +1795,7 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, params) {
         $xeTable.$nextTick(() => {
             const $tooltip = $xeTable.$refs.refTooltip;
             if ($tooltip && $tooltip.open) {
-                $tooltip.open(tipOverEl, formatText(content));
+                $tooltip.open(isOver ? tipOverEl : tipElem, formatText(content));
             }
         });
     }
@@ -5540,7 +5542,7 @@ const Methods = {
             return;
         }
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-            handleTooltip($xeTable, evnt, thEl, thEl.querySelector('.vxe-cell--title') || cellEl, params);
+            handleTooltip($xeTable, evnt, thEl, thEl.querySelector('.vxe-cell--wrapper'), thEl.querySelector('.vxe-cell--title') || cellEl, params);
         }
     },
     /**
@@ -5570,7 +5572,7 @@ const Methods = {
             }
         }
         if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-            handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+            handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
         }
     },
     /**
@@ -5584,7 +5586,7 @@ const Methods = {
         const tdEl = evnt.currentTarget;
         handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row);
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-            handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+            handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
         }
     },
     openTooltip(target, content) {

package/es/table/src/table.js

@@ -1130,6 +1130,9 @@ export default {
             const $xeTable = this;
             const $xeTabs = $xeTable.$xeTabs;
             return $xeTabs ? $xeTabs.reactData.resizeFlag : null;
+        },
+        computeVxeLanguage() {
+            return VxeUI.getLanguage();
         } }),
     watch: {
         data(value) {
@@ -1202,6 +1205,9 @@ export default {
         computeScrollbarYToLeft() {
             this.reLayoutFlag++;
         },
+        computeVxeLanguage() {
+            this.reLayoutFlag++;
+        },
         reLayoutFlag() {
             const $xeTable = this;
             $xeTable.$nextTick(() => $xeTable.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 = "3.14.1";
+export const version = "3.14.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${"3.14.1"}`;
+const version = `table v${"3.14.2"}`;
 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.1";
+const version = "3.14.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2661,7 +2661,6 @@ var es_array_push = __webpack_require__(4114);
 ;// CONCATENATED MODULE: ./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) {
@@ -2844,7 +2843,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.14.1"}`;
+const log_version = `table v${"3.14.2"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5174,6 +5173,7 @@ const {
   interceptor: methods_interceptor,
   createEvent
 } = core_.VxeUI;
+const browseObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().browse();
 const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;
@@ -5916,7 +5916,7 @@ function updateStyle($xeTable) {
         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) {
@@ -7236,7 +7236,7 @@ function hideDropTip($xeTable) {
  * @param {Event} evnt 事件
  * @param {Row} row 行对象
  */
-function handleTooltip($xeTable, evnt, tdEl, overflowElem, params) {
+function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
   const reactData = $xeTable;
   const tipOverEl = overflowElem || tdEl;
   if (!tipOverEl) {
@@ -7258,7 +7258,8 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, params) {
   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,
@@ -7268,7 +7269,7 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, params) {
     $xeTable.$nextTick(() => {
       const $tooltip = $xeTable.$refs.refTooltip;
       if ($tooltip && $tooltip.open) {
-        $tooltip.open(tipOverEl, formatText(content));
+        $tooltip.open(isOver ? tipOverEl : tipElem, formatText(content));
       }
     });
   }
@@ -11579,7 +11580,7 @@ const Methods = {
       return;
     }
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, thEl, thEl.querySelector('.vxe-cell--title') || cellEl, params);
+      handleTooltip($xeTable, evnt, thEl, thEl.querySelector('.vxe-cell--wrapper'), thEl.querySelector('.vxe-cell--title') || cellEl, params);
     }
   },
   /**
@@ -11620,7 +11621,7 @@ const Methods = {
       }
     }
     if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
     }
   },
   /**
@@ -11638,7 +11639,7 @@ const Methods = {
     const tdEl = evnt.currentTarget;
     handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row);
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
+      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
     }
   },
   openTooltip(target, content) {
@@ -21119,6 +21120,7 @@ const {
   renderer: edit_mixin_renderer,
   getI18n: mixin_getI18n
 } = core_.VxeUI;
+const mixin_browseObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().browse();
 function getEditColumnModel(row, column) {
   const {
     model,
@@ -22165,7 +22167,7 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
             inputElem.select();
           } else {
             // 保持一致行为，光标移到末端
-            if (browse.msie) {
+            if (mixin_browseObj.msie) {
               const textRange = inputElem.createTextRange();
               textRange.collapse(false);
               textRange.select();
@@ -24295,10 +24297,11 @@ const convertToRows = originColumns => {
 
 
 
+const keyboard_mixin_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 = !keyboard_mixin_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);
@@ -26993,6 +26996,9 @@ function renderBody(h, $xeTable) {
       const $xeTable = this;
       const $xeTabs = $xeTable.$xeTabs;
       return $xeTabs ? $xeTabs.reactData.resizeFlag : null;
+    },
+    computeVxeLanguage() {
+      return core_.VxeUI.getLanguage();
     }
   },
   watch: {
@@ -27072,6 +27078,9 @@ function renderBody(h, $xeTable) {
     computeScrollbarYToLeft() {
       this.reLayoutFlag++;
     },
+    computeVxeLanguage() {
+      this.reLayoutFlag++;
+    },
     reLayoutFlag() {
       const $xeTable = this;
       $xeTable.$nextTick(() => $xeTable.recalculate(true));