vxe-table 4.1.20 → 4.2.0-beta.2

package/lib/table/src/table.js

@@ -13,6 +13,8 @@ var _dom = require("../../tools/dom");
 
 var _utils = require("../../tools/utils");
 
+var _log = require("../../tools/log");
+
 var _resize = require("../../tools/resize");
 
 var _event = require("../../tools/event");
@@ -202,6 +204,14 @@ var _default = (0, _vue.defineComponent)({
         insertList: [],
         removeList: []
       },
+      // 存放 tooltip 相关信息
+      tooltipStore: {
+        row: null,
+        column: null,
+        content: null,
+        visible: false,
+        currOpts: null
+      },
       // 存放数据校验相关信息
       validStore: {
         visible: false,
@@ -273,8 +283,6 @@ var _default = (0, _vue.defineComponent)({
         startIndex: 0,
         endIndex: 0
       },
-      // 存放 tooltip 相关信息
-      tooltipStore: {},
       // 表格宽度
       tableWidth: 0,
       // 表格高度
@@ -320,7 +328,6 @@ var _default = (0, _vue.defineComponent)({
       fullColumnIdData: {},
       fullColumnFieldData: {},
       inited: false,
-      tooltipActive: false,
       tooltipTimeout: null,
       initStatus: false,
       isActivated: false
@@ -386,27 +393,13 @@ var _default = (0, _vue.defineComponent)({
       return Object.assign({}, _conf.default.table.checkboxConfig, props.checkboxConfig);
     });
     var computeTooltipOpts = (0, _vue.ref)();
-
-    var handleTooltipLeaveMethod = function handleTooltipLeaveMethod() {
-      var tooltipOpts = computeTooltipOpts.value;
-      setTimeout(function () {
-        if (!internalData.tooltipActive) {
-          tableMethods.closeTooltip();
-        }
-      }, tooltipOpts.leaveDelay);
-      return false;
-    };
-
     computeTooltipOpts = (0, _vue.computed)(function () {
-      var opts = Object.assign({
-        leaveDelay: 300
-      }, _conf.default.table.tooltipConfig, props.tooltipConfig);
-
-      if (opts.enterable) {
-        opts.leaveMethod = handleTooltipLeaveMethod;
-      }
-
-      return opts;
+      return Object.assign({}, _conf.default.tooltip, _conf.default.table.tooltipConfig, props.tooltipConfig);
+    });
+    var computeTipConfig = (0, _vue.computed)(function () {
+      var tooltipStore = reactData.tooltipStore;
+      var tooltipOpts = computeTooltipOpts.value;
+      return __assign(__assign({}, tooltipOpts), tooltipStore.currOpts);
     });
     var computeValidTipOpts = (0, _vue.computed)(function () {
       var tooltipOpts = computeTooltipOpts.value;
@@ -775,7 +768,7 @@ var _default = (0, _vue.defineComponent)({
         var visibleColumn_1 = internalData.visibleColumn;
 
         if (treeConfig) {
-          (0, _utils.errLog)('vxe.error.noTree', ['merge-footer-items']);
+          (0, _log.errLog)('vxe.error.noTree', ['merge-footer-items']);
           return;
         }
 
@@ -841,7 +834,7 @@ var _default = (0, _vue.defineComponent)({
         var visibleColumn_2 = internalData.visibleColumn;
 
         if (treeConfig) {
-          throw new Error((0, _utils.getLog)('vxe.error.noTree', ['merge-cells']));
+          throw new Error((0, _log.getLog)('vxe.error.noTree', ['merge-cells']));
         }
 
         if (!_xeUtils.default.isArray(merges)) {
@@ -922,7 +915,7 @@ var _default = (0, _vue.defineComponent)({
         var customMap_1 = {};
 
         if (!id) {
-          (0, _utils.errLog)('vxe.error.reqProp', ['id']);
+          (0, _log.errLog)('vxe.error.reqProp', ['id']);
           return;
         }
 
@@ -1033,7 +1026,7 @@ var _default = (0, _vue.defineComponent)({
         if (property) {
           if (process.env.NODE_ENV === 'development') {
             if (fullColumnFieldData[property]) {
-              (0, _utils.warnLog)('vxe.error.colRepet', ['field', property]);
+              (0, _log.warnLog)('vxe.error.colRepet', ['field', property]);
             }
           }
 
@@ -1047,7 +1040,7 @@ var _default = (0, _vue.defineComponent)({
         if (treeNode) {
           if (process.env.NODE_ENV === 'development') {
             if (treeNodeColumn) {
-              (0, _utils.warnLog)('vxe.error.colRepet', ['tree-node', treeNode]);
+              (0, _log.warnLog)('vxe.error.colRepet', ['tree-node', treeNode]);
             }
           }
 
@@ -1057,7 +1050,7 @@ var _default = (0, _vue.defineComponent)({
         } else if (type === 'expand') {
           if (process.env.NODE_ENV === 'development') {
             if (expandColumn) {
-              (0, _utils.warnLog)('vxe.error.colRepet', ['type', type]);
+              (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
             }
           }
 
@@ -1069,7 +1062,7 @@ var _default = (0, _vue.defineComponent)({
         if (process.env.NODE_ENV === 'development') {
           if (type === 'checkbox') {
             if (checkboxColumn) {
-              (0, _utils.warnLog)('vxe.error.colRepet', ['type', type]);
+              (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
             }
 
             if (!checkboxColumn) {
@@ -1077,7 +1070,7 @@ var _default = (0, _vue.defineComponent)({
             }
           } else if (type === 'radio') {
             if (radioColumn) {
-              (0, _utils.warnLog)('vxe.error.colRepet', ['type', type]);
+              (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
             }
 
             if (!radioColumn) {
@@ -1091,7 +1084,7 @@ var _default = (0, _vue.defineComponent)({
         }
 
         if (fullColumnIdData[colid]) {
-          (0, _utils.errLog)('vxe.error.colRepet', ['colId', colid]);
+          (0, _log.errLog)('vxe.error.colRepet', ['colId', colid]);
         }
 
         fullColumnIdData[colid] = rest;
@@ -1108,7 +1101,7 @@ var _default = (0, _vue.defineComponent)({
 
       if (process.env.NODE_ENV === 'development') {
         if (expandColumn && mouseOpts.area) {
-          (0, _utils.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
+          (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
         }
       }
 
@@ -1752,7 +1745,7 @@ var _default = (0, _vue.defineComponent)({
           } else if (layout === 'body') {
             var emptyBlockElem = elemStore[name + "-" + layout + "-emptyBlock"];
 
-            if (wrapperElem) {
+            if ((0, _dom.isNodeElement)(wrapperElem)) {
               if (customMaxHeight) {
                 wrapperElem.style.maxHeight = (fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight) + "px";
               } else {
@@ -1766,7 +1759,7 @@ var _default = (0, _vue.defineComponent)({
 
 
             if (fixedWrapperElem) {
-              if (wrapperElem) {
+              if ((0, _dom.isNodeElement)(wrapperElem)) {
                 wrapperElem.style.top = headerHeight + "px";
               }
 
@@ -1783,14 +1776,7 @@ var _default = (0, _vue.defineComponent)({
                 if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
                   tableColumn = fixedColumn;
                 } else {
-                  tableColumn = visibleColumn; // 检查固定列是否被合并，合并范围是否超出固定列
-                  // if (mergeList.length && !isMergeLeftFixedExceeded && fixedType === 'left') {
-                  //   tableColumn = fixedColumn
-                  // } else if (mergeList.length && !isMergeRightFixedExceeded && fixedType === 'right') {
-                  //   tableColumn = fixedColumn
-                  // } else {
-                  //   tableColumn = visibleColumn
-                  // }
+                  tableColumn = visibleColumn;
                 }
               } else {
                 tableColumn = visibleColumn;
@@ -1818,14 +1804,7 @@ var _default = (0, _vue.defineComponent)({
                 if (!mergeFooterList.length || !footerSpanMethod) {
                   tableColumn = fixedColumn;
                 } else {
-                  tableColumn = visibleColumn; // 检查固定列是否被合并，合并范围是否超出固定列
-                  // if (mergeFooterList.length && !isMergeFooterLeftFixedExceeded && fixedType === 'left') {
-                  //   tableColumn = fixedColumn
-                  // } else if (mergeFooterList.length && !isMergeFooterRightFixedExceeded && fixedType === 'right') {
-                  //   tableColumn = fixedColumn
-                  // } else {
-                  //   tableColumn = visibleColumn
-                  // }
+                  tableColumn = visibleColumn;
                 }
               } else {
                 tableColumn = visibleColumn;
@@ -1836,7 +1815,7 @@ var _default = (0, _vue.defineComponent)({
               return previous + column.renderWidth;
             }, 0);
 
-            if (wrapperElem) {
+            if ((0, _dom.isNodeElement)(wrapperElem)) {
               // 如果是固定列
               if (fixedWrapperElem) {
                 wrapperElem.style.top = (customHeight > 0 ? customHeight - footerHeight : tableHeight + headerHeight) + "px";
@@ -2393,28 +2372,28 @@ var _default = (0, _vue.defineComponent)({
           // 树结构自动转换
           if (process.env.NODE_ENV === 'development') {
             if (!treeOpts.rowField) {
-              (0, _utils.errLog)('vxe.error.reqProp', ['tree-config.rowField']);
+              (0, _log.errLog)('vxe.error.reqProp', ['tree-config.rowField']);
             }
 
             if (!treeOpts.parentField) {
-              (0, _utils.errLog)('vxe.error.reqProp', ['tree-config.parentField']);
+              (0, _log.errLog)('vxe.error.reqProp', ['tree-config.parentField']);
             }
 
             if (!treeOpts.children) {
-              (0, _utils.errLog)('vxe.error.reqProp', ['tree-config.children']);
+              (0, _log.errLog)('vxe.error.reqProp', ['tree-config.children']);
             }
 
             if (!treeOpts.mapChildren) {
-              (0, _utils.errLog)('vxe.error.reqProp', ['tree-config.mapChildren']);
+              (0, _log.errLog)('vxe.error.reqProp', ['tree-config.mapChildren']);
             }
 
             if (treeOpts.children === treeOpts.mapChildren) {
-              (0, _utils.errLog)('vxe.error.errConflicts', ['tree-config.children', 'tree-config.mapChildren']);
+              (0, _log.errLog)('vxe.error.errConflicts', ['tree-config.children', 'tree-config.mapChildren']);
             }
 
             fullData.forEach(function (row) {
               if (row[treeOpts.children] && row[treeOpts.children].length) {
-                (0, _utils.warnLog)('vxe.error.errConflicts', ['tree-config.transform', "row." + treeOpts.children]);
+                (0, _log.warnLog)('vxe.error.errConflicts', ['tree-config.transform', "row." + treeOpts.children]);
               }
             });
           }
@@ -2454,15 +2433,15 @@ var _default = (0, _vue.defineComponent)({
       if (process.env.NODE_ENV === 'development') {
         if (sYLoad) {
           if (!(props.height || props.maxHeight)) {
-            (0, _utils.errLog)('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+            (0, _log.errLog)('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
           }
 
           if (!props.showOverflow) {
-            (0, _utils.warnLog)('vxe.error.reqProp', ['table.show-overflow']);
+            (0, _log.warnLog)('vxe.error.reqProp', ['table.show-overflow']);
           }
 
           if (props.spanMethod) {
-            (0, _utils.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
+            (0, _log.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
           }
         }
       }
@@ -2616,7 +2595,7 @@ var _default = (0, _vue.defineComponent)({
           }
 
           if (parent && column.fixed !== parent.fixed) {
-            (0, _utils.errLog)('vxe.error.groupFixed');
+            (0, _log.errLog)('vxe.error.groupFixed');
           }
 
           if (isColGroup) {
@@ -2674,26 +2653,26 @@ var _default = (0, _vue.defineComponent)({
         scrollXLoad = false;
 
         if (process.env.NODE_ENV === 'development') {
-          (0, _utils.warnLog)('vxe.error.scrollXNotGroup');
+          (0, _log.warnLog)('vxe.error.scrollXNotGroup');
         }
       }
 
       if (scrollXLoad) {
         if (process.env.NODE_ENV === 'development') {
           if (props.showHeader && !props.showHeaderOverflow) {
-            (0, _utils.warnLog)('vxe.error.reqProp', ['show-header-overflow']);
+            (0, _log.warnLog)('vxe.error.reqProp', ['show-header-overflow']);
           }
 
           if (props.showFooter && !props.showFooterOverflow) {
-            (0, _utils.warnLog)('vxe.error.reqProp', ['show-footer-overflow']);
+            (0, _log.warnLog)('vxe.error.reqProp', ['show-footer-overflow']);
           }
 
           if (props.spanMethod) {
-            (0, _utils.warnLog)('vxe.error.scrollErrProp', ['span-method']);
+            (0, _log.warnLog)('vxe.error.scrollErrProp', ['span-method']);
           }
 
           if (props.footerSpanMethod) {
-            (0, _utils.warnLog)('vxe.error.scrollErrProp', ['footer-span-method']);
+            (0, _log.warnLog)('vxe.error.scrollErrProp', ['footer-span-method']);
           }
         }
 
@@ -2748,7 +2727,7 @@ var _default = (0, _vue.defineComponent)({
 
       if (process.env.NODE_ENV === 'development') {
         if ((reactData.scrollXLoad || reactData.scrollYLoad) && reactData.expandColumn) {
-          (0, _utils.warnLog)('vxe.error.scrollErrProp', ['column.type=expand']);
+          (0, _log.warnLog)('vxe.error.scrollErrProp', ['column.type=expand']);
         }
       }
 
@@ -2972,12 +2951,34 @@ var _default = (0, _vue.defineComponent)({
       },
 
       /**
-       * 手动处理数据
+       * 手动处理数据，用于手动排序与筛选
        * 对于手动更改了排序、筛选...等条件后需要重新处理数据时可能会用到
        */
       updateData: function updateData() {
-        return tablePrivateMethods.handleTableData(true).then(tableMethods.updateFooter).then(function () {
-          return tableMethods.recalculate();
+        var scrollXLoad = reactData.scrollXLoad,
+            scrollYLoad = reactData.scrollYLoad;
+        return tablePrivateMethods.handleTableData(true).then(function () {
+          tableMethods.updateFooter();
+
+          if (scrollXLoad || scrollYLoad) {
+            if (scrollXLoad) {
+              tablePrivateMethods.updateScrollXSpace();
+            }
+
+            if (scrollYLoad) {
+              tablePrivateMethods.updateScrollYSpace();
+            }
+
+            return tableMethods.refreshScroll();
+          }
+        }).then(function () {
+          tablePrivateMethods.updateCellAreas();
+          return tableMethods.recalculate(true);
+        }).then(function () {
+          // 存在滚动行为未结束情况
+          setTimeout(function () {
+            return $xetable.recalculate();
+          }, 50);
         });
       },
 
@@ -3058,7 +3059,7 @@ var _default = (0, _vue.defineComponent)({
           reactData.tableData = tableData.slice(0);
         } else {
           if (process.env.NODE_ENV === 'development') {
-            (0, _utils.warnLog)('vxe.error.reqProp', ['keep-source']);
+            (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
           }
         }
 
@@ -3292,7 +3293,7 @@ var _default = (0, _vue.defineComponent)({
 
         if (!keepSource) {
           if (process.env.NODE_ENV === 'development') {
-            (0, _utils.warnLog)('vxe.error.reqProp', ['keep-source']);
+            (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
           }
 
           return (0, _vue.nextTick)();
@@ -3684,18 +3685,24 @@ var _default = (0, _vue.defineComponent)({
         var tableBodyElem = tableBody ? tableBody.$el : null;
         var leftBodyElem = leftBody ? leftBody.$el : null;
         var rightBodyElem = rightBody ? rightBody.$el : null;
-        var tableFooterElem = tableFooter ? tableFooter.$el : null; // 还原滚动条位置
+        var tableFooterElem = tableFooter ? tableFooter.$el : null;
+        return new Promise(function (resolve) {
+          // 还原滚动条位置
+          if (lastScrollLeft || lastScrollTop) {
+            return (0, _util.restoreScrollLocation)($xetable, lastScrollLeft, lastScrollTop).then(resolve).then(function () {
+              // 存在滚动行为未结束情况
+              setTimeout(resolve, 30);
+            });
+          } // 重置
 
-        if (lastScrollLeft || lastScrollTop) {
-          return (0, _util.restoreScrollLocation)($xetable, lastScrollLeft, lastScrollTop);
-        } // 重置
 
+          (0, _dom.setScrollTop)(tableBodyElem, lastScrollTop);
+          (0, _dom.setScrollTop)(leftBodyElem, lastScrollTop);
+          (0, _dom.setScrollTop)(rightBodyElem, lastScrollTop);
+          (0, _dom.setScrollLeft)(tableFooterElem, lastScrollLeft); // 存在滚动行为未结束情况
 
-        (0, _dom.setScrollTop)(tableBodyElem, lastScrollTop);
-        (0, _dom.setScrollTop)(leftBodyElem, lastScrollTop);
-        (0, _dom.setScrollTop)(rightBodyElem, lastScrollTop);
-        (0, _dom.setScrollLeft)(tableFooterElem, lastScrollLeft);
-        return (0, _vue.nextTick)();
+          setTimeout(resolve, 30);
+        });
       },
 
       /**
@@ -3738,7 +3745,7 @@ var _default = (0, _vue.defineComponent)({
        * 关闭 tooltip
        */
       closeTooltip: function closeTooltip() {
-        var tooltipStore = internalData.tooltipStore;
+        var tooltipStore = reactData.tooltipStore;
         var $tooltip = refTooltip.value;
         var $commTip = refCommTooltip.value;
 
@@ -4444,7 +4451,7 @@ var _default = (0, _vue.defineComponent)({
       },
       reloadExpandContent: function reloadExpandContent(row) {
         if (process.env.NODE_ENV === 'development') {
-          (0, _utils.warnLog)('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
+          (0, _log.warnLog)('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
         } // 即将废弃
 
 
@@ -4648,7 +4655,7 @@ var _default = (0, _vue.defineComponent)({
       },
       reloadTreeChilds: function reloadTreeChilds(row) {
         if (process.env.NODE_ENV === 'development') {
-          (0, _utils.warnLog)('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
+          (0, _log.warnLog)('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
         } // 即将废弃
 
 
@@ -4956,7 +4963,7 @@ var _default = (0, _vue.defineComponent)({
        */
       setMergeCells: function setMergeCells(merges) {
         if (props.spanMethod) {
-          (0, _utils.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
+          (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
         }
 
         setMerges(merges, reactData.mergeList, internalData.afterFullData);
@@ -4971,7 +4978,7 @@ var _default = (0, _vue.defineComponent)({
        */
       removeMergeCells: function removeMergeCells(merges) {
         if (props.spanMethod) {
-          (0, _utils.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
+          (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
         }
 
         var rest = removeMerges(merges, reactData.mergeList, internalData.afterFullData);
@@ -4997,7 +5004,7 @@ var _default = (0, _vue.defineComponent)({
       },
       setMergeFooterItems: function setMergeFooterItems(merges) {
         if (props.footerSpanMethod) {
-          (0, _utils.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
+          (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
         }
 
         setMerges(merges, reactData.mergeFooterList);
@@ -5007,7 +5014,7 @@ var _default = (0, _vue.defineComponent)({
       },
       removeMergeFooterItems: function removeMergeFooterItems(merges) {
         if (props.footerSpanMethod) {
-          (0, _utils.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
+          (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
         }
 
         var rest = removeMerges(merges, reactData.mergeFooterList);
@@ -5052,7 +5059,7 @@ var _default = (0, _vue.defineComponent)({
             $table: $xetable
           });
         } else {
-          (0, _utils.errLog)('vxe.error.barUnableLink');
+          (0, _log.errLog)('vxe.error.barUnableLink');
         }
 
         return (0, _vue.nextTick)();
@@ -5206,6 +5213,8 @@ var _default = (0, _vue.defineComponent)({
 
       if (isEsc) {
         tablePrivateMethods.preventEvent(evnt, 'event.keydown', null, function () {
+          tableMethods.dispatchEvent('keydown-start', {}, evnt);
+
           if (keyboardConfig && mouseConfig && mouseOpts.area && $xetable.handleKeyboardEvent) {
             $xetable.handleKeyboardEvent(evnt);
           } else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
@@ -5233,6 +5242,7 @@ var _default = (0, _vue.defineComponent)({
           }
 
           tableMethods.dispatchEvent('keydown', {}, evnt);
+          tableMethods.dispatchEvent('keydown-end', {}, evnt);
         });
       }
     };
@@ -5572,10 +5582,17 @@ var _default = (0, _vue.defineComponent)({
       tableMethods.recalculate(true);
     };
 
-    var handleTargetEnterEvent = function handleTargetEnterEvent() {
+    var handleTargetEnterEvent = function handleTargetEnterEvent(isClear) {
+      var $tooltip = refTooltip.value;
       clearTimeout(internalData.tooltipTimeout);
-      internalData.tooltipActive = true;
-      tableMethods.closeTooltip();
+
+      if (isClear) {
+        tableMethods.closeTooltip();
+      } else {
+        if ($tooltip) {
+          $tooltip.setActived(true);
+        }
+      }
     };
     /**
      * 处理显示 tooltip
@@ -5587,13 +5604,12 @@ var _default = (0, _vue.defineComponent)({
 
     var handleTooltip = function handleTooltip(evnt, cell, overflowElem, tipElem, params) {
       params.cell = cell;
-      var tooltipStore = internalData.tooltipStore;
+      var tooltipStore = reactData.tooltipStore;
       var tooltipOpts = computeTooltipOpts.value;
       var column = params.column,
           row = params.row;
       var showAll = tooltipOpts.showAll,
           contentMethod = tooltipOpts.contentMethod;
-      var $tooltip = refTooltip.value;
       var customContent = contentMethod ? contentMethod(params) : null;
       var useCustom = contentMethod && !_xeUtils.default.eqNull(customContent);
       var content = useCustom ? customContent : (column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim();
@@ -5603,12 +5619,16 @@ var _default = (0, _vue.defineComponent)({
         Object.assign(tooltipStore, {
           row: row,
           column: column,
-          visible: true
+          visible: true,
+          currOpts: null
         });
+        (0, _vue.nextTick)(function () {
+          var $tooltip = refTooltip.value;
 
-        if ($tooltip) {
-          $tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, (0, _utils.formatText)(content));
-        }
+          if ($tooltip) {
+            $tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, (0, _utils.formatText)(content));
+          }
+        });
       }
 
       return (0, _vue.nextTick)();
@@ -5875,7 +5895,7 @@ var _default = (0, _vue.defineComponent)({
           var columnWidthStorage_1;
 
           if (!id) {
-            (0, _utils.errLog)('vxe.error.reqProp', ['id']);
+            (0, _log.errLog)('vxe.error.reqProp', ['id']);
             return;
           }
 
@@ -5912,7 +5932,7 @@ var _default = (0, _vue.defineComponent)({
           var colShows_1 = [];
 
           if (!id) {
-            (0, _utils.errLog)('vxe.error.reqProp', ['id']);
+            (0, _log.errLog)('vxe.error.reqProp', ['id']);
             return;
           }
 
@@ -6233,18 +6253,23 @@ var _default = (0, _vue.defineComponent)({
       },
       triggerHeaderHelpEvent: function triggerHeaderHelpEvent(evnt, params) {
         var column = params.column;
-        var titleHelp = column.titleHelp;
+        var titlePrefix = column.titlePrefix || column.titleHelp;
 
-        if (titleHelp.content || titleHelp.message) {
-          var tooltipStore = internalData.tooltipStore;
-          var $tooltip = refTooltip.value;
-          var content = (0, _utils.getFuncText)(titleHelp.content || titleHelp.message);
-          handleTargetEnterEvent();
+        if (titlePrefix.content || titlePrefix.message) {
+          var tooltipStore = reactData.tooltipStore;
+          var content_1 = (0, _utils.getFuncText)(titlePrefix.content || titlePrefix.message);
+          handleTargetEnterEvent(true);
           tooltipStore.visible = true;
+          tooltipStore.currOpts = __assign(__assign({}, titlePrefix), {
+            content: null
+          });
+          (0, _vue.nextTick)(function () {
+            var $tooltip = refTooltip.value;
 
-          if ($tooltip) {
-            $tooltip.open(evnt.currentTarget, content);
-          }
+            if ($tooltip) {
+              $tooltip.open(evnt.currentTarget, content_1);
+            }
+          });
         }
       },
 
@@ -6252,10 +6277,10 @@ var _default = (0, _vue.defineComponent)({
        * 触发表头 tooltip 事件
        */
       triggerHeaderTooltipEvent: function triggerHeaderTooltipEvent(evnt, params) {
-        var tooltipStore = internalData.tooltipStore;
+        var tooltipStore = reactData.tooltipStore;
         var column = params.column;
         var titleElem = evnt.currentTarget;
-        handleTargetEnterEvent();
+        handleTargetEnterEvent(true);
 
         if (tooltipStore.column !== column || !tooltipStore.visible) {
           handleTooltip(evnt, titleElem, titleElem, null, params);
@@ -6268,13 +6293,13 @@ var _default = (0, _vue.defineComponent)({
       triggerBodyTooltipEvent: function triggerBodyTooltipEvent(evnt, params) {
         var editConfig = props.editConfig;
         var editStore = reactData.editStore;
-        var tooltipStore = internalData.tooltipStore;
+        var tooltipStore = reactData.tooltipStore;
         var editOpts = computeEditOpts.value;
         var actived = editStore.actived;
         var row = params.row,
             column = params.column;
         var cell = evnt.currentTarget;
-        handleTargetEnterEvent();
+        handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row !== row);
 
         if ((0, _utils.isEnableConf)(editConfig)) {
           if (editOpts.mode === 'row' && actived.row === row || actived.row === row && actived.column === column) {
@@ -6305,9 +6330,9 @@ var _default = (0, _vue.defineComponent)({
        */
       triggerFooterTooltipEvent: function triggerFooterTooltipEvent(evnt, params) {
         var column = params.column;
-        var tooltipStore = internalData.tooltipStore;
+        var tooltipStore = reactData.tooltipStore;
         var cell = evnt.currentTarget;
-        handleTargetEnterEvent();
+        handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row);
 
         if (tooltipStore.column !== column || !tooltipStore.visible) {
           handleTooltip(evnt, cell, cell.querySelector('.vxe-cell--item') || cell.children[0], null, params);
@@ -6315,13 +6340,17 @@ var _default = (0, _vue.defineComponent)({
       },
       handleTargetLeaveEvent: function handleTargetLeaveEvent() {
         var tooltipOpts = computeTooltipOpts.value;
-        internalData.tooltipActive = false;
+        var $tooltip = refTooltip.value;
+
+        if ($tooltip) {
+          $tooltip.setActived(false);
+        }
 
         if (tooltipOpts.enterable) {
           internalData.tooltipTimeout = setTimeout(function () {
-            var $tooltip = refTooltip.value;
+            $tooltip = refTooltip.value;
 
-            if ($tooltip && !$tooltip.reactData.isHover) {
+            if ($tooltip && !$tooltip.isActived()) {
               tableMethods.closeTooltip();
             }
           }, tooltipOpts.leaveDelay);
@@ -6989,12 +7018,12 @@ var _default = (0, _vue.defineComponent)({
     if (process.env.NODE_ENV === 'development') {
       'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(function (name) {
         $xetable[name] = function () {
-          (0, _utils.errLog)('vxe.error.reqModule', ['Export']);
+          (0, _log.errLog)('vxe.error.reqModule', ['Export']);
         };
       });
       'clearValidate,fullValidate,validate'.split(',').forEach(function (name) {
         $xetable[name] = function () {
-          (0, _utils.errLog)('vxe.error.reqModule', ['Validator']);
+          (0, _log.errLog)('vxe.error.reqModule', ['Validator']);
         };
       });
     }
@@ -7092,7 +7121,7 @@ var _default = (0, _vue.defineComponent)({
 
         if (process.env.NODE_ENV === 'development') {
           if ((scrollXLoad || scrollYLoad) && expandColumn) {
-            (0, _utils.warnLog)('vxe.error.scrollErrProp', ['column.type=expand']);
+            (0, _log.warnLog)('vxe.error.scrollErrProp', ['column.type=expand']);
           }
         }
 
@@ -7218,26 +7247,36 @@ var _default = (0, _vue.defineComponent)({
         var radioOpts = computeRadioOpts.value;
         var checkboxOpts = computeCheckboxOpts.value;
         var expandOpts = computeExpandOpts.value;
+        var rowOpts = computeRowOpts.value;
 
         if (process.env.NODE_ENV === 'development') {
-          if (!props.rowId && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
-            (0, _utils.warnLog)('vxe.error.reqProp', ['row-id']);
+          // if (props.rowId) {
+          //   warnLog('vxe.error.delProp', ['rowId', 'row-config.keyField'])
+          // }
+          // if (props.rowKey) {
+          //   warnLog('vxe.error.delProp', ['rowId', 'row-config.useKey'])
+          // }
+          // if (props.columnKey) {
+          //   warnLog('vxe.error.delProp', ['rowId', 'column-config.useKey'])
+          // }
+          if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
+            (0, _log.warnLog)('vxe.error.reqProp', ['row-config.keyField']);
           }
 
           if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
-            (0, _utils.warnLog)('vxe.error.reqProp', ['keep-source']);
+            (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
           }
 
-          if (treeConfig && treeOpts.line && (!props.rowKey || !showOverflow)) {
-            (0, _utils.warnLog)('vxe.error.reqProp', ['row-key | show-overflow']);
+          if (treeConfig && treeOpts.line && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
+            (0, _log.warnLog)('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
           }
 
           if (treeConfig && props.stripe) {
-            (0, _utils.warnLog)('vxe.error.noTree', ['stripe']);
+            (0, _log.warnLog)('vxe.error.noTree', ['stripe']);
           }
 
           if (props.showFooter && !props.footerMethod) {
-            (0, _utils.warnLog)('vxe.error.reqProp', ['footer-method']);
+            (0, _log.warnLog)('vxe.error.reqProp', ['footer-method']);
           } // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
 
 
@@ -7247,13 +7286,13 @@ var _default = (0, _vue.defineComponent)({
           var importOpts = computeImportOpts.value;
 
           if (importConfig && importOpts.types && !importOpts.importMethod && !_xeUtils.default.includeArrays(_vXETable.VXETable.config.importTypes, importOpts.types)) {
-            (0, _utils.warnLog)('vxe.error.errProp', ["export-config.types=" + importOpts.types.join(','), importOpts.types.filter(function (type) {
+            (0, _log.warnLog)('vxe.error.errProp', ["export-config.types=" + importOpts.types.join(','), importOpts.types.filter(function (type) {
               return _xeUtils.default.includes(_vXETable.VXETable.config.importTypes, type);
             }).join(',') || _vXETable.VXETable.config.importTypes.join(',')]);
           }
 
           if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !_xeUtils.default.includeArrays(_vXETable.VXETable.config.exportTypes, exportOpts.types)) {
-            (0, _utils.warnLog)('vxe.error.errProp', ["export-config.types=" + exportOpts.types.join(','), exportOpts.types.filter(function (type) {
+            (0, _log.warnLog)('vxe.error.errProp', ["export-config.types=" + exportOpts.types.join(','), exportOpts.types.filter(function (type) {
               return _xeUtils.default.includes(_vXETable.VXETable.config.exportTypes, type);
             }).join(',') || _vXETable.VXETable.config.exportTypes.join(',')]);
           }
@@ -7262,64 +7301,64 @@ var _default = (0, _vue.defineComponent)({
         if (process.env.NODE_ENV === 'development') {
           var customOpts = computeCustomOpts.value;
           var mouseOpts = computeMouseOpts.value;
-          var rowOpts = computeRowOpts.value;
+          var rowOpts_1 = computeRowOpts.value;
 
           if (!props.id && props.customConfig && (customOpts.storage === true || customOpts.storage && customOpts.storage.resizable || customOpts.storage && customOpts.storage.visible)) {
-            (0, _utils.errLog)('vxe.error.reqProp', ['id']);
+            (0, _log.errLog)('vxe.error.reqProp', ['id']);
           }
 
           if (props.treeConfig && checkboxOpts.range) {
-            (0, _utils.errLog)('vxe.error.noTree', ['checkbox-config.range']);
+            (0, _log.errLog)('vxe.error.noTree', ['checkbox-config.range']);
           }
 
-          if (rowOpts.height && !props.showOverflow) {
-            (0, _utils.warnLog)('vxe.error.notProp', ['table.show-overflow']);
+          if (rowOpts_1.height && !props.showOverflow) {
+            (0, _log.warnLog)('vxe.error.notProp', ['table.show-overflow']);
           }
 
           if (!$xetable.handleUpdateCellAreas) {
             if (props.clipConfig) {
-              (0, _utils.warnLog)('vxe.error.notProp', ['clip-config']);
+              (0, _log.warnLog)('vxe.error.notProp', ['clip-config']);
             }
 
             if (props.fnrConfig) {
-              (0, _utils.warnLog)('vxe.error.notProp', ['fnr-config']);
+              (0, _log.warnLog)('vxe.error.notProp', ['fnr-config']);
             }
 
             if (mouseOpts.area) {
-              (0, _utils.errLog)('vxe.error.notProp', ['mouse-config.area']);
+              (0, _log.errLog)('vxe.error.notProp', ['mouse-config.area']);
               return;
             }
           }
 
           if (mouseOpts.area && mouseOpts.selected) {
-            (0, _utils.warnLog)('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
+            (0, _log.warnLog)('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
           }
 
           if (mouseOpts.area && checkboxOpts.range) {
-            (0, _utils.warnLog)('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range']);
+            (0, _log.warnLog)('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range']);
           }
 
           if (props.treeConfig && mouseOpts.area) {
-            (0, _utils.errLog)('vxe.error.noTree', ['mouse-config.area']);
+            (0, _log.errLog)('vxe.error.noTree', ['mouse-config.area']);
           }
         } // 检查是否有安装需要的模块
 
 
         if (process.env.NODE_ENV === 'development') {
           if (props.editConfig && !$xetable.insert) {
-            (0, _utils.errLog)('vxe.error.reqModule', ['Edit']);
+            (0, _log.errLog)('vxe.error.reqModule', ['Edit']);
           }
 
           if (props.editRules && !$xetable.validate) {
-            (0, _utils.errLog)('vxe.error.reqModule', ['Validator']);
+            (0, _log.errLog)('vxe.error.reqModule', ['Validator']);
           }
 
           if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xetable.triggerCellMousedownEvent) {
-            (0, _utils.errLog)('vxe.error.reqModule', ['Keyboard']);
+            (0, _log.errLog)('vxe.error.reqModule', ['Keyboard']);
           }
 
           if ((props.printConfig || props.importConfig || props.exportConfig) && !$xetable.exportData) {
-            (0, _utils.errLog)('vxe.error.reqModule', ['Export']);
+            (0, _log.errLog)('vxe.error.reqModule', ['Export']);
           }
         }
 
@@ -7456,7 +7495,7 @@ var _default = (0, _vue.defineComponent)({
           filterStore = reactData.filterStore;
       var leftList = columnStore.leftList,
           rightList = columnStore.rightList;
-      var tooltipOpts = computeTooltipOpts.value;
+      var tipConfig = computeTipConfig.value;
       var treeOpts = computeTreeOpts.value;
       var rowOpts = computeRowOpts.value;
       var columnOpts = computeColumnOpts.value;
@@ -7598,7 +7637,7 @@ var _default = (0, _vue.defineComponent)({
        */
       hasUseTooltip ? (0, _vue.h)((0, _vue.resolveComponent)('vxe-tooltip'), __assign({
         ref: refTooltip
-      }, tooltipOpts)) : (0, _vue.createCommentVNode)()]);
+      }, tipConfig)) : (0, _vue.createCommentVNode)()]);
     };
 
     $xetable.renderVN = renderVN;