vxe-table 3.7.0-beta.1 → 3.7.0-beta.11

package/lib/index.umd.js

@@ -10677,6 +10677,7 @@ var iconPrefix = 'vxe-icon-';
     animat: true,
     delayHover: 250,
     autoResize: true,
+    minHeight: 144,
     // keepSource: false,
     // showOverflow: null,
     // showHeaderOverflow: null,
@@ -10710,7 +10711,9 @@ var iconPrefix = 'vxe-icon-';
     },
     validConfig: {
       showMessage: true,
-      message: 'default'
+      autoClear: true,
+      message: 'inline',
+      msgMode: 'single'
     },
     columnConfig: {
       maxFixedSize: 4
@@ -10737,9 +10740,9 @@ var iconPrefix = 'vxe-icon-';
     treeConfig: {
       rowField: 'id',
       parentField: 'parentId',
-      children: 'children',
-      hasChild: 'hasChild',
-      mapChildren: '_X_ROW_CHILD',
+      childrenField: 'children',
+      hasChildField: 'hasChild',
+      mapChildrenField: '_X_ROW_CHILD',
       indent: 20,
       showIcon: true
     },
@@ -11042,7 +11045,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.7.0-beta.0", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.7.0-beta.10", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -11437,6 +11440,7 @@ function getNativeOns(renderOpts, params) {
   var nativeOns = {};
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(nativeEvents, function (func, key) {
     nativeOns[key] = function () {
+      if (false) {}
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
@@ -11454,6 +11458,7 @@ function getOns(renderOpts, params, inputFunc, changeFunc) {
   var ons = {};
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(events, function (func, key) {
     ons[key] = function () {
+      if (false) {}
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         args[_key2] = arguments[_key2];
       }
@@ -12056,7 +12061,8 @@ var renderer = {
 var es_array_includes = __webpack_require__(6699);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
 var es_string_includes = __webpack_require__(2023);
-;// CONCATENATED MODULE: ./packages/v-x-e-table/src/store.js
+;// CONCATENATED MODULE: ./packages/v-x-e-table/src/commands.js
+
 
 
 
@@ -12066,6 +12072,178 @@ var es_string_includes = __webpack_require__(2023);
 
 
 
+var VXECommandsStore = /*#__PURE__*/function () {
+  function VXECommandsStore() {
+    _classCallCheck(this, VXECommandsStore);
+    this.store = {};
+  }
+  _createClass(VXECommandsStore, [{
+    key: "mixin",
+    value: function mixin(options) {
+      var _this = this;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(options, function (item, key) {
+        _this.add(key, item);
+      });
+      return VXECommandsStore;
+    }
+  }, {
+    key: "get",
+    value: function get(name) {
+      return this.store[name];
+    }
+  }, {
+    key: "add",
+    value: function add(name, render) {
+      var conf = this.store[name];
+      // 兼容
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
+        if (false) {}
+        render = {
+          commandMethod: render
+        };
+      }
+
+      // 检测是否覆盖
+      if (false) { var confKeys; }
+      this.store[name] = conf ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, render) : render;
+      return VXECommandsStore;
+    }
+  }, {
+    key: "delete",
+    value: function _delete(name) {
+      delete this.store[name];
+      return VXECommandsStore;
+    }
+  }]);
+  return VXECommandsStore;
+}();
+var commands = new VXECommandsStore();
+if (false) {}
+;// CONCATENATED MODULE: ./packages/v-x-e-table/src/menus.js
+
+
+
+
+
+
+
+
+
+
+var VXEMenusStore = /*#__PURE__*/function () {
+  function VXEMenusStore() {
+    _classCallCheck(this, VXEMenusStore);
+    this.store = {};
+  }
+  _createClass(VXEMenusStore, [{
+    key: "mixin",
+    value: function mixin(options) {
+      var _this = this;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(options, function (item, key) {
+        _this.add(key, item);
+      });
+      return VXEMenusStore;
+    }
+  }, {
+    key: "get",
+    value: function get(name) {
+      return this.store[name];
+    }
+  }, {
+    key: "add",
+    value: function add(name, render) {
+      var conf = this.store[name];
+      // 兼容
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
+        if (false) {}
+        render = {
+          menuMethod: render
+        };
+      }
+
+      // 检测是否覆盖
+      if (false) { var confKeys; }
+      this.store[name] = conf ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, render) : render;
+      return VXEMenusStore;
+    }
+  }, {
+    key: "delete",
+    value: function _delete(name) {
+      delete this.store[name];
+      return VXEMenusStore;
+    }
+  }]);
+  return VXEMenusStore;
+}();
+var menus = new VXEMenusStore();
+if (false) {}
+;// CONCATENATED MODULE: ./packages/v-x-e-table/src/formats.js
+
+
+
+
+
+
+
+
+
+
+var VXEFormatsStore = /*#__PURE__*/function () {
+  function VXEFormatsStore() {
+    _classCallCheck(this, VXEFormatsStore);
+    this.store = {};
+  }
+  _createClass(VXEFormatsStore, [{
+    key: "mixin",
+    value: function mixin(options) {
+      var _this = this;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(options, function (item, key) {
+        _this.add(key, item);
+      });
+      return VXEFormatsStore;
+    }
+  }, {
+    key: "get",
+    value: function get(name) {
+      return this.store[name];
+    }
+  }, {
+    key: "add",
+    value: function add(name, render) {
+      var conf = this.store[name];
+      // 兼容
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
+        if (false) {}
+        render = {
+          cellFormatMethod: render
+        };
+      }
+
+      // 检测是否覆盖
+      if (false) { var confKeys; }
+      this.store[name] = conf ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, render) : render;
+      return VXEFormatsStore;
+    }
+  }, {
+    key: "delete",
+    value: function _delete(name) {
+      delete this.store[name];
+      return VXEFormatsStore;
+    }
+  }]);
+  return VXEFormatsStore;
+}();
+var formats = new VXEFormatsStore();
+if (false) {}
+;// CONCATENATED MODULE: ./packages/v-x-e-table/src/store.js
+
+
+
+
+
+
+
+
 
 
 /**
@@ -12078,8 +12256,11 @@ var Store = /*#__PURE__*/function () {
   }
   _createClass(Store, [{
     key: "mixin",
-    value: function mixin(map) {
-      Object.assign(this.store, map);
+    value: function mixin(options) {
+      var _this = this;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(options, function (item, key) {
+        _this.add(key, item);
+      });
       return Store;
     }
   }, {
@@ -12106,20 +12287,10 @@ var Store = /*#__PURE__*/function () {
   return Store;
 }();
 /* harmony default export */ const store = (Store);
-;// CONCATENATED MODULE: ./packages/v-x-e-table/src/commands.js
+;// CONCATENATED MODULE: ./packages/v-x-e-table/src/validators.js
 
 
-var commands = new store();
-if (false) {}
-;// CONCATENATED MODULE: ./packages/v-x-e-table/src/menus.js
-
-
-var menus = new store();
-if (false) {}
-;// CONCATENATED MODULE: ./packages/v-x-e-table/src/formats.js
-
-
-var formats = new store();
+var validators = new store();
 if (false) {}
 ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/setup.js
 
@@ -12146,6 +12317,7 @@ function setup(options) {
 
 
 
+
 var installedPlugins = [];
 function use(Plugin, options) {
   /* eslint-disable @typescript-eslint/no-use-before-define */
@@ -12229,7 +12401,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.7.0-beta.0",
+  version: "3.7.0-beta.10",
   reg: reg,
   use: use,
   setup: setup,
@@ -12238,6 +12410,7 @@ var VXETable = {
   commands: commands,
   formats: formats,
   menus: menus,
+  validators: validators,
   config: config,
   t: t,
   _t: _t
@@ -12367,7 +12540,7 @@ var ColumnInfo = /*#__PURE__*/function () {
     var proxyOpts = $xegrid ? $xegrid.proxyOpts : null;
     var formatter = _vm.formatter;
     var visible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.visible) ? _vm.visible : true;
-    if (false) { var _globalFunc, globalFunc, types; }
+    if (false) { var _gFormatOpts, gFormatOpts, types; }
     Object.assign(this, {
       // 基本属性
       type: _vm.type,
@@ -12851,7 +13024,9 @@ function countTreeExpand(prevRow, params) {
     return count;
   }
   var $table = params.$table;
-  var rowChildren = prevRow[$table.treeOpts.children];
+  var treeOpts = $table.treeOpts;
+  var childrenField = treeOpts.children || treeOpts.childrenField;
+  var rowChildren = prevRow[childrenField];
   if ($table.isTreeExpandByRow(prevRow)) {
     for (var index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params);
@@ -13049,7 +13224,7 @@ function renderLine(h, _vm, $xetable, params) {
   if (slots && slots.line) {
     return $xetable.callSlot(slots.line, params, h);
   }
-  if (treeConfig && treeNode && treeOpts.line) {
+  if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
     return [h('div', {
       "class": 'vxe-tree--line-wrapper'
     }, [h('div', {
@@ -13326,6 +13501,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
     hasFixedColumn = $xetable.hasFixedColumn,
     fullAllDataRowIdData = $xetable.fullAllDataRowIdData,
     rowOpts = $xetable.rowOpts;
+  var childrenField = treeOpts.children || treeOpts.childrenField;
   var rows = [];
   tableData.forEach(function (row, $rowIndex) {
     var trOn = {};
@@ -13377,7 +13553,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
       isNewRow = $xetable.isInsertByRow(row);
     }
     if (treeConfig && !scrollYLoad && !treeOpts.transform && treeExpandeds.length) {
-      rowChildren = row[treeOpts.children];
+      rowChildren = row[childrenField];
       isExpandTree = rowChildren && rowChildren.length && treeExpandeds.indexOf(row) > -1;
     }
     rows.push(h('tr', {
@@ -14813,16 +14989,16 @@ var Cell = {
       column = params.column,
       level = params.level;
     var slots = column.slots;
-    var children = treeOpts.children,
-      hasChild = treeOpts.hasChild,
-      indent = treeOpts.indent,
+    var indent = treeOpts.indent,
       lazy = treeOpts.lazy,
       trigger = treeOpts.trigger,
       iconLoaded = treeOpts.iconLoaded,
       showIcon = treeOpts.showIcon,
       iconOpen = treeOpts.iconOpen,
       iconClose = treeOpts.iconClose;
-    var rowChilds = row[children];
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+    var rowChilds = row[childrenField];
     var hasLazyChilds = false;
     var isAceived = false;
     var isLazyLoaded = false;
@@ -14834,7 +15010,7 @@ var Cell = {
       isAceived = $table.findRowIndexOf(treeExpandeds, row) > -1;
       if (lazy) {
         isLazyLoaded = $table.findRowIndexOf(treeLazyLoadeds, row) > -1;
-        hasLazyChilds = row[hasChild];
+        hasLazyChilds = row[hasChildField];
       }
     }
     if (!trigger || trigger === 'default') {
@@ -15023,7 +15199,7 @@ var Cell = {
       isHidden = params.isHidden;
     var treeConfig = $table.treeConfig,
       treeIndeterminates = $table.treeIndeterminates,
-      selection = $table.selection;
+      selectCheckboxRows = $table.selectCheckboxRows;
     var _$table$checkboxOpts = $table.checkboxOpts,
       labelField = _$table$checkboxOpts.labelField,
       checkMethod = _$table$checkboxOpts.checkMethod,
@@ -15039,7 +15215,7 @@ var Cell = {
     var isDisabled = !!checkMethod;
     var on;
     if (!isHidden) {
-      isChecked = $table.findRowIndexOf(selection, row) > -1;
+      isChecked = $table.findRowIndexOf(selectCheckboxRows, row) > -1;
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
@@ -15276,6 +15452,7 @@ var Cell = {
       },
       on: {
         click: function click(evnt) {
+          evnt.stopPropagation();
           $table.triggerSortEvent(evnt, column, 'asc');
         }
       }
@@ -15288,6 +15465,7 @@ var Cell = {
       },
       on: {
         click: function click(evnt) {
+          evnt.stopPropagation();
           $table.triggerSortEvent(evnt, column, 'desc');
         }
       }
@@ -15854,6 +16032,7 @@ var Methods = {
       oldScrollYLoad = this.scrollYLoad,
       sXOpts = this.sXOpts,
       sYOpts = this.sYOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var treeData = [];
     var fullData = datas ? datas.slice(0) : [];
     if (treeConfig) {
@@ -15863,8 +16042,8 @@ var Methods = {
         treeData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(fullData, {
           key: treeOpts.rowField,
           parentKey: treeOpts.parentField,
-          children: treeOpts.children,
-          mapChildren: treeOpts.mapChildren
+          children: childrenField,
+          mapChildren: treeOpts.mapChildrenField
         });
         fullData = treeData.slice(0);
       } else {
@@ -15890,7 +16069,7 @@ var Methods = {
     this.tableSynchData = datas;
     // 克隆原数据，用于显示编辑状态，与编辑值做对比
     if (keepSource) {
-      this.tableSourceData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(fullData, true);
+      this.cacheSourceMap(fullData);
     }
     if (false) {}
     if (this.clearCellAreas && this.mouseConfig) {
@@ -16072,6 +16251,8 @@ var Methods = {
       tableFullTreeData = this.tableFullTreeData;
     var fullDataRowIdData = this.fullDataRowIdData,
       fullAllDataRowIdData = this.fullAllDataRowIdData;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     var rowkey = getRowkey(this);
     var isLazy = treeConfig && treeOpts.lazy;
     var handleCache = function handleCache(row, index, items, path, parent, nodes) {
@@ -16082,8 +16263,8 @@ var Methods = {
         rowid = getRowUniqueId();
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
       }
-      if (isLazy && row[treeOpts.hasChild] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[treeOpts.children])) {
-        row[treeOpts.children] = null;
+      if (isLazy && row[hasChildField] && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(row[childrenField])) {
+        row[childrenField] = null;
       }
       var rest = {
         row: row,
@@ -16115,8 +16296,35 @@ var Methods = {
       tableFullData.forEach(handleCache);
     }
   },
-  loadTreeChildren: function loadTreeChildren(row, childRecords) {
+  cacheSourceMap: function cacheSourceMap(fullData) {
     var _this11 = this;
+    var treeConfig = this.treeConfig,
+      treeOpts = this.treeOpts,
+      sourceDataRowIdData = this.sourceDataRowIdData;
+    var sourceData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(fullData, true);
+    var rowkey = getRowkey(this);
+    sourceDataRowIdData = this.sourceDataRowIdData = {};
+    var handleSourceRow = function handleSourceRow(row) {
+      var rowid = getRowid(_this11, row);
+      if (eqEmptyValue(rowid)) {
+        rowid = getRowUniqueId();
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
+      }
+      sourceDataRowIdData[rowid] = {
+        row: row,
+        rowid: rowid
+      };
+    };
+    // 源数据缓存
+    if (treeConfig && !treeOpts.transform) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(sourceData, handleSourceRow, treeOpts);
+    } else {
+      sourceData.forEach(handleSourceRow);
+    }
+    this.tableSourceData = sourceData;
+  },
+  loadTreeChildren: function loadTreeChildren(row, childRecords) {
+    var _this12 = this;
     var keepSource = this.keepSource,
       tableSourceData = this.tableSourceData,
       treeOpts = this.treeOpts,
@@ -16125,22 +16333,22 @@ var Methods = {
       fullAllDataRowMap = this.fullAllDataRowMap,
       fullAllDataRowIdData = this.fullAllDataRowIdData;
     var transform = treeOpts.transform,
-      children = treeOpts.children,
-      mapChildren = treeOpts.mapChildren;
+      mapChildrenField = treeOpts.mapChildrenField;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var rest = fullAllDataRowIdData[getRowid(this, row)];
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
       if (keepSource) {
-        var rowid = getRowid(_this11, row);
+        var rowid = getRowid(_this12, row);
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableSourceData, function (item) {
-          return rowid === getRowid(_this11, item);
+          return rowid === getRowid(_this12, item);
         }, treeOpts);
         if (matchObj) {
-          matchObj.item[children] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(rows, true);
+          matchObj.item[childrenField] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(rows, true);
         }
       }
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, function (childRow, index, items, path, parent, nodes) {
-        var rowid = getRowid(_this11, childRow);
+        var rowid = getRowid(_this12, childRow);
         var rest = {
           row: childRow,
           rowid: rowid,
@@ -16157,11 +16365,11 @@ var Methods = {
         fullAllDataRowIdData[rowid] = rest;
         fullAllDataRowMap.set(childRow, rest);
       }, treeOpts);
-      row[children] = rows;
+      row[childrenField] = rows;
       if (transform) {
-        row[mapChildren] = rows;
+        row[mapChildrenField] = rows;
       }
-      _this11.updateAfterDataIndex();
+      _this12.updateAfterDataIndex();
       return rows;
     });
   },
@@ -16170,7 +16378,7 @@ var Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheColumnMap: function cacheColumnMap() {
-    var _this12 = this;
+    var _this13 = this;
     var tableFullColumn = this.tableFullColumn,
       collectColumn = this.collectColumn,
       fullColumnMap = this.fullColumnMap,
@@ -16379,18 +16587,19 @@ var Methods = {
    * @param {Row} records 行数据
    */
   defineField: function defineField(records) {
-    var _this13 = this;
+    var _this14 = this;
     var radioOpts = this.radioOpts,
       checkboxOpts = this.checkboxOpts,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
       expandOpts = this.expandOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var rowkey = getRowkey(this);
     if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
       records = [records || {}];
     }
     return records.map(function (record) {
-      _this13.tableFullColumn.forEach(function (column) {
+      _this14.tableFullColumn.forEach(function (column) {
         var field = column.field,
           editRender = column.editRender;
         if (field && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().has(record, field)) {
@@ -16414,8 +16623,8 @@ var Methods = {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(record, key, null);
         }
       });
-      if (treeConfig && treeOpts.lazy && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(record[treeOpts.children])) {
-        record[treeOpts.children] = null;
+      if (treeConfig && treeOpts.lazy && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(record[childrenField])) {
+        record[childrenField] = null;
       }
       // 必须有行数据的唯一主键，可以自行设置；也可以默认生成一个随机数
       if (eqEmptyValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(record, rowkey))) {
@@ -16430,9 +16639,9 @@ var Methods = {
    * @param {Array} records 新数据
    */
   createData: function createData(records) {
-    var _this14 = this;
+    var _this15 = this;
     return this.$nextTick().then(function () {
-      return _this14.defineField(records);
+      return _this15.defineField(records);
     });
   },
   /**
@@ -16457,7 +16666,7 @@ var Methods = {
    * 如果还额外传了 field 则还原指定的单元格数据
    */
   revertData: function revertData(rows, field) {
-    var _this15 = this;
+    var _this16 = this;
     var keepSource = this.keepSource,
       tableSourceData = this.tableSourceData,
       treeConfig = this.treeConfig;
@@ -16475,8 +16684,8 @@ var Methods = {
     }
     if (targetRows.length) {
       targetRows.forEach(function (row) {
-        if (!_this15.isInsertByRow(row)) {
-          var rowIndex = _this15.getRowIndex(row);
+        if (!_this16.isInsertByRow(row)) {
+          var rowIndex = _this16.getRowIndex(row);
           if (treeConfig && rowIndex === -1) {
             errLog('vxe.error.noTree', ['revertData']);
           }
@@ -16550,39 +16759,24 @@ var Methods = {
    * @param {String} field 字段名
    */
   isUpdateByRow: function isUpdateByRow(row, field) {
-    var _this16 = this;
     var tableFullColumn = this.tableFullColumn,
       keepSource = this.keepSource,
-      treeConfig = this.treeConfig,
-      treeOpts = this.treeOpts,
-      tableSourceData = this.tableSourceData,
+      sourceDataRowIdData = this.sourceDataRowIdData,
       fullDataRowIdData = this.fullDataRowIdData;
     if (keepSource) {
-      var oRow, property;
       var rowid = getRowid(this, row);
       // 新增的数据不需要检测
       if (!fullDataRowIdData[rowid]) {
         return false;
       }
-      if (treeConfig) {
-        var children = treeOpts.children;
-        var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableSourceData, function (item) {
-          return rowid === getRowid(_this16, item);
-        }, treeOpts);
-        row = Object.assign({}, row, _defineProperty({}, children, null));
-        if (matchObj) {
-          oRow = Object.assign({}, matchObj.item, _defineProperty({}, children, null));
-        }
-      } else {
-        var oRowIndex = fullDataRowIdData[rowid].index;
-        oRow = tableSourceData[oRowIndex];
-      }
-      if (oRow) {
+      var oldRest = sourceDataRowIdData[rowid];
+      if (oldRest) {
+        var oRow = oldRest.row;
         if (arguments.length > 1) {
           return !eqCellValue(oRow, row, field);
         }
         for (var index = 0, len = tableFullColumn.length; index < len; index++) {
-          property = tableFullColumn[index].field;
+          var property = tableFullColumn[index].field;
           if (property && !eqCellValue(oRow, row, property)) {
             return true;
           }
@@ -16647,9 +16841,9 @@ var Methods = {
       tableFullTreeData = this.tableFullTreeData,
       afterTreeFullData = this.afterTreeFullData;
     var transform = treeOpts.transform,
-      children = treeOpts.children,
-      mapChildren = treeOpts.mapChildren;
+      mapChildrenField = treeOpts.mapChildrenField;
     var checkField = checkboxOpts.checkField;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
     var rowList = [];
     if (checkField) {
@@ -16657,7 +16851,7 @@ var Methods = {
         rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, function (row) {
           return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
         }, {
-          children: transform ? mapChildren : children
+          children: transform ? mapChildrenField : childrenField
         });
       } else {
         rowList = currTableData.filter(function (row) {
@@ -16665,16 +16859,16 @@ var Methods = {
         });
       }
     } else {
-      var selection = this.selection;
+      var selectCheckboxRows = this.selectCheckboxRows;
       if (treeConfig) {
         rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, function (row) {
-          return _this17.findRowIndexOf(selection, row) > -1;
+          return _this17.findRowIndexOf(selectCheckboxRows, row) > -1;
         }, {
-          children: transform ? mapChildren : children
+          children: transform ? mapChildrenField : childrenField
         });
       } else {
         rowList = currTableData.filter(function (row) {
-          return _this17.findRowIndexOf(selection, row) > -1;
+          return _this17.findRowIndexOf(selectCheckboxRows, row) > -1;
         });
       }
     }
@@ -16699,7 +16893,7 @@ var Methods = {
           fullData.push(row);
         }
       }, {
-        children: treeOpts.mapChildren
+        children: treeOpts.mapChildrenField
       });
       this.afterFullData = fullData;
       this.updateScrollYStatus(fullData);
@@ -16924,6 +17118,7 @@ var Methods = {
       fullAllDataRowIdData = this.fullAllDataRowIdData,
       afterTreeFullData = this.afterTreeFullData,
       treeOpts = this.treeOpts;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     if (treeConfig) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, function (row, index, items, path) {
         var rowid = getRowid(_this19, row);
@@ -16950,7 +17145,7 @@ var Methods = {
           fullDataRowIdData[rowid] = rest;
         }
       }, {
-        children: treeOpts.transform ? treeOpts.mapChildren : treeOpts.children
+        children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField
       });
     } else {
       afterFullData.forEach(function (row, index) {
@@ -17115,7 +17310,7 @@ var Methods = {
    */
   showColumn: function showColumn(fieldOrColumn) {
     var column = handleFieldOrColumn(this, fieldOrColumn);
-    if (column & !column.visible) {
+    if (column && column.visible) {
       column.visible = true;
       return this.handleCustom();
     }
@@ -17752,6 +17947,7 @@ var Methods = {
   },
   updateHeight: function updateHeight() {
     this.customHeight = calcHeight(this, 'height');
+    this.customMinHeight = calcHeight(this, 'minHeight');
     this.customMaxHeight = calcHeight(this, 'maxHeight');
   },
   updateStyle: function updateStyle() {
@@ -17761,6 +17957,7 @@ var Methods = {
       fullColumnIdData = this.fullColumnIdData,
       tableColumn = this.tableColumn,
       customHeight = this.customHeight,
+      customMinHeight = this.customMinHeight,
       customMaxHeight = this.customMaxHeight,
       border = this.border,
       headerHeight = this.headerHeight,
@@ -17869,15 +18066,22 @@ var Methods = {
         } else if (layout === 'body') {
           var emptyBlockElem = elemStore["".concat(name, "-").concat(layout, "-emptyBlock")];
           if (methods_isNodeElement(wrapperElem)) {
+            var bodyMinHeight = fixedType ? customMinHeight - headerHeight - footerHeight - (showFooter ? 0 : scrollbarHeight) : customMinHeight - headerHeight - footerHeight;
+            var bodyMaxHeight = 0;
             if (customMaxHeight) {
-              wrapperElem.style.maxHeight = "".concat(fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight, "px");
-            } else {
-              if (customHeight > 0) {
-                wrapperElem.style.height = "".concat(fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight, "px");
-              } else {
-                wrapperElem.style.height = '';
+              bodyMaxHeight = Math.max(bodyMinHeight, fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight);
+              wrapperElem.style.maxHeight = "".concat(bodyMaxHeight, "px");
+            }
+            if (customHeight > 0) {
+              var bodyHeight = fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight;
+              if (bodyMaxHeight) {
+                bodyHeight = Math.min(bodyMaxHeight, bodyHeight);
               }
+              wrapperElem.style.height = "".concat(Math.max(bodyMinHeight, bodyHeight), "px");
+            } else {
+              wrapperElem.style.height = '';
             }
+            wrapperElem.style.minHeight = "".concat(bodyMinHeight, "px");
           }
 
           // 如果是固定列
@@ -18759,12 +18963,12 @@ var Methods = {
     return this.handleCheckedCheckboxRow(rows, value, true);
   },
   isCheckedByCheckboxRow: function isCheckedByCheckboxRow(row) {
-    var selection = this.selection;
+    var selectCheckboxRows = this.selectCheckboxRows;
     var checkField = this.checkboxOpts.checkField;
     if (checkField) {
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
     }
-    return this.findRowIndexOf(selection, row) > -1;
+    return this.findRowIndexOf(selectCheckboxRows, row) > -1;
   },
   isIndeterminateByCheckboxRow: function isIndeterminateByCheckboxRow(row) {
     var treeIndeterminates = this.treeIndeterminates;
@@ -18777,7 +18981,7 @@ var Methods = {
   handleSelectRow: function handleSelectRow(_ref6, value, isForce) {
     var _this33 = this;
     var row = _ref6.row;
-    var selection = this.selection,
+    var selectCheckboxRows = this.selectCheckboxRows,
       afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
@@ -18849,7 +19053,7 @@ var Methods = {
           if (this.findRowIndexOf(treeIndeterminates, row) === -1) {
             treeIndeterminates.push(row);
           }
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selection, function (item) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selectCheckboxRows, function (item) {
             return _this33.eqRow(item, row);
           });
         } else {
@@ -18859,9 +19063,9 @@ var Methods = {
               row: item
             })) {
               if (value) {
-                selection.push(item);
+                selectCheckboxRows.push(item);
               } else {
-                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selection, function (select) {
+                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selectCheckboxRows, function (select) {
                   return _this33.eqRow(select, item);
                 });
               }
@@ -18890,7 +19094,7 @@ var Methods = {
             _parentStatus = -1;
           } else {
             var _selectItems = _matchObj.items.filter(function (item) {
-              return _this33.findRowIndexOf(selection, item) > -1;
+              return _this33.findRowIndexOf(selectCheckboxRows, item) > -1;
             });
             _parentStatus = _selectItems.filter(function (item) {
               return _this33.findRowIndexOf(_vItems, item) > -1;
@@ -18905,11 +19109,11 @@ var Methods = {
           row: row
         })) {
           if (value) {
-            if (this.findRowIndexOf(selection, row) === -1) {
-              selection.push(row);
+            if (this.findRowIndexOf(selectCheckboxRows, row) === -1) {
+              selectCheckboxRows.push(row);
             }
           } else {
-            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selection, function (item) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selectCheckboxRows, function (item) {
               return _this33.eqRow(item, row);
             });
           }
@@ -18920,11 +19124,11 @@ var Methods = {
     this.checkSelectionStatus();
   },
   handleToggleCheckRowEvent: function handleToggleCheckRowEvent(evnt, params) {
-    var selection = this.selection,
+    var selectCheckboxRows = this.selectCheckboxRows,
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField;
     var row = params.row;
-    var value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : this.findRowIndexOf(selection, row) === -1;
+    var value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : this.findRowIndexOf(selectCheckboxRows, row) === -1;
     if (evnt) {
       this.triggerCheckRowEvent(evnt, params, value);
     } else {
@@ -18949,10 +19153,10 @@ var Methods = {
    * 多选，切换某一行的选中状态
    */
   toggleCheckboxRow: function toggleCheckboxRow(row) {
-    var selection = this.selection,
+    var selectCheckboxRows = this.selectCheckboxRows,
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField;
-    var value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : this.findRowIndexOf(selection, row) === -1;
+    var value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : this.findRowIndexOf(selectCheckboxRows, row) === -1;
     this.handleSelectRow({
       row: row
     }, value, true);
@@ -18963,7 +19167,7 @@ var Methods = {
     var afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
-      selection = this.selection,
+      selectCheckboxRows = this.selectCheckboxRows,
       checkboxReserveRowMap = this.checkboxReserveRowMap,
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField,
@@ -18971,7 +19175,7 @@ var Methods = {
       checkStrictly = checkboxOpts.checkStrictly,
       checkMethod = checkboxOpts.checkMethod;
     var selectRows = [];
-    var beforeSelection = treeConfig ? [] : selection.filter(function (row) {
+    var beforeSelection = treeConfig ? [] : selectCheckboxRows.filter(function (row) {
       return _this34.findRowIndexOf(afterFullData, row) === -1;
     });
     if (checkStrictly) {
@@ -19026,7 +19230,7 @@ var Methods = {
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, function (row) {
                 if (checkMethod({
                   row: row
-                }) ? 0 : _this34.findRowIndexOf(selection, row) > -1) {
+                }) ? 0 : _this34.findRowIndexOf(selectCheckboxRows, row) > -1) {
                   selectRows.push(row);
                 }
               }, treeOpts);
@@ -19041,7 +19245,7 @@ var Methods = {
              */
             if (!isForce && checkMethod) {
               selectRows = afterFullData.filter(function (row) {
-                return _this34.findRowIndexOf(selection, row) > -1 || checkMethod({
+                return _this34.findRowIndexOf(selectCheckboxRows, row) > -1 || checkMethod({
                   row: row
                 });
               });
@@ -19058,7 +19262,7 @@ var Methods = {
               selectRows = afterFullData.filter(function (row) {
                 return checkMethod({
                   row: row
-                }) ? 0 : _this34.findRowIndexOf(selection, row) > -1;
+                }) ? 0 : _this34.findRowIndexOf(selectCheckboxRows, row) > -1;
               });
             }
           }
@@ -19075,7 +19279,7 @@ var Methods = {
           });
         }
       }
-      this.selection = checkField ? [] : beforeSelection.concat(selectRows);
+      this.selectCheckboxRows = checkField ? [] : beforeSelection.concat(selectRows);
     }
     this.treeIndeterminates = [];
     this.checkSelectionStatus();
@@ -19091,7 +19295,7 @@ var Methods = {
   checkSelectionStatus: function checkSelectionStatus() {
     var _this35 = this;
     var afterFullData = this.afterFullData,
-      selection = this.selection,
+      selectCheckboxRows = this.selectCheckboxRows,
       treeIndeterminates = this.treeIndeterminates,
       checkboxOpts = this.checkboxOpts,
       treeConfig = this.treeConfig;
@@ -19151,22 +19355,22 @@ var Methods = {
             disableRows.push(row);
             return true;
           }
-          if (_this35.findRowIndexOf(selection, row) > -1) {
+          if (_this35.findRowIndexOf(selectCheckboxRows, row) > -1) {
             checkRows.push(row);
             return true;
           }
           return false;
         } : function (row) {
-          return _this35.findRowIndexOf(selection, row) > -1;
+          return _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
         });
         isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
         if (treeConfig) {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-            return _this35.findRowIndexOf(treeIndeterminates, row) > -1 || _this35.findRowIndexOf(selection, row) > -1;
+            return _this35.findRowIndexOf(treeIndeterminates, row) > -1 || _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
           });
         } else {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-            return _this35.findRowIndexOf(selection, row) > -1;
+            return _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
           });
         }
       }
@@ -19186,7 +19390,7 @@ var Methods = {
       radioReserveRow = this.radioReserveRow,
       radioOpts = this.radioOpts,
       checkboxOpts = this.checkboxOpts,
-      selection = this.selection,
+      selectCheckboxRows = this.selectCheckboxRows,
       rowExpandeds = this.rowExpandeds,
       treeExpandeds = this.treeExpandeds,
       expandOpts = this.expandOpts;
@@ -19202,7 +19406,7 @@ var Methods = {
       }
     }
     // 复选框
-    this.selection = getRecoverRow(this, selection); // 刷新多选行状态
+    this.selectCheckboxRows = getRecoverRow(this, selectCheckboxRows); // 刷新多选行状态
     // 还原保留选中状态
     if (checkboxOpts.reserve) {
       this.handleCheckedCheckboxRow(handleReserveRow(this, this.checkboxReserveRowMap), true, true);
@@ -19372,7 +19576,7 @@ var Methods = {
     }
     this.isAllSelected = false;
     this.isIndeterminate = false;
-    this.selection = [];
+    this.selectCheckboxRows = [];
     this.treeIndeterminates = [];
     return this.$nextTick();
   },
@@ -19793,12 +19997,18 @@ var Methods = {
         });
       }
       var params = {
+        $table: this,
+        $event: evnt,
         column: column,
         field: field,
         property: field,
         order: column.order,
-        sortList: this.getSortColumns()
+        sortList: this.getSortColumns(),
+        sortTime: column.sortTime
       };
+      if (this.mouseConfig && this.mouseOpts.area && this.handleSortEvent) {
+        return this.handleSortEvent(evnt, params);
+      }
       this.emitEvent('sort-change', params, evnt);
     }
   },
@@ -19848,7 +20058,10 @@ var Methods = {
       if (!remote || firstSortColumn && firstSortColumn.remoteSort) {
         this.handleTableData(true);
       }
-      return this.$nextTick().then(this.updateStyle);
+      return this.$nextTick().then(function () {
+        _this41.updateCellAreas();
+        return _this41.updateStyle();
+      });
     }
     return this.$nextTick();
   },
@@ -20051,7 +20264,19 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setAllRowExpand: function setAllRowExpand(expanded) {
-    return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
+    var treeConfig = this.treeConfig,
+      treeOpts = this.treeOpts,
+      tableFullData = this.tableFullData,
+      tableFullTreeData = this.tableFullTreeData;
+    var expandedRows = [];
+    if (treeConfig) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, function (row) {
+        expandedRows.push(row);
+      }, treeOpts);
+    } else {
+      expandedRows = tableFullData;
+    }
+    return this.setRowExpand(expandedRows, expanded);
   },
   handleAsyncRowExpand: function handleAsyncRowExpand(row) {
     var _this44 = this;
@@ -20243,9 +20468,9 @@ var Methods = {
     var treeOpts = this.treeOpts,
       treeLazyLoadeds = this.treeLazyLoadeds;
     var transform = treeOpts.transform,
-      lazy = treeOpts.lazy,
-      hasChild = treeOpts.hasChild;
-    if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
+      lazy = treeOpts.lazy;
+    var hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+    if (lazy && row[hasChildField] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(function () {
         return _this47.handleAsyncTreeExpandChilds(row);
       }).then(function () {
@@ -20383,11 +20608,11 @@ var Methods = {
   setAllTreeExpand: function setAllTreeExpand(expanded) {
     var tableFullData = this.tableFullData,
       treeOpts = this.treeOpts;
-    var lazy = treeOpts.lazy,
-      children = treeOpts.children;
+    var lazy = treeOpts.lazy;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
     var expandeds = [];
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullData, function (row) {
-      var rowChildren = row[children];
+      var rowChildren = row[childrenField];
       if (lazy || rowChildren && rowChildren.length) {
         expandeds.push(row);
       }
@@ -20410,10 +20635,10 @@ var Methods = {
       treeNodeColumn = this.treeNodeColumn;
     var reserve = treeOpts.reserve,
       lazy = treeOpts.lazy,
-      hasChild = treeOpts.hasChild,
-      children = treeOpts.children,
       accordion = treeOpts.accordion,
       toggleMethod = treeOpts.toggleMethod;
+    var childrenField = treeOpts.children || treeOpts.childrenField;
+    var hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     var result = [];
     var columnIndex = this.getColumnIndex(treeNodeColumn);
     var $columnIndex = this.getVMColumnIndex(treeNodeColumn);
@@ -20442,12 +20667,12 @@ var Methods = {
       validRows.forEach(function (row) {
         if (treeExpandeds.indexOf(row) === -1) {
           var rest = fullAllDataRowMap.get(row);
-          var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1;
+          var isLoad = lazy && row[hasChildField] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1;
           // 是否使用懒加载
           if (isLoad) {
             result.push(_this49.handleAsyncTreeExpandChilds(row));
           } else {
-            if (row[children] && row[children].length) {
+            if (row[childrenField] && row[childrenField].length) {
               treeExpandeds.push(row);
             }
           }
@@ -20932,16 +21157,16 @@ var Methods = {
    * 如果组件值 v-model 发生 change 时，调用改函数用于更新某一列编辑状态
    * 如果单元格配置了校验规则，则会进行校验
    */
-  updateStatus: function updateStatus(scope, cellValue) {
+  updateStatus: function updateStatus(slotParams, cellValue) {
     var _this57 = this;
     var customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(cellValue);
     return this.$nextTick().then(function () {
       var $refs = _this57.$refs,
         editRules = _this57.editRules,
         validStore = _this57.validStore;
-      if (scope && $refs.tableBody && editRules) {
-        var row = scope.row,
-          column = scope.column;
+      if (slotParams && $refs.tableBody && editRules) {
+        var row = slotParams.row,
+          column = slotParams.column;
         var type = 'change';
         if (_this57.hasCellRules(type, row, column)) {
           var cell = _this57.getCell(row, column);
@@ -21132,11 +21357,11 @@ var Methods = {
         columnIndex: this.getColumnIndex(column)
       };
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
-        var globalFunc = formats.get(formatter);
-        cellLabel = globalFunc ? globalFunc(formatParams) : '';
+        var gFormatOpts = formats.get(formatter);
+        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
       } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
-        var _globalFunc = formats.get(formatter[0]);
-        cellLabel = _globalFunc ? _globalFunc.apply(void 0, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
+        var _gFormatOpts = formats.get(formatter[0]);
+        cellLabel = _gFormatOpts && _gFormatOpts.cellFormatMethod ? _gFormatOpts.cellFormatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
       } else {
         cellLabel = formatter(formatParams);
       }
@@ -21264,6 +21489,7 @@ var Loading = Object.assign(loading, {
 
 
 
+
 
 
 /**
@@ -21354,6 +21580,13 @@ function handleUupdateResize(_vm) {
     data: Array,
     // 表格的高度
     height: [Number, String],
+    // 表格的最小高度
+    minHeight: {
+      type: [Number, String],
+      "default": function _default() {
+        return conf.table.minHeight;
+      }
+    },
     // 表格的最大高度
     maxHeight: [Number, String],
     // 已废弃，被 column-config.resizable 替换
@@ -21675,7 +21908,7 @@ function handleUupdateResize(_vm) {
       // 复选框属性，有选中且非全选状态
       isIndeterminate: false,
       // 复选框属性，已选中的行
-      selection: [],
+      selectCheckboxRows: [],
       // 当前行
       currentRow: null,
       // 单选框属性，选中列
@@ -22273,6 +22506,7 @@ function handleUupdateResize(_vm) {
     this.preventEvent(null, 'destroyed');
   },
   render: function render(h) {
+    var _ref;
     var _e = this._e,
       $scopedSlots = this.$scopedSlots,
       tId = this.tId,
@@ -22311,33 +22545,12 @@ function handleUupdateResize(_vm) {
       hasTip = this.hasTip,
       columnOpts = this.columnOpts,
       rowOpts = this.rowOpts,
-      loadingOpts = this.loadingOpts;
+      loadingOpts = this.loadingOpts,
+      editRules = this.editRules;
     var leftList = columnStore.leftList,
       rightList = columnStore.rightList;
     return h('div', {
-      "class": ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), {
-        'vxe-editable': !!editConfig,
-        'cell--highlight': highlightCell,
-        'cell--selected': mouseConfig && mouseOpts.selected,
-        'cell--area': mouseConfig && mouseOpts.area,
-        'row--highlight': rowOpts.isHover || highlightHoverRow,
-        'column--highlight': columnOpts.isHover || highlightHoverColumn,
-        'is--header': showHeader,
-        'is--footer': showFooter,
-        'is--group': isGroup,
-        'is--tree-line': treeConfig && treeOpts.line,
-        'is--fixed-left': leftList.length,
-        'is--fixed-right': rightList.length,
-        'is--animat': !!this.animat,
-        'is--round': this.round,
-        'is--stripe': !treeConfig && stripe,
-        'is--loading': loading,
-        'is--empty': !loading && !tableData.length,
-        'is--scroll-y': overflowY,
-        'is--scroll-x': overflowX,
-        'is--virtual-x': scrollXLoad,
-        'is--virtual-y': scrollYLoad
-      }],
+      "class": ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), (_ref = {}, _defineProperty(_ref, "vaild-msg--".concat(validOpts.msgMode), !!editRules), _defineProperty(_ref, 'vxe-editable', !!editConfig), _defineProperty(_ref, 'cell--highlight', highlightCell), _defineProperty(_ref, 'cell--selected', mouseConfig && mouseOpts.selected), _defineProperty(_ref, 'cell--area', mouseConfig && mouseOpts.area), _defineProperty(_ref, 'row--highlight', rowOpts.isHover || highlightHoverRow), _defineProperty(_ref, 'column--highlight', columnOpts.isHover || highlightHoverColumn), _defineProperty(_ref, 'is--header', showHeader), _defineProperty(_ref, 'is--footer', showFooter), _defineProperty(_ref, 'is--group', isGroup), _defineProperty(_ref, 'is--tree-line', treeConfig && (treeOpts.showLine || treeOpts.line)), _defineProperty(_ref, 'is--fixed-left', leftList.length), _defineProperty(_ref, 'is--fixed-right', rightList.length), _defineProperty(_ref, 'is--animat', !!this.animat), _defineProperty(_ref, 'is--round', this.round), _defineProperty(_ref, 'is--stripe', !treeConfig && stripe), _defineProperty(_ref, 'is--loading', loading), _defineProperty(_ref, 'is--empty', !loading && !tableData.length), _defineProperty(_ref, 'is--scroll-y', overflowY), _defineProperty(_ref, 'is--scroll-x', overflowX), _defineProperty(_ref, 'is--virtual-x', scrollXLoad), _defineProperty(_ref, 'is--virtual-y', scrollYLoad), _ref)],
       on: {
         keydown: this.keydownEvent
       }
@@ -22956,12 +23169,9 @@ var Table = Object.assign(table, {
         }
       });
       var filterList = this.getCheckedFilters();
-      // 如果是服务端筛选，则跳过本地筛选处理
-      if (!filterOpts.remote) {
-        this.handleTableData(true);
-        this.checkSelectionStatus();
-      }
-      this.emitEvent('filter-change', {
+      var params = {
+        $table: this,
+        $event: evnt,
         column: column,
         field: field,
         property: field,
@@ -22969,7 +23179,16 @@ var Table = Object.assign(table, {
         datas: datas,
         filters: filterList,
         filterList: filterList
-      }, evnt);
+      };
+      // 如果是服务端筛选，则跳过本地筛选处理
+      if (!filterOpts.remote) {
+        this.handleTableData(true);
+        this.checkSelectionStatus();
+      }
+      if (this.mouseConfig && this.mouseOpts.area && this.handleFilterEvent) {
+        this.handleFilterEvent(evnt, params);
+      }
+      this.emitEvent('filter-change', params, evnt);
       this.closeFilter();
       this.updateFooter().then(function () {
         var scrollXLoad = _this2.scrollXLoad,
@@ -23473,15 +23692,15 @@ var Filter = {
     ctxMenuLinkEvent: function ctxMenuLinkEvent(evnt, menu) {
       // 如果一级菜单有配置 code 则允许点击，否则不能点击
       if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
-        var ctxMenuMethod = v_x_e_table.menus.get(menu.code);
+        var gMenuOpts = v_x_e_table.menus.get(menu.code);
         var params = Object.assign({
           menu: menu,
           $grid: this.$xegrid,
           $table: this,
           $event: evnt
         }, this.ctxMenuStore.args);
-        if (ctxMenuMethod) {
-          ctxMenuMethod.call(this, params, evnt);
+        if (gMenuOpts && gMenuOpts.menuMethod) {
+          gMenuOpts.menuMethod(params, evnt);
         }
         // 在 v4 中废弃事件 context-menu-click
         if (this.$listeners['context-menu-click']) {
@@ -23549,8 +23768,8 @@ function insertTreeRow(_vm, newRecords, isAppend) {
     treeOpts = _vm.treeOpts;
   var rowField = treeOpts.rowField,
     parentField = treeOpts.parentField,
-    children = treeOpts.children,
-    mapChildren = treeOpts.mapChildren;
+    mapChildrenField = treeOpts.mapChildrenField;
+  var childrenField = treeOpts.children || treeOpts.childrenField;
   var funcName = isAppend ? 'push' : 'unshift';
   newRecords.forEach(function (item) {
     var parentRowId = item[parentField];
@@ -23558,15 +23777,15 @@ function insertTreeRow(_vm, newRecords, isAppend) {
     var matchObj = parentRowId ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
       return parentRowId === item[rowField];
     }, {
-      children: mapChildren
+      children: mapChildrenField
     }) : null;
     if (matchObj) {
       var parentRow = matchObj.item;
       var parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)];
       var parentLevel = parentRest ? parentRest.level : 0;
-      var parentChilds = parentRow[children];
+      var parentChilds = parentRow[childrenField];
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(parentChilds)) {
-        parentChilds = parentRow[children] = [];
+        parentChilds = parentRow[childrenField] = [];
       }
       parentChilds[funcName](item);
       var rest = {
@@ -23633,7 +23852,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         treeOpts = this.treeOpts;
       var transform = treeOpts.transform,
         rowField = treeOpts.rowField,
-        mapChildren = treeOpts.mapChildren;
+        mapChildrenField = treeOpts.mapChildrenField;
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
         records = [records];
       }
@@ -23678,7 +23897,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
             var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullTreeData, function (item) {
               return row[rowField] === item[rowField];
             }, {
-              children: mapChildren
+              children: mapChildrenField
             });
             if (matchObj) {
               var parentRow = matchObj.parent;
@@ -23784,7 +24003,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         mergeList = this.mergeList,
         editStore = this.editStore,
         checkboxOpts = this.checkboxOpts,
-        selection = this.selection,
+        selectCheckboxRows = this.selectCheckboxRows,
         isInsertByRow = this.isInsertByRow,
         treeOpts = this.treeOpts;
       var transform = treeOpts.transform;
@@ -23808,9 +24027,9 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       // 如果绑定了多选属性，则更新状态
       if (!checkField) {
         rows.forEach(function (row) {
-          var sIndex = _this2.findRowIndexOf(selection, row);
+          var sIndex = _this2.findRowIndexOf(selectCheckboxRows, row);
           if (sIndex > -1) {
-            selection.splice(sIndex, 1);
+            selectCheckboxRows.splice(sIndex, 1);
           }
         });
       }
@@ -26196,7 +26415,12 @@ function renderExtraSuffixIcon(h, _vm) {
     },
     readonly: Boolean,
     disabled: Boolean,
-    placeholder: String,
+    placeholder: {
+      type: String,
+      "default": function _default() {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(conf.input.placeholder) ? conf.i18n('vxe.base.pleaseInput') : conf.input.placeholder;
+      }
+    },
     maxlength: [String, Number],
     autocomplete: {
       type: String,
@@ -26888,6 +27112,11 @@ function renderExtraSuffixIcon(h, _vm) {
       this.isActivated = false;
       return this.$nextTick();
     },
+    select: function select() {
+      this.$refs.input.select();
+      this.isActivated = false;
+      return this.$nextTick();
+    },
     triggerEvent: function triggerEvent(evnt) {
       var $refs = this.$refs,
         inputValue = this.inputValue;
@@ -28396,7 +28625,12 @@ function renderOpts(h, _vm) {
   props: {
     value: null,
     clearable: Boolean,
-    placeholder: String,
+    placeholder: {
+      type: String,
+      "default": function _default() {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(conf.select.placeholder) ? conf.i18n('vxe.base.pleaseSelect') : conf.select.placeholder;
+      }
+    },
     loading: Boolean,
     disabled: Boolean,
     multiple: Boolean,
@@ -28414,6 +28648,7 @@ function renderOpts(h, _vm) {
     optionGroupProps: Object,
     optionConfig: Object,
     className: [String, Function],
+    popupClassName: [String, Function],
     max: [String, Number],
     size: {
       type: String,
@@ -28601,6 +28836,7 @@ function renderOpts(h, _vm) {
       $scopedSlots = this.$scopedSlots,
       vSize = this.vSize,
       className = this.className,
+      popupClassName = this.popupClassName,
       inited = this.inited,
       isActivated = this.isActivated,
       loading = this.loading,
@@ -28641,7 +28877,9 @@ function renderOpts(h, _vm) {
       } : {}
     }), h('div', {
       ref: 'panel',
-      "class": ['vxe-table--ignore-clear vxe-select--panel', (_ref2 = {}, _defineProperty(_ref2, "size--".concat(vSize), vSize), _defineProperty(_ref2, 'is--transfer', this.transfer), _defineProperty(_ref2, 'animat--leave', !loading && this.animatVisible), _defineProperty(_ref2, 'animat--enter', !loading && visiblePanel), _ref2)],
+      "class": ['vxe-table--ignore-clear vxe-select--panel', popupClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(popupClassName) ? popupClassName({
+        $select: this
+      }) : popupClassName : '', (_ref2 = {}, _defineProperty(_ref2, "size--".concat(vSize), vSize), _defineProperty(_ref2, 'is--transfer', this.transfer), _defineProperty(_ref2, 'animat--leave', !loading && this.animatVisible), _defineProperty(_ref2, 'animat--enter', !loading && visiblePanel), _ref2)],
       attrs: {
         placement: this.panelPlacement
       },
@@ -30082,7 +30320,8 @@ function getExportBlobByContent(content, options) {
 }
 function hasTreeChildren($xetable, row) {
   var treeOpts = $xetable.treeOpts;
-  return row[treeOpts.children] && row[treeOpts.children].length > 0;
+  var childrenField = treeOpts.children || treeOpts.childrenField;
+  return row[childrenField] && row[childrenField].length > 0;
 }
 function getSeq($xetable, row, $rowIndex, column, $columnIndex) {
   var seqOpts = $xetable.seqOpts;
@@ -30120,7 +30359,8 @@ function getLabelData($xetable, opts, columns, datas) {
   var treeConfig = $xetable.treeConfig,
     treeOpts = $xetable.treeOpts,
     radioOpts = $xetable.radioOpts,
-    checkboxOpts = $xetable.checkboxOpts;
+    checkboxOpts = $xetable.checkboxOpts,
+    columnOpts = $xetable.columnOpts;
   if (!htmlCellElem) {
     htmlCellElem = document.createElement('div');
   }
@@ -30142,15 +30382,18 @@ function getLabelData($xetable, opts, columns, datas) {
         columns.forEach(function (column, $columnIndex) {
           var cellValue = '';
           var renderOpts = column.editRender || column.cellRender;
-          var exportLabelMethod = column.exportMethod;
-          if (!exportLabelMethod && renderOpts && renderOpts.name) {
+          var bodyExportMethod = column.exportMethod;
+          if (!bodyExportMethod && renderOpts && renderOpts.name) {
             var compConf = v_x_e_table.renderer.get(renderOpts.name);
             if (compConf) {
-              exportLabelMethod = compConf.exportMethod || compConf.cellExportMethod;
+              bodyExportMethod = compConf.exportMethod || compConf.cellExportMethod;
             }
           }
-          if (exportLabelMethod) {
-            cellValue = exportLabelMethod({
+          if (!bodyExportMethod) {
+            bodyExportMethod = columnOpts.exportMethod;
+          }
+          if (bodyExportMethod) {
+            cellValue = bodyExportMethod({
               $table: $xetable,
               row: row,
               column: column,
@@ -30282,23 +30525,29 @@ function getBooleanValue(cellValue) {
   return cellValue === 'TRUE' || cellValue === 'true' || cellValue === true;
 }
 function getHeaderTitle($xetable, opts, column) {
-  var headerExportMethod = column.headerExportMethod;
-  return headerExportMethod ? headerExportMethod({
+  var columnOpts = $xetable.columnOpts;
+  var headExportMethod = column.headerExportMethod || columnOpts.headerExportMethod;
+  return headExportMethod ? headExportMethod({
     column: column,
+    options: opts,
     $table: $xetable
   }) : (opts.original ? column.property : column.getTitle()) || '';
 }
 function getFooterCellValue($xetable, opts, items, column) {
+  var columnOpts = $xetable.columnOpts;
   var renderOpts = column.editRender || column.cellRender;
-  var exportLabelMethod = column.footerExportMethod;
-  if (!exportLabelMethod && renderOpts && renderOpts.name) {
+  var footLabelMethod = column.footerExportMethod;
+  if (!footLabelMethod && renderOpts && renderOpts.name) {
     var compConf = v_x_e_table.renderer.get(renderOpts.name);
     if (compConf) {
-      exportLabelMethod = compConf.footerExportMethod || compConf.footerCellExportMethod;
+      footLabelMethod = compConf.footerExportMethod || compConf.footerCellExportMethod;
     }
   }
+  if (!footLabelMethod) {
+    footLabelMethod = columnOpts.footerExportMethod;
+  }
   var _columnIndex = $xetable.getVTColumnIndex(column);
-  var cellValue = exportLabelMethod ? exportLabelMethod({
+  var cellValue = footLabelMethod ? footLabelMethod({
     $table: $xetable,
     items: items,
     itemIndex: _columnIndex,
@@ -32143,6 +32392,8 @@ var Keyboard = {
 
 
 
+
+
 
 
 
@@ -32213,12 +32464,14 @@ function validErrorRuleValue(rule, val) {
      * 完整校验，和 validate 的区别就是会给有效数据中的每一行进行校验
      */
     _fullValidate: function _fullValidate(rows, cb) {
+      if (false) {}
       return this.beginValidate(rows, cb, true);
     },
     /**
      * 快速校验，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
      */
     _validate: function _validate(rows, cb) {
+      if (false) {}
       return this.beginValidate(rows, cb);
     },
     /**
@@ -32410,10 +32663,11 @@ function validErrorRuleValue(rule, val) {
           rules.forEach(function (rule) {
             var type = rule.type,
               trigger = rule.trigger,
-              required = rule.required;
+              required = rule.required,
+              validator = rule.validator;
             if (validType === 'all' || !trigger || validType === trigger) {
-              if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rule.validator)) {
-                var customValid = rule.validator({
+              if (validator) {
+                var validParams = {
                   cellValue: cellValue,
                   rule: rule,
                   rules: rules,
@@ -32423,7 +32677,22 @@ function validErrorRuleValue(rule, val) {
                   columnIndex: _this3.getColumnIndex(column),
                   field: column.property,
                   $table: _this3
-                });
+                };
+                var customValid;
+                if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(validator)) {
+                  var gvItem = v_x_e_table.validators.get(validator);
+                  if (gvItem) {
+                    if (gvItem.cellValidatorMethod) {
+                      customValid = gvItem.cellValidatorMethod(validParams);
+                    } else {
+                      if (false) {}
+                    }
+                  } else {
+                    if (false) {}
+                  }
+                } else {
+                  customValid = validator(validParams);
+                }
                 if (customValid) {
                   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(customValid)) {
                     _this3.validRuleErr = true;
@@ -33990,14 +34259,16 @@ Object.keys(packages_table.methods).forEach(function (name) {
           }
         default:
           {
-            var btnMethod = v_x_e_table.commands.get(code);
-            if (btnMethod) {
-              btnMethod.apply(void 0, [{
+            var gCommandOpts = v_x_e_table.commands.get(code);
+            if (gCommandOpts.commandMethod) {
+              gCommandOpts.commandMethod.apply(gCommandOpts, [{
                 code: code,
                 button: button,
                 $grid: this,
                 $table: $xetable
               }].concat(args));
+            } else {
+              if (false) {}
             }
           }
       }
@@ -34703,7 +34974,8 @@ function renderCustoms(h, _vm) {
   created: function created() {
     var _this = this;
     var refresh = this.refresh,
-      refreshOpts = this.refreshOpts;
+      refreshOpts = this.refreshOpts,
+      customOpts = this.customOpts;
     this.$nextTick(function () {
       var $xetable = _this.fintTable();
       var queryMethod = refreshOpts.queryMethod || refreshOpts.query;
@@ -35031,7 +35303,7 @@ function renderCustoms(h, _vm) {
         if ($xegrid) {
           $xegrid.triggerToolbarBtnEvent(item, evnt);
         } else {
-          var commandMethod = v_x_e_table.commands.get(code);
+          var gCommandOpts = v_x_e_table.commands.get(code);
           var params = {
             code: code,
             button: item,
@@ -35039,8 +35311,12 @@ function renderCustoms(h, _vm) {
             $grid: $xegrid,
             $event: evnt
           };
-          if (commandMethod) {
-            commandMethod.call(this, params, evnt);
+          if (gCommandOpts) {
+            if (gCommandOpts.commandMethod) {
+              gCommandOpts.commandMethod(params);
+            } else {
+              if (false) {}
+            }
           }
           this.$emit('button-click', params);
         }
@@ -35054,7 +35330,7 @@ function renderCustoms(h, _vm) {
         if ($xegrid) {
           $xegrid.triggerToolbarTolEvent(item, evnt);
         } else {
-          var commandMethod = v_x_e_table.commands.get(code);
+          var gCommandOpts = v_x_e_table.commands.get(code);
           var params = {
             code: code,
             tool: item,
@@ -35062,8 +35338,12 @@ function renderCustoms(h, _vm) {
             $table: $xetable,
             $event: evnt
           };
-          if (commandMethod) {
-            commandMethod.call(this, params, evnt);
+          if (gCommandOpts) {
+            if (gCommandOpts.commandMethod) {
+              gCommandOpts.commandMethod(params);
+            } else {
+              if (false) {}
+            }
           }
           this.$emit('tool-click', params);
         }
@@ -35941,7 +36221,12 @@ var autoTxtElem;
     name: String,
     readonly: Boolean,
     disabled: Boolean,
-    placeholder: String,
+    placeholder: {
+      type: String,
+      "default": function _default() {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(conf.textarea.placeholder) ? conf.i18n('vxe.base.pleaseInput') : conf.textarea.placeholder;
+      }
+    },
     maxlength: [String, Number],
     rows: {
       type: [String, Number],
@@ -36230,7 +36515,8 @@ var Textarea = Object.assign(src_textarea, {
     disabled: Boolean,
     loading: Boolean,
     destroyOnClose: Boolean,
-    className: String,
+    className: [String, Function],
+    popupClassName: [String, Function],
     transfer: {
       type: Boolean,
       "default": function _default() {
@@ -36280,6 +36566,7 @@ var Textarea = Object.assign(src_textarea, {
     var $scopedSlots = this.$scopedSlots,
       $listeners = this.$listeners,
       className = this.className,
+      popupClassName = this.popupClassName,
       inited = this.inited,
       type = this.type,
       destroyOnClose = this.destroyOnClose,
@@ -36295,7 +36582,9 @@ var Textarea = Object.assign(src_textarea, {
       panelPlacement = this.panelPlacement;
     var downsSlot = $scopedSlots.dropdowns;
     return downsSlot ? h('div', {
-      "class": ['vxe-button--dropdown', className, (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--active', showPanel), _ref)]
+      "class": ['vxe-button--dropdown', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
+        $button: this
+      }) : className : '', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--active', showPanel), _ref)]
     }, [h('button', {
       ref: 'xBtn',
       "class": ['vxe-button', "type--".concat(btnType), (_ref2 = {}, _defineProperty(_ref2, "size--".concat(vSize), vSize), _defineProperty(_ref2, "theme--".concat(status), status), _defineProperty(_ref2, 'is--round', this.round), _defineProperty(_ref2, 'is--circle', this.circle), _defineProperty(_ref2, 'is--disabled', disabled || loading), _defineProperty(_ref2, 'is--loading', loading), _ref2)],
@@ -36318,7 +36607,9 @@ var Textarea = Object.assign(src_textarea, {
       "class": "vxe-button--dropdown-arrow ".concat(conf.icon.BUTTON_DROPDOWN)
     })])), h('div', {
       ref: 'panel',
-      "class": ['vxe-button--dropdown-panel', (_ref3 = {}, _defineProperty(_ref3, "size--".concat(vSize), vSize), _defineProperty(_ref3, 'animat--leave', animatVisible), _defineProperty(_ref3, 'animat--enter', showPanel), _ref3)],
+      "class": ['vxe-button--dropdown-panel', popupClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(popupClassName) ? popupClassName({
+        $button: this
+      }) : popupClassName : '', (_ref3 = {}, _defineProperty(_ref3, "size--".concat(vSize), vSize), _defineProperty(_ref3, 'animat--leave', animatVisible), _defineProperty(_ref3, 'animat--enter', showPanel), _ref3)],
       attrs: {
         placement: panelPlacement
       },
@@ -36820,6 +37111,7 @@ function renderContent(h, _vm) {
     },
     useHTML: Boolean,
     zIndex: [String, Number],
+    popupClassName: [String, Function],
     isArrow: {
       type: Boolean,
       "default": true
@@ -36929,6 +37221,7 @@ function renderContent(h, _vm) {
     var _ref;
     var $scopedSlots = this.$scopedSlots,
       vSize = this.vSize,
+      popupClassName = this.popupClassName,
       theme = this.theme,
       tipActive = this.tipActive,
       isArrow = this.isArrow,
@@ -36943,7 +37236,9 @@ function renderContent(h, _vm) {
       };
     }
     return h('div', {
-      "class": ['vxe-table--tooltip-wrapper', "theme--".concat(theme), (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, "placement--".concat(tipStore.placement), tipStore.placement), _defineProperty(_ref, 'is--enterable', enterable), _defineProperty(_ref, 'is--visible', visible), _defineProperty(_ref, 'is--arrow', isArrow), _defineProperty(_ref, 'is--actived', tipActive), _ref)],
+      "class": ['vxe-table--tooltip-wrapper', "theme--".concat(theme), popupClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(popupClassName) ? popupClassName({
+        $tooltip: this
+      }) : popupClassName : '', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, "placement--".concat(tipStore.placement), tipStore.placement), _defineProperty(_ref, 'is--enterable', enterable), _defineProperty(_ref, 'is--visible', visible), _defineProperty(_ref, 'is--arrow', isArrow), _defineProperty(_ref, 'is--actived', tipActive), _ref)],
       style: tipStore.style,
       ref: 'tipWrapper',
       on: on
@@ -37923,7 +38218,9 @@ function getResetValue(value, resetValue) {
     validateField: function validateField(fieldOrItem, callback) {
       var _this7 = this;
       var fields = [];
-      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
+        fields = fieldOrItem;
+      } else {
         fields = [fieldOrItem];
       }
       return this.beginValidate(fields.map(function (field) {
@@ -38021,10 +38318,11 @@ function getResetValue(value, resetValue) {
             rules.forEach(function (rule) {
               var type = rule.type,
                 trigger = rule.trigger,
-                required = rule.required;
+                required = rule.required,
+                validator = rule.validator;
               if (validType === 'all' || !trigger || validType === rule.trigger) {
-                if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rule.validator)) {
-                  var customValid = rule.validator({
+                if (validator) {
+                  var validParams = {
                     itemValue: itemValue,
                     rule: rule,
                     rules: rules,
@@ -38032,7 +38330,22 @@ function getResetValue(value, resetValue) {
                     field: property,
                     property: property,
                     $form: _this9
-                  });
+                  };
+                  var customValid;
+                  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(validator)) {
+                    var gvItem = v_x_e_table.validators.get(validator);
+                    if (gvItem) {
+                      if (gvItem.itemValidatorMethod) {
+                        customValid = gvItem.itemValidatorMethod(validParams);
+                      } else {
+                        if (false) {}
+                      }
+                    } else {
+                      if (false) {}
+                    }
+                  } else {
+                    customValid = validator(validParams);
+                  }
                   if (customValid) {
                     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(customValid)) {
                       errorRules.push(new form_Rule({
@@ -39066,6 +39379,7 @@ var List = Object.assign(list, {
 
 
 
+
 /* harmony default export */ const pulldown = ({
   name: 'VxePulldown',
   mixins: [size],
@@ -39079,6 +39393,8 @@ var List = Object.assign(list, {
         return conf.size;
       }
     },
+    className: [String, Function],
+    popupClassName: [String, Function],
     destroyOnClose: Boolean,
     transfer: Boolean
   },
@@ -39123,6 +39439,8 @@ var List = Object.assign(list, {
     var _ref, _ref2;
     var $scopedSlots = this.$scopedSlots,
       inited = this.inited,
+      className = this.className,
+      popupClassName = this.popupClassName,
       vSize = this.vSize,
       destroyOnClose = this.destroyOnClose,
       transfer = this.transfer,
@@ -39135,7 +39453,9 @@ var List = Object.assign(list, {
     var defaultSlot = $scopedSlots["default"];
     var downSlot = $scopedSlots.dropdown;
     return h('div', {
-      "class": ['vxe-pulldown', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--visivle', visiblePanel), _defineProperty(_ref, 'is--disabled', disabled), _defineProperty(_ref, 'is--active', isActivated), _ref)]
+      "class": ['vxe-pulldown', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
+        $pulldown: this
+      }) : className : '', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--visivle', visiblePanel), _defineProperty(_ref, 'is--disabled', disabled), _defineProperty(_ref, 'is--active', isActivated), _ref)]
     }, [h('div', {
       ref: 'content',
       "class": 'vxe-pulldown--content'
@@ -39143,7 +39463,9 @@ var List = Object.assign(list, {
       $pulldown: this
     }, h) : []), h('div', {
       ref: 'panel',
-      "class": ['vxe-table--ignore-clear vxe-pulldown--panel', (_ref2 = {}, _defineProperty(_ref2, "size--".concat(vSize), vSize), _defineProperty(_ref2, 'is--transfer', transfer), _defineProperty(_ref2, 'animat--leave', animatVisible), _defineProperty(_ref2, 'animat--enter', visiblePanel), _ref2)],
+      "class": ['vxe-table--ignore-clear vxe-pulldown--panel', popupClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(popupClassName) ? popupClassName({
+        $pulldown: this
+      }) : popupClassName : '', (_ref2 = {}, _defineProperty(_ref2, "size--".concat(vSize), vSize), _defineProperty(_ref2, 'is--transfer', transfer), _defineProperty(_ref2, 'animat--leave', animatVisible), _defineProperty(_ref2, 'animat--enter', visiblePanel), _ref2)],
       attrs: {
         placement: panelPlacement
       },
@@ -39358,6 +39680,10 @@ var Pulldown = Object.assign(pulldown, {
 ;// CONCATENATED MODULE: ./packages/locale/lang/zh-CN.js
 /* harmony default export */ const zh_CN = ({
   vxe: {
+    base: {
+      pleaseInput: '请输入',
+      pleaseSelect: '请选择'
+    },
     loading: {
       text: '加载中...'
     },
@@ -39377,6 +39703,10 @@ var Pulldown = Object.assign(pulldown, {
       errProp: '不支持的参数 "{0}"，可能为 "{1}"',
       colRepet: 'column.{0}="{1}" 重复了，这可能会导致某些功能无法使用',
       notFunc: '方法 "{0}" 不存在',
+      errFunc: '参数 "{0}" 不是一个方法',
+      notValidators: '全局校验 "{0}" 不存在',
+      notFormats: '全局格式化 "{0}" 不存在',
+      notCommands: '全局指令 "{0}" 不存在',
       notSlot: '插槽 "{0}" 不存在',
       noTree: '树结构不支持 "{0}"',
       notProp: '不支持的参数 "{0}"',