vxe-table 3.7.0-beta.6 → 3.7.0-beta.7

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
@@ -11042,7 +11045,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.7.0-beta.5", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.7.0-beta.6", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12056,8 +12059,181 @@ 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
+
+
+
+
+
+
+
+
+
+
+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)) {
+        // warnLog('vxe.error.delProp', ['callback', 'commandMethod'])
+        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)) {
+        // warnLog('vxe.error.delProp', ['callback', 'menuMethod'])
+        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)) {
+        // warnLog('vxe.error.delProp', ['callback', 'formatMethod'])
+        render = {
+          formatMethod: 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 +12254,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 +12285,10 @@ var Store = /*#__PURE__*/function () {
   return Store;
 }();
 /* harmony default export */ const store = (Store);
-;// CONCATENATED MODULE: ./packages/v-x-e-table/src/commands.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
+;// CONCATENATED MODULE: ./packages/v-x-e-table/src/validators.js
 
 
-var formats = new store();
+var validators = new store();
 if (false) {}
 ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/setup.js
 
@@ -12146,6 +12315,7 @@ function setup(options) {
 
 
 
+
 var installedPlugins = [];
 function use(Plugin, options) {
   /* eslint-disable @typescript-eslint/no-use-before-define */
@@ -12229,7 +12399,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.7.0-beta.5",
+  version: "3.7.0-beta.6",
   reg: reg,
   use: use,
   setup: setup,
@@ -12238,6 +12408,7 @@ var VXETable = {
   commands: commands,
   formats: formats,
   menus: menus,
+  validators: validators,
   config: config,
   t: t,
   _t: _t
@@ -12367,7 +12538,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,
@@ -15276,6 +15447,7 @@ var Cell = {
       },
       on: {
         click: function click(evnt) {
+          evnt.stopPropagation();
           $table.triggerSortEvent(evnt, column, 'asc');
         }
       }
@@ -15288,6 +15460,7 @@ var Cell = {
       },
       on: {
         click: function click(evnt) {
+          evnt.stopPropagation();
           $table.triggerSortEvent(evnt, column, 'desc');
         }
       }
@@ -17764,6 +17937,7 @@ var Methods = {
   },
   updateHeight: function updateHeight() {
     this.customHeight = calcHeight(this, 'height');
+    this.customMinHeight = calcHeight(this, 'minHeight');
     this.customMaxHeight = calcHeight(this, 'maxHeight');
   },
   updateStyle: function updateStyle() {
@@ -17773,6 +17947,7 @@ var Methods = {
       fullColumnIdData = this.fullColumnIdData,
       tableColumn = this.tableColumn,
       customHeight = this.customHeight,
+      customMinHeight = this.customMinHeight,
       customMaxHeight = this.customMaxHeight,
       border = this.border,
       headerHeight = this.headerHeight,
@@ -17881,15 +18056,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");
           }
 
           // 如果是固定列
@@ -19805,12 +19987,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);
     }
   },
@@ -20066,7 +20254,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;
@@ -20947,16 +21147,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);
@@ -21147,11 +21347,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.formatMethod ? gFormatOpts.formatMethod(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.formatMethod ? _gFormatOpts.formatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
       } else {
         cellLabel = formatter(formatParams);
       }
@@ -21279,6 +21479,7 @@ var Loading = Object.assign(loading, {
 
 
 
+
 
 
 /**
@@ -21369,6 +21570,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 替换
@@ -22288,6 +22496,7 @@ function handleUupdateResize(_vm) {
     this.preventEvent(null, 'destroyed');
   },
   render: function render(h) {
+    var _ref;
     var _e = this._e,
       $scopedSlots = this.$scopedSlots,
       tId = this.tId,
@@ -22326,33 +22535,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.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
       }
@@ -22971,12 +23159,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,
@@ -22984,7 +23169,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,
@@ -23488,15 +23682,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']) {
@@ -26211,7 +26405,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,
@@ -28416,7 +28615,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,
@@ -32177,6 +32381,8 @@ var Keyboard = {
 
 
 
+
+
 
 
 
@@ -32444,10 +32650,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,
@@ -32457,7 +32664,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;
@@ -34024,14 +34246,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) {}
             }
           }
       }
@@ -35065,7 +35289,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,
@@ -35073,8 +35297,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);
         }
@@ -35088,7 +35316,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,
@@ -35096,8 +35324,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);
         }
@@ -35975,7 +36207,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],
@@ -38067,10 +38304,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,
@@ -38078,7 +38316,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({
@@ -39413,6 +39666,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: '加载中...'
     },
@@ -39432,6 +39689,9 @@ var Pulldown = Object.assign(pulldown, {
       errProp: '不支持的参数 "{0}"，可能为 "{1}"',
       colRepet: 'column.{0}="{1}" 重复了，这可能会导致某些功能无法使用',
       notFunc: '方法 "{0}" 不存在',
+      notValidators: '全局校验 "{0}" 不存在',
+      notFormats: '全局格式化 "{0}" 不存在',
+      notCommands: '全局指令 "{0}" 不存在',
       notSlot: '插槽 "{0}" 不存在',
       noTree: '树结构不支持 "{0}"',
       notProp: '不支持的参数 "{0}"',