vxe-table 3.5.0-beta.0 → 3.5.0-beta.3

package/lib/index.umd.js

@@ -8430,7 +8430,7 @@ var iconPrefix = 'vxe-icon--';
     //   name: ''
     // },
     // rowConfig: {
-    //   keyField: '_X_ID' // 行数据的唯一主键字段名
+    //   keyField: '_X_ROW_KEY' // 行数据的唯一主键字段名
     // },
     radioConfig: {
       // trigger: 'default'
@@ -8440,10 +8440,9 @@ var iconPrefix = 'vxe-icon--';
       // trigger: 'default',
       strict: true
     },
-    // tooltipConfig: {
-    //   theme: 'dark',
-    //   enterable: false
-    // },
+    tooltipConfig: {
+      enterable: true
+    },
     validConfig: {
       showMessage: true,
       message: 'default'
@@ -8472,7 +8471,7 @@ var iconPrefix = 'vxe-icon--';
       parentField: 'parentId',
       children: 'children',
       hasChild: 'hasChild',
-      mapChildren: '_X_CHILD',
+      mapChildren: '_X_ROW_CHILD',
       indent: 20,
       showIcon: true
     },
@@ -8639,12 +8638,15 @@ var iconPrefix = 'vxe-icon--';
   },
   form: {
     // preventSubmit: false,
+    // size: null,
+    // colon: false,
     validConfig: {
       showMessage: true,
       autoPos: true
     },
-    // size: null,
-    // colon: false,
+    tooltipConfig: {
+      enterable: true
+    },
     titleAsterisk: true
   },
   input: {
@@ -8669,6 +8671,9 @@ var iconPrefix = 'vxe-icon--';
   select: {
     // size: null,
     // transfer: false,
+    // optionConfig: {
+    //   keyField: '_X_OPTION_KEY'
+    // },
     multiCharOverflow: 8
   },
   toolbar: {// size: null,
@@ -8751,7 +8756,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.0-beta.0", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.0-beta.3", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -8957,10 +8962,6 @@ function eqEmptyValue(cellValue) {
 }
 function getFuncText(content) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(content) ? content() : conf.translate ? conf.translate(content) : content;
-} // 行主键 key
-
-function getRowkey($xetable) {
-  return $xetable.rowOpts.keyField || $xetable.rowId || '_X_ID';
 } // 获取所有的列，排除分组
 
 function getColumnList(columns) {
@@ -8978,12 +8979,6 @@ var UtilTools = {
   getLastZIndex: function getLastZIndex() {
     return lastZindex;
   },
-  getRowkey: getRowkey,
-  // 行主键 value
-  getRowid: function getRowid($xetable, row) {
-    var rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, getRowkey($xetable));
-    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(rowid) ? '' : encodeURIComponent(rowid);
-  },
   getColumnList: getColumnList,
   getClass: function getClass(property, params) {
     return property ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(property) ? property(params) : property : '';
@@ -10030,7 +10025,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.0-beta.0",
+  version: "3.5.0-beta.3",
   reg: reg,
   use: use,
   setup: setup,
@@ -10056,15 +10051,70 @@ var Icon = {
   install: function install() {}
 };
 /* harmony default export */ var packages_icon = (Icon);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.keys.js
+var es_object_keys = __webpack_require__("b64b");
+
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
+var es_array_filter = __webpack_require__("4de4");
+
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.get-own-property-descriptor.js
+var es_object_get_own_property_descriptor = __webpack_require__("e439");
+
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.get-own-property-descriptors.js
+var es_object_get_own_property_descriptors = __webpack_require__("dbb4");
+
+// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
+
+
+
+
+
+
+
+
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+
+    if (enumerableOnly) {
+      symbols = symbols.filter(function (sym) {
+        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+      });
+    }
+
+    keys.push.apply(keys, symbols);
+  }
+
+  return keys;
+}
+
+function _objectSpread2(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i] != null ? arguments[i] : {};
+
+    if (i % 2) {
+      ownKeys(Object(source), true).forEach(function (key) {
+        _defineProperty(target, key, source[key]);
+      });
+    } else if (Object.getOwnPropertyDescriptors) {
+      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+      ownKeys(Object(source)).forEach(function (key) {
+        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+      });
+    }
+  }
+
+  return target;
+}
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
 var es_number_constructor = __webpack_require__("a9e3");
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.map.js
 var es_map = __webpack_require__("4ec9");
 
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
-var es_array_filter = __webpack_require__("4de4");
-
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
 var es_array_includes = __webpack_require__("caad");
 
@@ -10143,6 +10193,7 @@ var columnInfo_ColumnInfo = /*#__PURE__*/function () {
       exportMethod: _vm.exportMethod,
       footerExportMethod: _vm.footerExportMethod,
       titleHelp: _vm.titleHelp,
+      titlePrefix: _vm.titlePrefix,
       // 自定义参数
       params: _vm.params,
       // 渲染属性
@@ -10233,7 +10284,7 @@ var es_promise = __webpack_require__("e6cf");
 
 
 
-var dom_getRowid = utils.getRowid;
+var getRowid = utils.getRowid;
 var browse = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.browse();
 var reClsMap = {};
 
@@ -10348,7 +10399,7 @@ var DomTools = {
     var bodyElem = tableBody ? tableBody.$el : null;
 
     if (bodyElem) {
-      var trElem = bodyElem.querySelector("[rowid=\"".concat(dom_getRowid($xetable, row), "\"]"));
+      var trElem = bodyElem.querySelector("[rowid=\"".concat(getRowid($xetable, row), "\"]"));
 
       if (trElem) {
         var bodyHeight = bodyElem.clientHeight;
@@ -10551,6 +10602,15 @@ function restoreScrollListener(scrollElem) {
   if (scrollElem && scrollElem._onscroll) {
     scrollElem.onscroll = scrollElem._onscroll;
   }
+} // 行主键 key
+
+function getRowkey($xetable) {
+  return $xetable.rowOpts.keyField || $xetable.rowId || '_X_ROW_KEY';
+} // 行主键 value
+
+function util_getRowid($xetable, row) {
+  var rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, getRowkey($xetable));
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(rowid) ? '' : encodeURIComponent(rowid);
 }
 
 function getPaddingLeftRightSize(elem) {
@@ -10802,7 +10862,7 @@ function renderLine(h, _vm, $xetable, params) {
       fullAllDataRowIdData = $xetable.fullAllDataRowIdData;
   var slots = column.slots,
       treeNode = column.treeNode;
-  var rowid = utils.getRowid($xetable, row);
+  var rowid = util_getRowid($xetable, row);
   var rest = fullAllDataRowIdData[rowid];
   var rLevel = 0;
   var rIndex = 0;
@@ -11150,7 +11210,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
       };
     }
 
-    var rowid = utils.getRowid($xetable, row);
+    var rowid = util_getRowid($xetable, row);
     var rest = fullAllDataRowIdData[rowid];
     var rowLevel = rest ? rest.level : 0;
     var seq = rest ? rest.seq : -1;
@@ -11907,61 +11967,6 @@ if (browse.isDoc) {
     trailing: false
   }), false);
 }
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.keys.js
-var es_object_keys = __webpack_require__("b64b");
-
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.get-own-property-descriptor.js
-var es_object_get_own_property_descriptor = __webpack_require__("e439");
-
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.get-own-property-descriptors.js
-var es_object_get_own_property_descriptors = __webpack_require__("dbb4");
-
-// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
-
-
-
-
-
-
-
-
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-
-    if (enumerableOnly) {
-      symbols = symbols.filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-      });
-    }
-
-    keys.push.apply(keys, symbols);
-  }
-
-  return keys;
-}
-
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-
-    if (i % 2) {
-      ownKeys(Object(source), true).forEach(function (key) {
-        _defineProperty(target, key, source[key]);
-      });
-    } else if (Object.getOwnPropertyDescriptors) {
-      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-      ownKeys(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
-  }
-
-  return target;
-}
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.trim.js
 var es_string_trim = __webpack_require__("498a");
 
@@ -11983,9 +11988,9 @@ var es_array_sort = __webpack_require__("4e82");
 function renderHelpIcon(h, params) {
   var $table = params.$table,
       column = params.column;
-  var titleHelp = column.titleHelp;
-  return titleHelp ? [h('i', {
-    class: ['vxe-cell-help-icon', titleHelp.icon || conf.icon.TABLE_HELP],
+  var titlePrefix = column.titlePrefix || column.titleHelp;
+  return titlePrefix ? [h('i', {
+    class: ['vxe-cell-help-icon', titlePrefix.icon || conf.icon.TABLE_HELP],
     on: {
       mouseenter: function mouseenter(evnt) {
         $table.triggerHeaderHelpEvent(evnt, params);
@@ -12927,9 +12932,7 @@ var Cell = {
 
 
 
-var methods_getRowid = utils.getRowid,
-    methods_getRowkey = utils.getRowkey,
-    methods_setCellValue = utils.setCellValue,
+var methods_setCellValue = utils.setCellValue,
     hasChildrenList = utils.hasChildrenList,
     methods_getColumnList = utils.getColumnList;
 var methods_calcHeight = dom.calcHeight,
@@ -13364,7 +13367,7 @@ var Methods = {
 
     var tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
     tableData.forEach(function (row, $index) {
-      var rowid = methods_getRowid(_this3, row);
+      var rowid = util_getRowid(_this3, row);
       var rest = fullDataRowIdData[rowid];
 
       if (rest) {
@@ -13641,11 +13644,11 @@ var Methods = {
         tableFullTreeData = this.tableFullTreeData;
     var fullDataRowIdData = this.fullDataRowIdData,
         fullAllDataRowIdData = this.fullAllDataRowIdData;
-    var rowkey = methods_getRowkey(this);
+    var rowkey = getRowkey(this);
     var isLazy = treeConfig && treeOpts.lazy;
 
     var handleCache = function handleCache(row, index, items, path, parent, nodes) {
-      var rowid = methods_getRowid(_this10, row);
+      var rowid = util_getRowid(_this10, row);
       var seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
       var level = nodes ? nodes.length - 1 : 0;
 
@@ -13706,13 +13709,13 @@ var Methods = {
     var transform = treeOpts.transform,
         children = treeOpts.children,
         mapChildren = treeOpts.mapChildren;
-    var rest = fullAllDataRowIdData[methods_getRowid(this, row)];
+    var rest = fullAllDataRowIdData[util_getRowid(this, row)];
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
       if (keepSource) {
-        var rowid = methods_getRowid(_this11, row);
+        var rowid = util_getRowid(_this11, row);
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableSourceData, function (item) {
-          return rowid === methods_getRowid(_this11, item);
+          return rowid === util_getRowid(_this11, item);
         }, treeOpts);
 
         if (matchObj) {
@@ -13721,7 +13724,7 @@ var Methods = {
       }
 
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
-        var rowid = methods_getRowid(_this11, childRow);
+        var rowid = util_getRowid(_this11, childRow);
         var rest = {
           row: childRow,
           rowid: rowid,
@@ -13900,7 +13903,7 @@ var Methods = {
     var fullDataRowIdData = this.fullDataRowIdData;
 
     if (row) {
-      var rowid = methods_getRowid(this, row);
+      var rowid = util_getRowid(this, row);
       var rest = fullDataRowIdData[rowid];
 
       if (rest) {
@@ -14001,7 +14004,7 @@ var Methods = {
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts,
         expandOpts = this.expandOpts;
-    var rowkey = methods_getRowkey(this);
+    var rowkey = getRowkey(this);
     this.tableFullColumn.forEach(function (column) {
       var property = column.property,
           editRender = column.editRender;
@@ -14213,7 +14216,7 @@ var Methods = {
 
     if (keepSource) {
       var oRow, property;
-      var rowid = methods_getRowid(this, row); // 新增的数据不需要检测
+      var rowid = util_getRowid(this, row); // 新增的数据不需要检测
 
       if (!fullDataRowIdData[rowid]) {
         return false;
@@ -14222,7 +14225,7 @@ var Methods = {
       if (treeConfig) {
         var children = treeOpts.children;
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableSourceData, function (item) {
-          return rowid === methods_getRowid(_this16, item);
+          return rowid === util_getRowid(_this16, item);
         }, treeOpts);
         row = Object.assign({}, row, _defineProperty({}, children, null));
 
@@ -14612,7 +14615,7 @@ var Methods = {
 
     if (treeConfig) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterTreeFullData, function (row, index, items, path) {
-        var rowid = methods_getRowid(_this18, row);
+        var rowid = util_getRowid(_this18, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = path.map(function (num, i) {
           return i % 2 === 0 ? Number(num) + 1 : '.';
@@ -14641,7 +14644,7 @@ var Methods = {
       });
     } else {
       afterFullData.forEach(function (row, index) {
-        var rowid = methods_getRowid(_this18, row);
+        var rowid = util_getRowid(_this18, row);
         var allrest = fullAllDataRowIdData[rowid];
         var seq = index + 1;
 
@@ -14680,7 +14683,7 @@ var Methods = {
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(rowOrRowid)) {
         rowid = rowOrRowid;
       } else {
-        rowid = methods_getRowid(this, rowOrRowid);
+        rowid = util_getRowid(this, rowOrRowid);
       }
 
       if (rowid) {
@@ -15561,14 +15564,7 @@ var Methods = {
               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;
@@ -15596,14 +15592,7 @@ var Methods = {
               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;
@@ -15897,6 +15886,8 @@ var Methods = {
 
     if (isEsc) {
       this.preventEvent(evnt, 'event.keydown', null, function () {
+        _this27.emitEvent('keydown-start', {}, evnt);
+
         if (keyboardConfig && mouseConfig && mouseOpts.area && _this27.handleKeyboardEvent) {
           _this27.handleKeyboardEvent(evnt);
         } else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
@@ -15924,6 +15915,8 @@ var Methods = {
         }
 
         _this27.emitEvent('keydown', {}, evnt);
+
+        _this27.emitEvent('keydown-end', {}, evnt);
       });
     }
   },
@@ -16246,21 +16239,9 @@ var Methods = {
     this.updateCellAreas();
     this.recalculate(true);
   },
-  handleTooltipLeaveMethod: function handleTooltipLeaveMethod() {
-    var _this29 = this;
-
-    var tooltipOpts = this.tooltipOpts;
-    setTimeout(function () {
-      if (!_this29.tooltipActive) {
-        _this29.closeTooltip();
-      }
-    }, tooltipOpts.leaveDelay);
-    return false;
-  },
   handleTargetEnterEvent: function handleTargetEnterEvent(isClear) {
     var $tooltip = this.$refs.tooltip;
     clearTimeout(this.tooltipTimeout);
-    this.tooltipActive = true;
 
     if (isClear) {
       this.closeTooltip();
@@ -16271,11 +16252,10 @@ var Methods = {
     }
   },
   handleTargetLeaveEvent: function handleTargetLeaveEvent() {
-    var _this30 = this;
+    var _this29 = this;
 
     var tooltipOpts = this.tooltipOpts;
     var $tooltip = this.$refs.tooltip;
-    this.tooltipActive = false;
 
     if ($tooltip) {
       $tooltip.setActived(false);
@@ -16283,10 +16263,10 @@ var Methods = {
 
     if (tooltipOpts.enterable) {
       this.tooltipTimeout = setTimeout(function () {
-        $tooltip = _this30.$refs.tooltip;
+        $tooltip = _this29.$refs.tooltip;
 
         if ($tooltip && !$tooltip.isActived()) {
-          _this30.closeTooltip();
+          _this29.closeTooltip();
         }
       }, tooltipOpts.leaveDelay);
     } else {
@@ -16295,19 +16275,24 @@ var Methods = {
   },
   triggerHeaderHelpEvent: function triggerHeaderHelpEvent(evnt, params) {
     var column = params.column;
-    var titleHelp = column.titleHelp;
+    var titlePrefix = column.titlePrefix || column.titleHelp;
 
-    if (titleHelp.content || titleHelp.message) {
+    if (titlePrefix.content || titlePrefix.message) {
       var $refs = this.$refs,
           tooltipStore = this.tooltipStore;
-      var $tooltip = $refs.tooltip;
-      var content = getFuncText(titleHelp.content || titleHelp.message);
+      var content = getFuncText(titlePrefix.content || titlePrefix.message);
       this.handleTargetEnterEvent(true);
       tooltipStore.visible = true;
+      tooltipStore.currOpts = _objectSpread2(_objectSpread2({}, titlePrefix), {}, {
+        content: null
+      });
+      this.$nextTick(function () {
+        var $tooltip = $refs.tooltip;
 
-      if ($tooltip) {
-        $tooltip.open(evnt.currentTarget, content);
-      }
+        if ($tooltip) {
+          $tooltip.open(evnt.currentTarget, content);
+        }
+      });
     }
   },
 
@@ -16393,7 +16378,6 @@ var Methods = {
     var showAll = tooltipOpts.showAll,
         enabled = tooltipOpts.enabled,
         contentMethod = tooltipOpts.contentMethod;
-    var tooltip = $refs.tooltip;
     var customContent = contentMethod ? contentMethod(params) : null;
     var useCustom = contentMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(customContent);
     var content = useCustom ? customContent : (column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim();
@@ -16403,12 +16387,16 @@ var Methods = {
       Object.assign(tooltipStore, {
         row: row,
         column: column,
-        visible: true
+        visible: true,
+        currOpts: null
       });
+      this.$nextTick(function () {
+        var $tooltip = $refs.tooltip;
 
-      if (tooltip) {
-        tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, utils.formatText(content));
-      }
+        if ($tooltip) {
+          $tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, utils.formatText(content));
+        }
+      });
     }
 
     return this.$nextTick();
@@ -16438,7 +16426,8 @@ var Methods = {
         row: null,
         column: null,
         content: null,
-        visible: false
+        visible: false,
+        currOpts: null
       });
 
       if (tooltip) {
@@ -16516,14 +16505,14 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setCheckboxRow: function setCheckboxRow(rows, value) {
-    var _this31 = this;
+    var _this30 = this;
 
     if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(rows)) {
       rows = [rows];
     }
 
     rows.forEach(function (row) {
-      return _this31.handleSelectRow({
+      return _this30.handleSelectRow({
         row: row
       }, !!value);
     });
@@ -16547,7 +16536,7 @@ var Methods = {
    * value 选中true 不选false 半选-1
    */
   handleSelectRow: function handleSelectRow(_ref6, value) {
-    var _this32 = this;
+    var _this31 = this;
 
     var row = _ref6.row;
     var selection = this.selection,
@@ -16579,7 +16568,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this32.handleCheckboxReserveRow(row, value);
+              _this31.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -16651,7 +16640,7 @@ var Methods = {
                 return half === item;
               });
 
-              _this32.handleCheckboxReserveRow(row, value);
+              _this31.handleCheckboxReserveRow(row, value);
             }
           }, treeOpts);
         } // 如果存在父节点，更新父节点状态
@@ -16755,7 +16744,7 @@ var Methods = {
    * @param {Boolean} value 是否选中
    */
   setAllCheckboxRow: function setAllCheckboxRow(value) {
-    var _this33 = this;
+    var _this32 = this;
 
     var afterFullData = this.afterFullData,
         treeConfig = this.treeConfig,
@@ -16868,11 +16857,11 @@ var Methods = {
       if (reserve) {
         if (value) {
           selectRows.forEach(function (row) {
-            checkboxReserveRowMap[methods_getRowid(_this33, row)] = row;
+            checkboxReserveRowMap[util_getRowid(_this32, row)] = row;
           });
         } else {
           afterFullData.forEach(function (row) {
-            return _this33.handleCheckboxReserveRow(row, false);
+            return _this32.handleCheckboxReserveRow(row, false);
           });
         }
       }
@@ -17000,7 +16989,7 @@ var Methods = {
 
 
     if (radioOpts.reserve && radioReserveRow) {
-      var rowid = methods_getRowid(this, radioReserveRow);
+      var rowid = util_getRowid(this, radioReserveRow);
 
       if (fullDataRowIdData[rowid]) {
         this.setRadioRow(fullDataRowIdData[rowid].row);
@@ -17047,14 +17036,14 @@ var Methods = {
         treeOpts = this.treeOpts;
 
     if (radioOpts.reserve && radioReserveRow) {
-      var rowid = methods_getRowid(this, radioReserveRow);
+      var rowid = util_getRowid(this, radioReserveRow);
 
       if (isFull) {
         if (!fullDataRowIdData[rowid]) {
           return radioReserveRow;
         }
       } else {
-        var rowkey = methods_getRowkey(this);
+        var rowkey = getRowkey(this);
 
         if (treeConfig) {
           var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(afterFullData, function (row) {
@@ -17092,7 +17081,7 @@ var Methods = {
    * 获取复选框保留选中的行
    */
   getCheckboxReserveRecords: function getCheckboxReserveRecords(isFull) {
-    var _this34 = this;
+    var _this33 = this;
 
     var fullDataRowIdData = this.fullDataRowIdData,
         afterFullData = this.afterFullData,
@@ -17107,11 +17096,11 @@ var Methods = {
 
       if (treeConfig) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(afterFullData, function (row) {
-          afterFullIdMaps[methods_getRowid(_this34, row)] = 1;
+          afterFullIdMaps[util_getRowid(_this33, row)] = 1;
         }, treeOpts);
       } else {
         afterFullData.forEach(function (row) {
-          afterFullIdMaps[methods_getRowid(_this34, row)] = 1;
+          afterFullIdMaps[util_getRowid(_this33, row)] = 1;
         });
       }
 
@@ -17141,7 +17130,7 @@ var Methods = {
         checkboxOpts = this.checkboxOpts;
 
     if (checkboxOpts.reserve) {
-      var rowid = methods_getRowid(this, row);
+      var rowid = util_getRowid(this, row);
 
       if (checked) {
         checkboxReserveRowMap[rowid] = row;
@@ -17177,7 +17166,7 @@ var Methods = {
    * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
    */
   clearCheckboxRow: function clearCheckboxRow() {
-    var _this35 = this;
+    var _this34 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -17200,7 +17189,7 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this35.handleCheckboxReserveRow(row, false);
+        return _this34.handleCheckboxReserveRow(row, false);
       });
     }
 
@@ -17226,7 +17215,7 @@ var Methods = {
       }
 
       if (reserve) {
-        var rowkey = methods_getRowkey(this);
+        var rowkey = getRowkey(this);
         this.radioReserveRow = _defineProperty({}, rowkey, rowid);
       }
     }
@@ -17287,7 +17276,7 @@ var Methods = {
 
     if (rowOpts.isCurrent || this.highlightCurrentRow) {
       if ($el) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach($el.querySelectorAll("[rowid=\"".concat(methods_getRowid(this, row), "\"]")), function (elem) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach($el.querySelectorAll("[rowid=\"".concat(util_getRowid(this, row), "\"]")), function (elem) {
           return addClass(elem, 'row--current');
         });
       }
@@ -17360,7 +17349,7 @@ var Methods = {
         afterFullData = this.afterFullData;
 
     if (selectRow) {
-      var rowid = methods_getRowid(this, selectRow);
+      var rowid = util_getRowid(this, selectRow);
 
       if (isFull) {
         if (!fullDataRowIdData[rowid]) {
@@ -17368,7 +17357,7 @@ var Methods = {
         }
       } else {
         if (treeConfig) {
-          var rowkey = methods_getRowkey(this);
+          var rowkey = getRowkey(this);
           var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(afterFullData, function (row) {
             return rowid === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, rowkey);
           }, treeOpts);
@@ -17396,7 +17385,7 @@ var Methods = {
   },
   setHoverRow: function setHoverRow(row) {
     var $el = this.$el;
-    var rowid = methods_getRowid(this, row);
+    var rowid = util_getRowid(this, row);
     this.clearHoverRow();
 
     if ($el) {
@@ -17491,13 +17480,13 @@ var Methods = {
    * 如果存在规则，则校验
    */
   handleChangeCell: function handleChangeCell(evnt, params) {
-    var _this36 = this;
+    var _this35 = this;
 
     this.checkValidate('blur').catch(function (e) {
       return e;
     }).then(function () {
-      _this36.handleActived(params, evnt).then(function () {
-        return _this36.checkValidate('change');
+      _this35.handleActived(params, evnt).then(function () {
+        return _this35.checkValidate('change');
       }).catch(function (e) {
         return e;
       });
@@ -17600,7 +17589,7 @@ var Methods = {
    * 如果是双击模式，则激活为编辑状态
    */
   triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
-    var _this37 = this;
+    var _this36 = this;
 
     var editStore = this.editStore,
         editConfig = this.editConfig,
@@ -17615,15 +17604,15 @@ var Methods = {
           this.checkValidate('blur').catch(function (e) {
             return e;
           }).then(function () {
-            _this37.handleActived(params, evnt).then(function () {
-              return _this37.checkValidate('change');
+            _this36.handleActived(params, evnt).then(function () {
+              return _this36.checkValidate('change');
             }).catch(function (e) {
               return e;
             });
           });
         } else if (editOpts.mode === 'cell') {
           this.handleActived(params, evnt).then(function () {
-            return _this37.checkValidate('change');
+            return _this36.checkValidate('change');
           }).catch(function (e) {
             return e;
           });
@@ -17634,7 +17623,7 @@ var Methods = {
     this.emitEvent('cell-dblclick', params, evnt);
   },
   handleDefaultSort: function handleDefaultSort() {
-    var _this38 = this;
+    var _this37 = this;
 
     var sortConfig = this.sortConfig,
         sortOpts = this.sortOpts;
@@ -17651,7 +17640,7 @@ var Methods = {
               order = item.order;
 
           if (field && order) {
-            var column = _this38.getColumnByField(field);
+            var column = _this37.getColumnByField(field);
 
             if (column && column.sortable) {
               column.order = order;
@@ -17694,7 +17683,7 @@ var Methods = {
     }
   },
   sort: function sort(sortConfs, sortOrder) {
-    var _this39 = this;
+    var _this38 = this;
 
     var sortOpts = this.sortOpts;
     var multiple = sortOpts.multiple,
@@ -17727,7 +17716,7 @@ var Methods = {
         var column = field;
 
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(field)) {
-          column = _this39.getColumnByField(field);
+          column = _this38.getColumnByField(field);
         }
 
         if (column && (column.sortable || column.remoteSort)) {
@@ -17736,7 +17725,7 @@ var Methods = {
           }
 
           if (orders.indexOf(order) === -1) {
-            order = getNextSortOrder(_this39, column);
+            order = getNextSortOrder(_this38, column);
           }
 
           if (column.order !== order) {
@@ -17886,7 +17875,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadRowExpand: function reloadRowExpand(row) {
-    var _this40 = this;
+    var _this39 = this;
 
     var expandOpts = this.expandOpts,
         expandLazyLoadeds = this.expandLazyLoadeds;
@@ -17894,7 +17883,7 @@ var Methods = {
 
     if (lazy && expandLazyLoadeds.indexOf(row) === -1) {
       this.clearRowExpandLoaded(row).then(function () {
-        return _this40.handleAsyncRowExpand(row);
+        return _this39.handleAsyncRowExpand(row);
       });
     }
 
@@ -17971,28 +17960,28 @@ var Methods = {
     return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
   },
   handleAsyncRowExpand: function handleAsyncRowExpand(row) {
-    var _this41 = this;
+    var _this40 = this;
 
     var rest = this.fullAllDataRowMap.get(row);
     return new Promise(function (resolve) {
-      _this41.expandLazyLoadeds.push(row);
+      _this40.expandLazyLoadeds.push(row);
 
-      _this41.expandOpts.loadMethod({
-        $table: _this41,
+      _this40.expandOpts.loadMethod({
+        $table: _this40,
         row: row,
-        rowIndex: _this41.getRowIndex(row),
-        $rowIndex: _this41.getVMRowIndex(row)
+        rowIndex: _this40.getRowIndex(row),
+        $rowIndex: _this40.getVMRowIndex(row)
       }).catch(function (e) {
         return e;
       }).then(function () {
         rest.expandLoaded = true;
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(_this41.expandLazyLoadeds, function (item) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(_this40.expandLazyLoadeds, function (item) {
           return item === row;
         });
 
-        _this41.rowExpandeds.push(row);
+        _this40.rowExpandeds.push(row);
 
-        resolve(_this41.$nextTick().then(_this41.recalculate));
+        resolve(_this40.$nextTick().then(_this40.recalculate));
       });
     });
   },
@@ -18005,7 +17994,7 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand: function setRowExpand(rows, expanded) {
-    var _this42 = this;
+    var _this41 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         expandLazyLoadeds = this.expandLazyLoadeds,
@@ -18038,8 +18027,8 @@ var Methods = {
           columnIndex: columnIndex,
           $columnIndex: $columnIndex,
           row: row,
-          rowIndex: _this42.getRowIndex(row),
-          $rowIndex: _this42.getVMRowIndex(row)
+          rowIndex: _this41.getRowIndex(row),
+          $rowIndex: _this41.getVMRowIndex(row)
         });
       }) : rows;
 
@@ -18050,7 +18039,7 @@ var Methods = {
             var isLoad = lazy && !rest.expandLoaded && expandLazyLoadeds.indexOf(row) === -1;
 
             if (isLoad) {
-              lazyRests.push(_this42.handleAsyncRowExpand(row));
+              lazyRests.push(_this41.handleAsyncRowExpand(row));
             } else {
               rowExpandeds.push(row);
             }
@@ -18064,7 +18053,7 @@ var Methods = {
 
       if (reserve) {
         validRows.forEach(function (row) {
-          return _this42.handleRowExpandReserve(row, expanded);
+          return _this41.handleRowExpandReserve(row, expanded);
         });
       }
     }
@@ -18085,7 +18074,7 @@ var Methods = {
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand: function clearRowExpand() {
-    var _this43 = this;
+    var _this42 = this;
 
     var expandOpts = this.expandOpts,
         rowExpandeds = this.rowExpandeds,
@@ -18096,13 +18085,13 @@ var Methods = {
 
     if (reserve) {
       tableFullData.forEach(function (row) {
-        return _this43.handleRowExpandReserve(row, false);
+        return _this42.handleRowExpandReserve(row, false);
       });
     }
 
     return this.$nextTick().then(function () {
       if (isExists) {
-        _this43.recalculate();
+        _this42.recalculate();
       }
     });
   },
@@ -18115,7 +18104,7 @@ var Methods = {
         expandOpts = this.expandOpts;
 
     if (expandOpts.reserve) {
-      var rowid = methods_getRowid(this, row);
+      var rowid = util_getRowid(this, row);
 
       if (expanded) {
         rowExpandedReserveRowMap[rowid] = row;
@@ -18181,7 +18170,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   reloadTreeExpand: function reloadTreeExpand(row) {
-    var _this44 = this;
+    var _this43 = this;
 
     var treeOpts = this.treeOpts,
         treeLazyLoadeds = this.treeLazyLoadeds;
@@ -18191,15 +18180,15 @@ var Methods = {
 
     if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(function () {
-        return _this44.handleAsyncTreeExpandChilds(row);
+        return _this43.handleAsyncTreeExpandChilds(row);
       }).then(function () {
         if (transform) {
-          _this44.handleVirtualTreeToList();
+          _this43.handleVirtualTreeToList();
 
-          return _this44.handleTableData();
+          return _this43.handleTableData();
         }
       }).then(function () {
-        return _this44.recalculate();
+        return _this43.recalculate();
       });
     }
 
@@ -18260,7 +18249,7 @@ var Methods = {
         this.setAllTreeExpand(true);
       } else if (expandRowKeys) {
         var defExpandeds = [];
-        var rowkey = methods_getRowkey(this);
+        var rowkey = getRowkey(this);
         expandRowKeys.forEach(function (rowid) {
           var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullData, function (item) {
             return rowid === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(item, rowkey);
@@ -18275,7 +18264,7 @@ var Methods = {
     }
   },
   handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
-    var _this45 = this;
+    var _this44 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         treeExpandeds = this.treeExpandeds,
@@ -18289,7 +18278,7 @@ var Methods = {
     return new Promise(function (resolve) {
       treeLazyLoadeds.push(row);
       loadMethod({
-        $table: _this45,
+        $table: _this44,
         row: row
       }).catch(function () {
         return [];
@@ -18304,29 +18293,29 @@ var Methods = {
         }
 
         if (childRecords) {
-          _this45.loadTreeChildren(row, childRecords).then(function (childRows) {
+          _this44.loadTreeChildren(row, childRecords).then(function (childRows) {
             if (childRows.length && treeExpandeds.indexOf(row) === -1) {
               treeExpandeds.push(row);
             } // 如果当前节点已选中，则展开后子节点也被选中
 
 
-            if (!checkStrictly && _this45.isCheckedByCheckboxRow(row)) {
-              _this45.setCheckboxRow(childRows, true);
+            if (!checkStrictly && _this44.isCheckedByCheckboxRow(row)) {
+              _this44.setCheckboxRow(childRows, true);
             }
 
-            _this45.$nextTick().then(function () {
+            _this44.$nextTick().then(function () {
               if (transform) {
-                return _this45.handleTableData();
+                return _this44.handleTableData();
               }
             }).then(function () {
-              return _this45.recalculate();
+              return _this44.recalculate();
             }).then(function () {
               return resolve();
             });
           });
         } else {
-          _this45.$nextTick().then(function () {
-            return _this45.recalculate();
+          _this44.$nextTick().then(function () {
+            return _this44.recalculate();
           }).then(function () {
             return resolve();
           });
@@ -18362,7 +18351,7 @@ var Methods = {
    * @returns
    */
   handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
-    var _this46 = this;
+    var _this45 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
         tableFullData = this.tableFullData,
@@ -18410,7 +18399,7 @@ var Methods = {
           var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1; // 是否使用懒加载
 
           if (isLoad) {
-            result.push(_this46.handleAsyncTreeExpandChilds(row));
+            result.push(_this45.handleAsyncTreeExpandChilds(row));
           } else {
             if (row[children] && row[children].length) {
               treeExpandeds.push(row);
@@ -18426,7 +18415,7 @@ var Methods = {
 
     if (reserve) {
       validRows.forEach(function (row) {
-        return _this46.handleTreeExpandReserve(row, expanded);
+        return _this45.handleTreeExpandReserve(row, expanded);
       });
     }
 
@@ -18440,14 +18429,14 @@ var Methods = {
    * @returns
    */
   handleVirtualTreeExpand: function handleVirtualTreeExpand(rows, expanded) {
-    var _this47 = this;
+    var _this46 = this;
 
     return this.handleBaseTreeExpand(rows, expanded).then(function () {
-      _this47.handleVirtualTreeToList();
+      _this46.handleVirtualTreeToList();
 
-      return _this47.handleTableData();
+      return _this46.handleTableData();
     }).then(function () {
-      return _this47.recalculate();
+      return _this46.recalculate();
     });
   },
 
@@ -18492,7 +18481,7 @@ var Methods = {
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand: function clearTreeExpand() {
-    var _this48 = this;
+    var _this47 = this;
 
     var treeOpts = this.treeOpts,
         treeExpandeds = this.treeExpandeds,
@@ -18504,19 +18493,19 @@ var Methods = {
 
     if (reserve) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(tableFullData, function (row) {
-        return _this48.handleTreeExpandReserve(row, false);
+        return _this47.handleTreeExpandReserve(row, false);
       }, treeOpts);
     }
 
     return this.handleTableData().then(function () {
       if (transform) {
-        _this48.handleVirtualTreeToList();
+        _this47.handleVirtualTreeToList();
 
-        return _this48.handleTableData();
+        return _this47.handleTableData();
       }
     }).then(function () {
       if (isExists) {
-        _this48.recalculate();
+        _this47.recalculate();
       }
     });
   },
@@ -18529,7 +18518,7 @@ var Methods = {
         treeOpts = this.treeOpts;
 
     if (treeOpts.reserve) {
-      var rowid = methods_getRowid(this, row);
+      var rowid = util_getRowid(this, row);
 
       if (expanded) {
         treeExpandedReserveRowMap[rowid] = row;
@@ -18646,18 +18635,18 @@ var Methods = {
   },
   // 计算可视渲染相关数据
   computeScrollLoad: function computeScrollLoad() {
-    var _this49 = this;
+    var _this48 = this;
 
     return this.$nextTick().then(function () {
-      var sYOpts = _this49.sYOpts,
-          sXOpts = _this49.sXOpts,
-          scrollXLoad = _this49.scrollXLoad,
-          scrollYLoad = _this49.scrollYLoad,
-          scrollXStore = _this49.scrollXStore,
-          scrollYStore = _this49.scrollYStore; // 计算 X 逻辑
+      var sYOpts = _this48.sYOpts,
+          sXOpts = _this48.sXOpts,
+          scrollXLoad = _this48.scrollXLoad,
+          scrollYLoad = _this48.scrollYLoad,
+          scrollXStore = _this48.scrollXStore,
+          scrollYStore = _this48.scrollYStore; // 计算 X 逻辑
 
       if (scrollXLoad) {
-        var _computeVirtualX3 = computeVirtualX(_this49),
+        var _computeVirtualX3 = computeVirtualX(_this48),
             visibleXSize = _computeVirtualX3.visibleSize;
 
         var offsetXSize = sXOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(sXOpts.oSize) : browse.msie ? 10 : browse.edge ? 5 : 0;
@@ -18665,13 +18654,13 @@ var Methods = {
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
 
-        _this49.updateScrollXData();
+        _this48.updateScrollXData();
       } else {
-        _this49.updateScrollXSpace();
+        _this48.updateScrollXSpace();
       } // 计算 Y 逻辑
 
 
-      var _computeVirtualY = computeVirtualY(_this49),
+      var _computeVirtualY = computeVirtualY(_this48),
           rowHeight = _computeVirtualY.rowHeight,
           visibleYSize = _computeVirtualY.visibleSize;
 
@@ -18683,14 +18672,14 @@ var Methods = {
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
 
-        _this49.updateScrollYData();
+        _this48.updateScrollYData();
       } else {
-        _this49.updateScrollYSpace();
+        _this48.updateScrollYSpace();
       }
 
-      _this49.rowHeight = rowHeight;
+      _this48.rowHeight = rowHeight;
 
-      _this49.$nextTick(_this49.updateStyle);
+      _this48.$nextTick(_this48.updateStyle);
     });
   },
   handleTableColumn: function handleTableColumn() {
@@ -18700,8 +18689,14 @@ var Methods = {
     this.tableColumn = scrollXLoad ? visibleColumn.slice(scrollXStore.startIndex, scrollXStore.endIndex) : visibleColumn.slice(0);
   },
   updateScrollXData: function updateScrollXData() {
-    this.handleTableColumn();
-    this.updateScrollXSpace();
+    var _this49 = this;
+
+    this.tableColumn = [];
+    this.$nextTick(function () {
+      _this49.handleTableColumn();
+
+      _this49.updateScrollXSpace();
+    });
   },
   // 更新横向 X 可视渲染上下剩余空间大小
   updateScrollXSpace: function updateScrollXSpace() {
@@ -18757,8 +18752,14 @@ var Methods = {
     }
   },
   updateScrollYData: function updateScrollYData() {
-    this.handleTableData();
-    this.updateScrollYSpace();
+    var _this50 = this;
+
+    this.tableData = [];
+    this.$nextTick(function () {
+      _this50.handleTableData();
+
+      _this50.updateScrollYSpace();
+    });
   },
   // 更新纵向 Y 可视渲染上下剩余空间大小
   updateScrollYSpace: function updateScrollYSpace() {
@@ -18804,7 +18805,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this50 = this;
+    var _this51 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -18825,7 +18826,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this50.$nextTick());
+          return resolve(_this51.$nextTick());
         }, 50);
       });
     }
@@ -18876,7 +18877,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this51 = this;
+    var _this52 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -18891,15 +18892,15 @@ var Methods = {
       if (matchObj) {
         var nodes = matchObj.nodes;
         nodes.forEach(function (row, index) {
-          if (index < nodes.length - 1 && !_this51.isTreeExpandByRow(row)) {
-            rests.push(_this51.setTreeExpand(row, true));
+          if (index < nodes.length - 1 && !_this52.isTreeExpandByRow(row)) {
+            rests.push(_this52.setTreeExpand(row, true));
           }
         });
       }
     }
 
     return Promise.all(rests).then(function () {
-      return dom.rowToVisible(_this51, row);
+      return dom.rowToVisible(_this52, row);
     });
   },
 
@@ -18963,29 +18964,29 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(scope, cellValue) {
-    var _this52 = this;
+    var _this53 = this;
 
     var customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(cellValue);
     return this.$nextTick().then(function () {
-      var $refs = _this52.$refs,
-          editRules = _this52.editRules,
-          validStore = _this52.validStore;
+      var $refs = _this53.$refs,
+          editRules = _this53.editRules,
+          validStore = _this53.validStore;
 
       if (scope && $refs.tableBody && editRules) {
         var row = scope.row,
             column = scope.column;
         var type = 'change';
 
-        if (_this52.hasCellRules(type, row, column)) {
-          var cell = _this52.getCell(row, column);
+        if (_this53.hasCellRules(type, row, column)) {
+          var cell = _this53.getCell(row, column);
 
           if (cell) {
-            return _this52.validCellRules(type, row, column, cellValue).then(function () {
+            return _this53.validCellRules(type, row, column, cellValue).then(function () {
               if (customVal && validStore.visible) {
                 methods_setCellValue(row, column, cellValue);
               }
 
-              _this52.clearValidate();
+              _this53.clearValidate();
             }).catch(function (_ref8) {
               var rule = _ref8.rule;
 
@@ -18993,7 +18994,7 @@ var Methods = {
                 methods_setCellValue(row, column, cellValue);
               }
 
-              _this52.showValidTooltip({
+              _this53.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -19014,7 +19015,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this53 = this;
+    var _this54 = this;
 
     if (this.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -19022,7 +19023,7 @@ var Methods = {
 
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this53.updateCellAreas();
+      return _this54.updateCellAreas();
     });
   },
 
@@ -19031,7 +19032,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this54 = this;
+    var _this55 = this;
 
     if (this.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -19039,7 +19040,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this54.updateCellAreas();
+      _this55.updateCellAreas();
 
       return rest;
     });
@@ -19063,7 +19064,7 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this55 = this;
+    var _this56 = this;
 
     if (this.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -19071,11 +19072,11 @@ var Methods = {
 
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this55.updateCellAreas();
+      return _this56.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this56 = this;
+    var _this57 = this;
 
     if (this.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -19083,7 +19084,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this56.updateCellAreas();
+      _this57.updateCellAreas();
 
       return rest;
     });
@@ -19150,7 +19151,7 @@ var Methods = {
    *************************/
   getCell: function getCell(row, column) {
     var $refs = this.$refs;
-    var rowid = methods_getRowid(this, row);
+    var rowid = util_getRowid(this, row);
     var bodyElem = $refs["".concat(column.fixed || 'table', "Body")] || $refs.tableBody;
 
     if (bodyElem && bodyElem.$el) {
@@ -19254,6 +19255,7 @@ funcs.forEach(function (name) {
 
 
 
+
 
 
 /**
@@ -19354,7 +19356,7 @@ function handleUupdateResize(_vm) {
     height: [Number, String],
     // 表格的最大高度
     maxHeight: [Number, String],
-    // （即将废弃）所有列是否允许拖动列宽调整大小
+    // 已废弃，被 column-config.resizable 替换
     resizable: {
       type: Boolean,
       default: function _default() {
@@ -19426,35 +19428,35 @@ function handleUupdateResize(_vm) {
         return conf.table.showHeader;
       }
     },
-    // （即将废弃）是否要高亮当前选中行
+    // 已废弃，被 row-config.isCurrent 替换
     highlightCurrentRow: {
       type: Boolean,
       default: function _default() {
         return conf.table.highlightCurrentRow;
       }
     },
-    // （即将废弃）鼠标移到行是否要高亮显示
+    // 已废弃，被 row-config.isHover 替换
     highlightHoverRow: {
       type: Boolean,
       default: function _default() {
         return conf.table.highlightHoverRow;
       }
     },
-    // （即将废弃）是否要高亮当前选中列
+    // 已废弃，被 column-config.isCurrent 替换
     highlightCurrentColumn: {
       type: Boolean,
       default: function _default() {
         return conf.table.highlightCurrentColumn;
       }
     },
-    // （即将废弃）鼠标移到列是否要高亮显示
+    // 已废弃，被 column-config.isHover 替换
     highlightHoverColumn: {
       type: Boolean,
       default: function _default() {
         return conf.table.highlightHoverColumn;
       }
     },
-    // （即将废弃）激活单元格编辑时是否高亮显示
+    // 已废弃，直接删除
     highlightCell: Boolean,
     // 是否显示表尾合计
     showFooter: Boolean,
@@ -19763,6 +19765,13 @@ function handleUupdateResize(_vm) {
         insertList: [],
         removeList: []
       },
+      // 存放 tooltip 相关信息
+      tooltipStore: {
+        row: null,
+        column: null,
+        visible: false,
+        currOpts: null
+      },
       // 存放数据校验相关信息
       validStore: {
         visible: false,
@@ -19858,15 +19867,10 @@ function handleUupdateResize(_vm) {
       return Object.assign({}, conf.table.checkboxConfig, this.checkboxConfig);
     },
     tooltipOpts: function tooltipOpts() {
-      var opts = Object.assign({
-        leaveDelay: 300
-      }, conf.table.tooltipConfig, this.tooltipConfig);
-
-      if (opts.enterable) {
-        opts.leaveMethod = this.handleTooltipLeaveMethod;
-      }
-
-      return opts;
+      return Object.assign({}, conf.tooltip, conf.table.tooltipConfig, this.tooltipConfig);
+    },
+    tipConfig: function tipConfig() {
+      return _objectSpread2(_objectSpread2({}, this.tooltipOpts), this.tooltipStore.currOpts);
     },
     validTipOpts: function validTipOpts() {
       return Object.assign({
@@ -19999,55 +20003,7 @@ function handleUupdateResize(_vm) {
       }
 
       return false;
-    } // isMergeLeftFixedExceeded () {
-    //   const { mergeList, columnStore, visibleColumn } = this
-    //   const { leftList } = columnStore
-    //   const lastFCIndex = visibleColumn.indexOf(leftList[leftList.length - 1])
-    //   for (let i = 0, len = mergeList.length; i < len; i++) {
-    //     const item = mergeList[i]
-    //     if (item.col <= lastFCIndex && item.col + item.colspan > lastFCIndex) {
-    //       return true
-    //     }
-    //   }
-    //   return false
-    // },
-    // isMergeRightFixedExceeded () {
-    //   const { mergeList, columnStore, visibleColumn } = this
-    //   const { rightList } = columnStore
-    //   const firstFCIndex = visibleColumn.indexOf(rightList[0])
-    //   for (let i = 0, len = mergeList.length; i < len; i++) {
-    //     const item = mergeList[i]
-    //     if (item.col < firstFCIndex && item.col + item.colspan >= firstFCIndex) {
-    //       return true
-    //     }
-    //   }
-    //   return false
-    // },
-    // isMergeFooterLeftFixedExceeded () {
-    //   const { mergeFooterList, columnStore, visibleColumn } = this
-    //   const { leftList } = columnStore
-    //   const lastFCIndex = visibleColumn.indexOf(leftList[leftList.length - 1])
-    //   for (let i = 0, len = mergeFooterList.length; i < len; i++) {
-    //     const item = mergeFooterList[i]
-    //     if (item.col <= lastFCIndex && item.col + item.colspan > lastFCIndex) {
-    //       return true
-    //     }
-    //   }
-    //   return false
-    // },
-    // isMergeFooterRightFixedExceeded () {
-    //   const { mergeFooterList, columnStore, visibleColumn } = this
-    //   const { rightList } = columnStore
-    //   const firstFCIndex = visibleColumn.indexOf(rightList[0])
-    //   for (let i = 0, len = mergeFooterList.length; i < len; i++) {
-    //     const item = mergeFooterList[i]
-    //     if (item.col < firstFCIndex && item.col + item.colspan >= firstFCIndex) {
-    //       return true
-    //     }
-    //   }
-    //   return false
-    // }
-
+    }
   },
   watch: {
     data: function data(value) {
@@ -20152,8 +20108,6 @@ function handleUupdateResize(_vm) {
       scrollXStore: {},
       // 存放纵向 Y 虚拟滚动相关信息
       scrollYStore: {},
-      // 存放 tooltip 相关信息
-      tooltipStore: {},
       // 表格宽度
       tableWidth: 0,
       // 表格高度
@@ -20324,7 +20278,6 @@ function handleUupdateResize(_vm) {
         highlightHoverColumn = this.highlightHoverColumn,
         editConfig = this.editConfig,
         validTipOpts = this.validTipOpts,
-        tooltipOpts = this.tooltipOpts,
         initStore = this.initStore,
         columnStore = this.columnStore,
         filterStore = this.filterStore,
@@ -20506,7 +20459,7 @@ function handleUupdateResize(_vm) {
      */
     hasTip ? h('vxe-tooltip', {
       ref: 'tooltip',
-      props: tooltipOpts
+      props: this.tipConfig
     }) : _e(),
     /**
      * 校验提示
@@ -26443,7 +26396,8 @@ function getOptUniqueId() {
 }
 
 function getOptkey(_vm) {
-  return _vm.optionId || '_X_ID';
+  var optionOpts = _vm.optionOpts;
+  return optionOpts.keyField || _vm.optionId || '_X_OPTION_KEY';
 }
 
 function getOptid(_vm, option) {
@@ -26587,7 +26541,9 @@ function renderOption(h, _vm, list, group) {
       optionKey = _vm.optionKey,
       value = _vm.value,
       multiple = _vm.multiple,
-      currentValue = _vm.currentValue;
+      currentValue = _vm.currentValue,
+      optionOpts = _vm.optionOpts;
+  var useKey = optionOpts.useKey;
   return list.map(function (option, cIndex) {
     var slots = option.slots;
     var isVisible = !isGroup || isOptionVisible(option);
@@ -26596,7 +26552,7 @@ function renderOption(h, _vm, list, group) {
     var optid = getOptid(_vm, option);
     var defaultSlot = slots ? slots.default : null;
     return isVisible ? h('div', {
-      key: optionKey ? optid : cIndex,
+      key: useKey || optionKey ? optid : cIndex,
       class: ['vxe-select-option', option.className, {
         'is--disabled': isDisabled,
         'is--selected': multiple ? value && value.indexOf(optionValue) > -1 : value === optionValue,
@@ -26628,14 +26584,16 @@ function renderOptgroup(h, _vm) {
   var optionKey = _vm.optionKey,
       visibleGroupList = _vm.visibleGroupList,
       groupLabelField = _vm.groupLabelField,
-      groupOptionsField = _vm.groupOptionsField;
+      groupOptionsField = _vm.groupOptionsField,
+      optionOpts = _vm.optionOpts;
+  var useKey = optionOpts.useKey;
   return visibleGroupList.map(function (group, gIndex) {
     var slots = group.slots;
     var optid = getOptid(_vm, group);
     var isGroupDisabled = group.disabled;
     var defaultSlot = slots ? slots.default : null;
     return h('div', {
-      key: optionKey ? optid : gIndex,
+      key: useKey || optionKey ? optid : gIndex,
       class: ['vxe-optgroup', group.className, {
         'is--disabled': isGroupDisabled
       }],
@@ -26695,6 +26653,7 @@ function select_renderOpts(h, _vm) {
     optionProps: Object,
     optionGroups: Array,
     optionGroupProps: Object,
+    optionConfig: Object,
     className: [String, Function],
     size: {
       type: String,
@@ -26703,12 +26662,14 @@ function select_renderOpts(h, _vm) {
       }
     },
     emptyText: String,
+    // 已废弃，被 option-config.keyField 替换
     optionId: {
       type: String,
       default: function _default() {
         return conf.select.optionId;
       }
     },
+    // 已废弃，被 option-config.useKey 替换
     optionKey: Boolean,
     transfer: {
       type: Boolean,
@@ -26761,6 +26722,9 @@ function select_renderOpts(h, _vm) {
     groupOptionsField: function groupOptionsField() {
       return this.groupPropsOpts.options || 'options';
     },
+    optionOpts: function optionOpts() {
+      return Object.assign({}, conf.select.optionConfig, this.optionConfig);
+    },
     isGroup: function isGroup() {
       return this.fullGroupList.some(function (item) {
         return item.options && item.options.length;
@@ -32007,8 +31971,10 @@ var column_props = {
   exportMethod: Function,
   // 表尾单元格数据导出方法
   footerExportMethod: Function,
-  // 标题帮助图标配置项
+  // 已废弃，被 titlePrefix 替换
   titleHelp: Object,
+  // 标题帮助图标配置项
+  titlePrefix: Object,
   // 单元格值类型
   cellType: String,
   // 单元格渲染配置项
@@ -35820,7 +35786,35 @@ function showTip(_vm) {
   return _vm.updatePlacement();
 }
 
-/* harmony default export */ var src_tooltip = ({
+function tooltip_renderContent(h, _vm) {
+  var $scopedSlots = _vm.$scopedSlots,
+      useHTML = _vm.useHTML,
+      tipContent = _vm.tipContent;
+
+  if ($scopedSlots.content) {
+    return h('div', {
+      key: 1,
+      class: 'vxe-table--tooltip-content'
+    }, $scopedSlots.content.call(this, {}));
+  }
+
+  if (useHTML) {
+    return h('div', {
+      key: 2,
+      class: 'vxe-table--tooltip-content',
+      domProps: {
+        innerHTML: tipContent
+      }
+    });
+  }
+
+  return h('div', {
+    key: 3,
+    class: 'vxe-table--tooltip-content'
+  }, utils.formatText(tipContent));
+}
+
+/* harmony default export */ var tooltip = ({
   name: 'VxeTooltip',
   mixins: [size],
   props: {
@@ -35843,7 +35837,11 @@ function showTip(_vm) {
         return conf.tooltip.theme;
       }
     },
-    content: [String, Number],
+    content: {
+      type: [String, Number],
+      default: null
+    },
+    useHTML: Boolean,
     zIndex: [String, Number],
     isArrow: {
       type: Boolean,
@@ -35861,14 +35859,13 @@ function showTip(_vm) {
       default: function _default() {
         return conf.tooltip.leaveDelay;
       }
-    },
-    leaveMethod: Function
+    }
   },
   data: function data() {
     return {
       isUpdate: false,
       visible: false,
-      message: '',
+      tipContent: '',
       tipActive: false,
       tipTarget: null,
       tipZindex: 0,
@@ -35881,7 +35878,7 @@ function showTip(_vm) {
   },
   watch: {
     content: function content(value) {
-      this.message = value;
+      this.tipContent = value;
     },
     value: function value(_value) {
       if (!this.isUpdate) {
@@ -35910,7 +35907,7 @@ function showTip(_vm) {
         value = this.value;
     var parentNode = $el.parentNode;
     var target;
-    this.message = content;
+    this.tipContent = content;
     this.tipZindex = utils.nextZIndex();
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach($el.children, function (elem, index) {
       if (index > 1) {
@@ -35962,7 +35959,6 @@ function showTip(_vm) {
     var $scopedSlots = this.$scopedSlots,
         vSize = this.vSize,
         theme = this.theme,
-        message = this.message,
         tipActive = this.tipActive,
         isArrow = this.isArrow,
         visible = this.visible,
@@ -35982,16 +35978,14 @@ function showTip(_vm) {
       style: tipStore.style,
       ref: 'tipWrapper',
       on: on
-    }, [h('div', {
-      class: 'vxe-table--tooltip-content'
-    }, $scopedSlots.content ? $scopedSlots.content.call(this, {}) : message), h('div', {
+    }, [tooltip_renderContent(h, this), h('div', {
       class: 'vxe-table--tooltip-arrow',
       style: tipStore.arrowStyle
     })].concat($scopedSlots.default ? $scopedSlots.default.call(this, {}) : []));
   },
   methods: {
-    open: function open(target, message) {
-      return this.toVisible(target || this.target, message);
+    open: function open(target, content) {
+      return this.toVisible(target || this.target, content);
     },
     close: function close() {
       this.tipTarget = null;
@@ -36019,15 +36013,15 @@ function showTip(_vm) {
         this.tipZindex = utils.nextZIndex();
       }
     },
-    toVisible: function toVisible(target, message) {
+    toVisible: function toVisible(target, content) {
       if (target) {
         var trigger = this.trigger,
             enterDelay = this.enterDelay;
         this.tipActive = true;
         this.tipTarget = target;
 
-        if (message) {
-          this.message = message;
+        if (content) {
+          this.tipContent = content;
         }
 
         if (enterDelay && trigger === 'hover') {
@@ -36087,25 +36081,20 @@ function showTip(_vm) {
     wrapperMouseenterEvent: function wrapperMouseenterEvent() {
       this.tipActive = true;
     },
-    wrapperMouseleaveEvent: function wrapperMouseleaveEvent(evnt) {
+    wrapperMouseleaveEvent: function wrapperMouseleaveEvent() {
       var _this4 = this;
 
-      var leaveMethod = this.leaveMethod,
-          trigger = this.trigger,
+      var trigger = this.trigger,
           enterable = this.enterable,
           leaveDelay = this.leaveDelay;
       this.tipActive = false;
 
-      if (!leaveMethod || leaveMethod({
-        $event: evnt
-      }) !== false) {
-        if (enterable && trigger === 'hover') {
-          setTimeout(function () {
-            if (!_this4.tipActive) {
-              _this4.close();
-            }
-          }, leaveDelay);
-        }
+      if (enterable && trigger === 'hover') {
+        setTimeout(function () {
+          if (!_this4.tipActive) {
+            _this4.close();
+          }
+        }, leaveDelay);
       }
     }
   }
@@ -36115,10 +36104,10 @@ function showTip(_vm) {
 
 
 
-var Tooltip = Object.assign(src_tooltip, {
+var Tooltip = Object.assign(tooltip, {
   install: function install(Vue) {
     v_x_e_table._tooltip = 1;
-    Vue.component(src_tooltip.name, src_tooltip);
+    Vue.component(tooltip.name, tooltip);
   }
 });
 /* harmony default export */ var packages_tooltip = (Tooltip);
@@ -36225,6 +36214,7 @@ function assemItem(_vm) {
 
 
 
+
 function renderPrefixIcon(h, titlePrefix) {
   return h('span', {
     class: 'vxe-form--item-title-prefix'
@@ -36242,7 +36232,8 @@ function render_renderSuffixIcon(h, titleSuffix) {
 }
 
 function renderTitle(h, _vm, item) {
-  var data = _vm.data;
+  var data = _vm.data,
+      tooltipOpts = _vm.tooltipOpts;
   var slots = item.slots,
       field = item.field,
       itemRender = item.itemRender,
@@ -36260,11 +36251,9 @@ function renderTitle(h, _vm, item) {
 
   if (titlePrefix) {
     titVNs.push(titlePrefix.content || titlePrefix.message ? h('vxe-tooltip', {
-      props: {
-        content: getFuncText(titlePrefix.content || titlePrefix.message),
-        enterable: titlePrefix.enterable,
-        theme: titlePrefix.theme
-      }
+      props: _objectSpread2(_objectSpread2(_objectSpread2({}, tooltipOpts), titlePrefix), {}, {
+        content: getFuncText(titlePrefix.content || titlePrefix.message)
+      })
     }, [renderPrefixIcon(h, titlePrefix)]) : renderPrefixIcon(h, titlePrefix));
   }
 
@@ -36278,11 +36267,9 @@ function renderTitle(h, _vm, item) {
 
   if (titleSuffix) {
     fixVNs.push(titleSuffix.content || titleSuffix.message ? h('vxe-tooltip', {
-      props: {
-        content: getFuncText(titleSuffix.content || titleSuffix.message),
-        enterable: titleSuffix.enterable,
-        theme: titleSuffix.theme
-      }
+      props: _objectSpread2(_objectSpread2(_objectSpread2({}, tooltipOpts), titlePrefix), {}, {
+        content: getFuncText(titleSuffix.content || titleSuffix.message)
+      })
     }, [render_renderSuffixIcon(h, titleSuffix)]) : render_renderSuffixIcon(h, titleSuffix));
   }
 
@@ -36318,7 +36305,6 @@ function renderTitle(h, _vm, item) {
 
 
 
-
 
 
 var form_Rule = /*#__PURE__*/function () {
@@ -36398,7 +36384,7 @@ function renderItems(h, _vm, itemList) {
       collapseAll = _vm.collapseAll,
       validOpts = _vm.validOpts,
       allTitleOverflow = _vm.titleOverflow;
-  return itemList.map(function (item, index) {
+  return itemList.map(function (item) {
     var slots = item.slots,
         title = item.title,
         folding = item.folding,
@@ -36474,9 +36460,9 @@ function renderItems(h, _vm, itemList) {
 
     var ons = showTooltip ? {
       mouseenter: function mouseenter(evnt) {
-        _vm.triggerHeaderHelpEvent(evnt, params);
+        _vm.triggerTitleTipEvent(evnt, params);
       },
-      mouseleave: _vm.handleTargetLeaveEvent
+      mouseleave: _vm.handleTitleTipLeaveEvent
     } : {};
     return h('div', {
       class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', {
@@ -36486,7 +36472,7 @@ function renderItems(h, _vm, itemList) {
         'is--active': !itemVisibleMethod || itemVisibleMethod(params),
         'is--error': showError
       }],
-      key: index
+      key: item.id
     }, [h('div', {
       class: 'vxe-form--item-inner'
     }, [title || slots && slots.title ? h('div', {
@@ -36586,6 +36572,7 @@ function renderItems(h, _vm, itemList) {
       }
     },
     validConfig: Object,
+    tooltipConfig: Object,
     customLayout: {
       type: Boolean,
       default: function _default() {
@@ -36599,7 +36586,6 @@ function renderItems(h, _vm, itemList) {
       staticItems: [],
       formItems: [],
       tooltipTimeout: null,
-      tooltipActive: false,
       tooltipStore: {
         item: null,
         visible: false
@@ -36616,15 +36602,7 @@ function renderItems(h, _vm, itemList) {
       return Object.assign({}, conf.form.validConfig, this.validConfig);
     },
     tooltipOpts: function tooltipOpts() {
-      var opts = Object.assign({
-        leaveDelay: 300
-      }, conf.form.tooltipConfig, this.tooltipConfig);
-
-      if (opts.enterable) {
-        opts.leaveMethod = this.handleTooltipLeaveMethod;
-      }
-
-      return opts;
+      return Object.assign({}, conf.tooltip, conf.form.tooltipConfig, this.tooltipConfig);
     }
   },
   watch: {
@@ -36688,9 +36666,10 @@ function renderItems(h, _vm, itemList) {
     /**
      * 工具提示
      */
-    hasUseTooltip ? h('vxe-tooltip', _objectSpread2({
-      ref: 'tooltip'
-    }, tooltipOpts)) : _e()]);
+    hasUseTooltip ? h('vxe-tooltip', {
+      ref: 'tooltip',
+      props: tooltipOpts
+    }) : _e()]);
   },
   methods: {
     callSlot: function callSlot(slotFunc, params, h) {
@@ -36825,17 +36804,6 @@ function renderItems(h, _vm, itemList) {
         $event: evnt
       });
     },
-    handleTooltipLeaveMethod: function handleTooltipLeaveMethod() {
-      var _this5 = this;
-
-      var tooltipOpts = this.tooltipOpts;
-      setTimeout(function () {
-        if (!_this5.tooltipActive) {
-          _this5.closeTooltip();
-        }
-      }, tooltipOpts.leaveDelay);
-      return false;
-    },
     closeTooltip: function closeTooltip() {
       var tooltipStore = this.tooltipStore;
       var $tooltip = this.$refs.tooltip;
@@ -36853,7 +36821,7 @@ function renderItems(h, _vm, itemList) {
 
       return this.$nextTick();
     },
-    triggerHeaderHelpEvent: function triggerHeaderHelpEvent(evnt, params) {
+    triggerTitleTipEvent: function triggerTitleTipEvent(evnt, params) {
       var item = params.item;
       var tooltipStore = this.tooltipStore;
       var $tooltip = this.$refs.tooltip;
@@ -36861,8 +36829,10 @@ function renderItems(h, _vm, itemList) {
       var content = (overflowElem.textContent || '').trim();
       var isCellOverflow = overflowElem.scrollWidth > overflowElem.clientWidth;
       clearTimeout(this.tooltipTimeout);
-      this.tooltipActive = true;
-      this.closeTooltip();
+
+      if (tooltipStore.item !== item) {
+        this.closeTooltip();
+      }
 
       if (content && isCellOverflow) {
         Object.assign(tooltipStore, {
@@ -36875,12 +36845,11 @@ function renderItems(h, _vm, itemList) {
         }
       }
     },
-    handleTargetLeaveEvent: function handleTargetLeaveEvent() {
-      var _this6 = this;
+    handleTitleTipLeaveEvent: function handleTitleTipLeaveEvent() {
+      var _this5 = this;
 
       var tooltipOpts = this.tooltipOpts;
       var $tooltip = this.$refs.tooltip;
-      this.tooltipActive = false;
 
       if ($tooltip) {
         $tooltip.setActived(false);
@@ -36888,10 +36857,10 @@ function renderItems(h, _vm, itemList) {
 
       if (tooltipOpts.enterable) {
         this.tooltipTimeout = setTimeout(function () {
-          $tooltip = _this6.$refs.tooltip;
+          $tooltip = _this5.$refs.tooltip;
 
           if ($tooltip && !$tooltip.isActived()) {
-            _this6.closeTooltip();
+            _this5.closeTooltip();
           }
         }, tooltipOpts.leaveDelay);
       } else {
@@ -36922,7 +36891,7 @@ function renderItems(h, _vm, itemList) {
       return this.beginValidate(item ? [item] : [], '', callback);
     },
     beginValidate: function beginValidate(itemList, type, callback) {
-      var _this7 = this;
+      var _this6 = this;
 
       var data = this.data,
           formRules = this.rules,
@@ -36937,7 +36906,7 @@ function renderItems(h, _vm, itemList) {
           var field = item.field;
 
           if (field) {
-            itemValids.push(_this7.validItemRules(type || 'all', field).then(function () {
+            itemValids.push(_this6.validItemRules(type || 'all', field).then(function () {
               item.errRule = null;
             }).catch(function (_ref2) {
               var rule = _ref2.rule,
@@ -36948,7 +36917,7 @@ function renderItems(h, _vm, itemList) {
                 data: data,
                 field: field,
                 property: field,
-                $form: _this7
+                $form: _this6
               };
 
               if (!validRest[field]) {
@@ -36968,7 +36937,7 @@ function renderItems(h, _vm, itemList) {
           }
         }).catch(function () {
           return new Promise(function (resolve) {
-            _this7.showErrTime = setTimeout(function () {
+            _this6.showErrTime = setTimeout(function () {
               itemList.forEach(function (item) {
                 if (item.errRule) {
                   item.showError = true;
@@ -36977,8 +36946,8 @@ function renderItems(h, _vm, itemList) {
             }, 20);
 
             if (validOpts.autoPos) {
-              _this7.$nextTick(function () {
-                _this7.handleFocus(validFields);
+              _this6.$nextTick(function () {
+                _this6.handleFocus(validFields);
               });
             }
 
@@ -37014,7 +36983,7 @@ function renderItems(h, _vm, itemList) {
      *  trigger=change 触发方式
      */
     validItemRules: function validItemRules(validType, property, val) {
-      var _this8 = this;
+      var _this7 = this;
 
       var data = this.data,
           formRules = this.rules;
@@ -37040,7 +37009,7 @@ function renderItems(h, _vm, itemList) {
                   data: data,
                   field: property,
                   property: property,
-                  $form: _this8
+                  $form: _this7
                 });
 
                 if (customValid) {
@@ -37087,11 +37056,11 @@ function renderItems(h, _vm, itemList) {
       });
     },
     handleFocus: function handleFocus(fields) {
-      var _this9 = this;
+      var _this8 = this;
 
       var $el = this.$el;
       fields.some(function (property, index) {
-        var item = _this9.getItemByField(property);
+        var item = _this8.getItemByField(property);
 
         if (item && isEnableConf(item.itemRender)) {
           var itemRender = item.itemRender;
@@ -37133,17 +37102,17 @@ function renderItems(h, _vm, itemList) {
      * 如果单元格配置了校验规则，则会进行校验
      */
     updateStatus: function updateStatus(scope, itemValue) {
-      var _this10 = this;
+      var _this9 = this;
 
       var property = scope.property;
 
       if (property) {
         this.validItemRules('change', property, itemValue).then(function () {
-          _this10.clearValidate(property);
+          _this9.clearValidate(property);
         }).catch(function (_ref3) {
           var rule = _ref3.rule;
 
-          var item = _this10.getItemByField(property);
+          var item = _this9.getItemByField(property);
 
           if (item) {
             item.showError = true;
@@ -37274,9 +37243,9 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
 
   var ons = showTooltip ? {
     mouseenter: function mouseenter(evnt) {
-      _vm.triggerHeaderHelpEvent(evnt, params);
+      _vm.triggerTitleTipEvent(evnt, params);
     },
-    mouseleave: _vm.handleTargetLeaveEvent
+    mouseleave: _vm.handleTitleTipLeaveEvent
   } : {};
   return h('div', {
     class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', {