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

package/lib/validator/src/mixin.js

@@ -5,8 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
+var _vXETable = _interopRequireDefault(require("../../v-x-e-table"));
 var _conf = _interopRequireDefault(require("../../v-x-e-table/src/conf"));
 var _utils = require("../../tools/utils");
+var _log = require("../../tools/log");
 var _dom = _interopRequireDefault(require("../../tools/dom"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -79,12 +81,22 @@ var _default = {
      * 完整校验，和 validate 的区别就是会给有效数据中的每一行进行校验
      */
     _fullValidate: function _fullValidate(rows, cb) {
+      if (process.env.NODE_ENV === 'development') {
+        if (_xeUtils["default"].isFunction(cb)) {
+          (0, _log.warnLog)('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)']);
+        }
+      }
       return this.beginValidate(rows, cb, true);
     },
     /**
      * 快速校验，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
      */
     _validate: function _validate(rows, cb) {
+      if (process.env.NODE_ENV === 'development') {
+        if (_xeUtils["default"].isFunction(cb)) {
+          (0, _log.warnLog)('vxe.error.notValidators', ['validate(rows, callback)', 'validate(rows)']);
+        }
+      }
       return this.beginValidate(rows, cb);
     },
     /**
@@ -276,10 +288,11 @@ var _default = {
           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 (_xeUtils["default"].isFunction(rule.validator)) {
-                var customValid = rule.validator({
+              if (validator) {
+                var validParams = {
                   cellValue: cellValue,
                   rule: rule,
                   rules: rules,
@@ -289,7 +302,26 @@ var _default = {
                   columnIndex: _this3.getColumnIndex(column),
                   field: column.property,
                   $table: _this3
-                });
+                };
+                var customValid;
+                if (_xeUtils["default"].isString(validator)) {
+                  var gvItem = _vXETable["default"].validators.get(validator);
+                  if (gvItem) {
+                    if (gvItem.cellValidatorMethod) {
+                      customValid = gvItem.cellValidatorMethod(validParams);
+                    } else {
+                      if (process.env.NODE_ENV === 'development') {
+                        (0, _log.warnLog)('vxe.error.notValidators', [validator]);
+                      }
+                    }
+                  } else {
+                    if (process.env.NODE_ENV === 'development') {
+                      (0, _log.errLog)('vxe.error.notValidators', [validator]);
+                    }
+                  }
+                } else {
+                  customValid = validator(validParams);
+                }
                 if (customValid) {
                   if (_xeUtils["default"].isError(customValid)) {
                     _this3.validRuleErr = true;

package/lib/validator/src/mixin.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_utils=require("../../tools/utils"),_dom=_interopRequireDefault(require("../../tools/dom"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var i=t[r];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}var Rule=function(){function t(e){_classCallCheck(this,t),Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.max,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}return _createClass(t,[{key:"content",get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)}},{key:"message",get:function(){return this.content}}]),t}();function validErrorRuleValue(e,t){var r=e.type,i=e.min,l=e.max,e=e.pattern,r="number"===r,n=r?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!r||!isNaN(t))||!_xeUtils.default.eqNull(i)&&n<_xeUtils.default.toNumber(i)||!_xeUtils.default.eqNull(l)&&n>_xeUtils.default.toNumber(l)||!(!e||(_xeUtils.default.isRegExp(e)?e:new RegExp(e)).test(t))}var _default={methods:{_fullValidate:function(e,t){return this.beginValidate(e,t,!0)},_validate:function(e,t){return this.beginValidate(e,t)},handleValidError:function(t){var r=this;return new Promise(function(e){!1===r.validOpts.autoPos?(r.emitEvent("valid-error",t),e()):r.handleActived(t,{type:"valid-error",trigger:"call"}).then(function(){setTimeout(function(){e(r.showValidTooltip(t))},10)})})},beginValidate:function(e,o,i){var t,l,a=this,s={},n=this.editRules,c=this.afterFullData,d=this.treeConfig,r=this.treeOpts,u=(!0===e?t=c:e&&(_xeUtils.default.isFunction(e)?o=e:t=_xeUtils.default.isArray(e)?e:[e]),t=t||this.getInsertRecords().concat(this.getUpdateRecords()),[]);return this.lastCallTime=Date.now(),this.validRuleErr=!1,this.clearValidate(),n?(l=this.getColumns(),e=function(r){var e;!i&&a.validRuleErr||(e=[],l.forEach(function(t){!i&&a.validRuleErr||!_xeUtils.default.has(n,t.property)||e.push(a.validCellRules("all",r,t).catch(function(e){e={rule:e.rule,rules:e.rules,rowIndex:a.getRowIndex(r),row:r,columnIndex:a.getColumnIndex(t),column:t,field:t.property,$table:a};if(s[t.property]||(s[t.property]=[]),s[t.property].push(e),!i)return a.validRuleErr=!0,Promise.reject(e)}))}),u.push(Promise.all(e)))},d?_xeUtils.default.eachTree(t,e,r):t.forEach(e),Promise.all(u).then(function(){var e=Object.keys(s);return a.$nextTick().then(function(){if(e.length)return Promise.reject(s[e[0]][0]);o&&o()})}).catch(function(u){return new Promise(function(e,t){function r(){a.$nextTick(function(){o?(o(s),e()):("obsolete"===_conf.default.validToReject?t:e)(s)})}function i(){u.cell=a.getCell(u.row,u.column),_dom.default.scrollToView(u.cell),a.handleValidError(u).then(r)}var l=u.row,n=c.indexOf(l),n=0<n?c[n-1]:l;!1===a.validOpts.autoPos?r():(d?a.scrollToTreeRow(n):a.scrollToRow(n)).then(i)})})):this.$nextTick().then(function(){o&&o()})},hasCellRules:function(t,e,r){var i=this.editRules,r=r.property;return!(!r||!i)&&(i=_xeUtils.default.get(i,r))&&_xeUtils.default.find(i,function(e){return"all"===t||!e.trigger||t===e.trigger})},validCellRules:function(u,o,a,e){var s,c,d=this,t=this.editRules,r=a.property,f=[],h=[];return r&&t&&(s=_xeUtils.default.get(t,r))&&(c=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(o,r):e,s.forEach(function(t){var e,r,i=t.type,l=t.trigger,n=t.required;"all"!==u&&l&&u!==l||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({cellValue:c,rule:t,rules:s,row:o,rowIndex:d.getRowIndex(o),column:a,columnIndex:d.getColumnIndex(a),field:a.property,$table:d}))&&(_xeUtils.default.isError(e)?(d.validRuleErr=!0,f.push(new Rule({type:"custom",trigger:l,content:e.message,rule:new Rule(t)}))):e.catch&&h.push(e.catch(function(e){d.validRuleErr=!0,f.push(new Rule({type:"custom",trigger:l,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))}))):(e="array"===i,i=_xeUtils.default.isArray(c),r=!0,r=e||i?!i||!c.length:_xeUtils.default.isString(c)?(0,_utils.eqEmptyValue)(c.trim()):(0,_utils.eqEmptyValue)(c),(n?r||validErrorRuleValue(t,c):!r&&validErrorRuleValue(t,c))&&(d.validRuleErr=!0,f.push(new Rule(t)))))})),Promise.all(h).then(function(){if(f.length)return Promise.reject({rules:f,rule:f[0]})})},_clearValidate:function(){var e=this.$refs.validTip;return Object.assign(this.validStore,{visible:!1,row:null,column:null,content:"",rule:null}),e&&e.visible&&e.close(),this.$nextTick()},triggerValidate:function(t){var r=this,e=this.editConfig,i=this.editStore,l=this.editRules,n=this.validStore,i=i.actived;if(i.row&&l){var l=i.args,u=l.row,o=l.column,a=l.cell;if(this.hasCellRules(t,u,o))return this.validCellRules(t,u,o).then(function(){"row"===e.mode&&n.visible&&n.row===u&&n.column===o&&r.clearValidate()}).catch(function(e){var e=e.rule;return e.trigger&&t!==e.trigger?Promise.resolve():(r.showValidTooltip(e={rule:e,row:u,column:o,cell:a}),Promise.reject(e))})}return Promise.resolve()},showValidTooltip:function(e){var t=this,r=this.$refs,i=this.height,l=this.tableData,n=this.validOpts,u=e.rule,o=e.row,a=e.column,s=e.cell,c=r.validTip,d=u.content;return this.$nextTick(function(){if(Object.assign(t.validStore,{row:o,column:a,rule:u,content:d,visible:!0}),t.emitEvent("valid-error",e),c&&("tooltip"===n.message||"default"===n.message&&!i&&l.length<2))return c.open(s,d)})}}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_utils=require("../../tools/utils"),_log=require("../../tools/log"),_dom=_interopRequireDefault(require("../../tools/dom"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var l=t[r];l.enumerable=l.enumerable||!1,l.configurable=!0,"value"in l&&(l.writable=!0),Object.defineProperty(e,l.key,l)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}var Rule=function(){function t(e){_classCallCheck(this,t),Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.max,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}return _createClass(t,[{key:"content",get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)}},{key:"message",get:function(){return this.content}}]),t}();function validErrorRuleValue(e,t){var r=e.type,l=e.min,i=e.max,e=e.pattern,r="number"===r,n=r?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!r||!isNaN(t))||!_xeUtils.default.eqNull(l)&&n<_xeUtils.default.toNumber(l)||!_xeUtils.default.eqNull(i)&&n>_xeUtils.default.toNumber(i)||!(!e||(_xeUtils.default.isRegExp(e)?e:new RegExp(e)).test(t))}var _default={methods:{_fullValidate:function(e,t){return"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["fullValidate(rows, callback)","fullValidate(rows)"]),this.beginValidate(e,t,!0)},_validate:function(e,t){return"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["validate(rows, callback)","validate(rows)"]),this.beginValidate(e,t)},handleValidError:function(t){var r=this;return new Promise(function(e){!1===r.validOpts.autoPos?(r.emitEvent("valid-error",t),e()):r.handleActived(t,{type:"valid-error",trigger:"call"}).then(function(){setTimeout(function(){e(r.showValidTooltip(t))},10)})})},beginValidate:function(e,a,l){var t,i,u=this,s={},n=this.editRules,c=this.afterFullData,d=this.treeConfig,r=this.treeOpts,o=(!0===e?t=c:e&&(_xeUtils.default.isFunction(e)?a=e:t=_xeUtils.default.isArray(e)?e:[e]),t=t||this.getInsertRecords().concat(this.getUpdateRecords()),[]);return this.lastCallTime=Date.now(),this.validRuleErr=!1,this.clearValidate(),n?(i=this.getColumns(),e=function(r){var e;!l&&u.validRuleErr||(e=[],i.forEach(function(t){!l&&u.validRuleErr||!_xeUtils.default.has(n,t.property)||e.push(u.validCellRules("all",r,t).catch(function(e){e={rule:e.rule,rules:e.rules,rowIndex:u.getRowIndex(r),row:r,columnIndex:u.getColumnIndex(t),column:t,field:t.property,$table:u};if(s[t.property]||(s[t.property]=[]),s[t.property].push(e),!l)return u.validRuleErr=!0,Promise.reject(e)}))}),o.push(Promise.all(e)))},d?_xeUtils.default.eachTree(t,e,r):t.forEach(e),Promise.all(o).then(function(){var e=Object.keys(s);return u.$nextTick().then(function(){if(e.length)return Promise.reject(s[e[0]][0]);a&&a()})}).catch(function(o){return new Promise(function(e,t){function r(){u.$nextTick(function(){a?(a(s),e()):("obsolete"===_conf.default.validToReject?t:e)(s)})}function l(){o.cell=u.getCell(o.row,o.column),_dom.default.scrollToView(o.cell),u.handleValidError(o).then(r)}var i=o.row,n=c.indexOf(i),n=0<n?c[n-1]:i;!1===u.validOpts.autoPos?r():(d?u.scrollToTreeRow(n):u.scrollToRow(n)).then(l)})})):this.$nextTick().then(function(){a&&a()})},hasCellRules:function(t,e,r){var l=this.editRules,r=r.property;return!(!r||!l)&&(l=_xeUtils.default.get(l,r))&&_xeUtils.default.find(l,function(e){return"all"===t||!e.trigger||t===e.trigger})},validCellRules:function(u,s,c,e){var d,f,h=this,t=this.editRules,r=c.property,v=[],p=[];return r&&t&&(d=_xeUtils.default.get(t,r))&&(f=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(s,r):e,d.forEach(function(t){var e,r,l,i=t.type,n=t.trigger,o=t.required,a=t.validator;"all"!==u&&n&&u!==n||(a?(l={cellValue:f,rule:t,rules:d,row:s,rowIndex:h.getRowIndex(s),column:c,columnIndex:h.getColumnIndex(c),field:c.property,$table:h},_xeUtils.default.isString(a)?(r=_vXETable.default.validators.get(a))?r.cellValidatorMethod?e=r.cellValidatorMethod(l):"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.notValidators",[a]):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notValidators",[a]):e=a(l),e&&(_xeUtils.default.isError(e)?(h.validRuleErr=!0,v.push(new Rule({type:"custom",trigger:n,content:e.message,rule:new Rule(t)}))):e.catch&&p.push(e.catch(function(e){h.validRuleErr=!0,v.push(new Rule({type:"custom",trigger:n,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))})))):(r="array"===i,a=_xeUtils.default.isArray(f),l=!0,l=r||a?!a||!f.length:_xeUtils.default.isString(f)?(0,_utils.eqEmptyValue)(f.trim()):(0,_utils.eqEmptyValue)(f),(o?l||validErrorRuleValue(t,f):!l&&validErrorRuleValue(t,f))&&(h.validRuleErr=!0,v.push(new Rule(t)))))})),Promise.all(p).then(function(){if(v.length)return Promise.reject({rules:v,rule:v[0]})})},_clearValidate:function(){var e=this.$refs.validTip;return Object.assign(this.validStore,{visible:!1,row:null,column:null,content:"",rule:null}),e&&e.visible&&e.close(),this.$nextTick()},triggerValidate:function(t){var r=this,e=this.editConfig,l=this.editStore,i=this.editRules,n=this.validStore,l=l.actived;if(l.row&&i){var i=l.args,o=i.row,a=i.column,u=i.cell;if(this.hasCellRules(t,o,a))return this.validCellRules(t,o,a).then(function(){"row"===e.mode&&n.visible&&n.row===o&&n.column===a&&r.clearValidate()}).catch(function(e){var e=e.rule;return e.trigger&&t!==e.trigger?Promise.resolve():(r.showValidTooltip(e={rule:e,row:o,column:a,cell:u}),Promise.reject(e))})}return Promise.resolve()},showValidTooltip:function(e){var t=this,r=this.$refs,l=this.height,i=this.tableData,n=this.validOpts,o=e.rule,a=e.row,u=e.column,s=e.cell,c=r.validTip,d=o.content;return this.$nextTick(function(){if(Object.assign(t.validStore,{row:a,column:u,rule:o,content:d,visible:!0}),t.emitEvent("valid-error",e),c&&("tooltip"===n.message||"default"===n.message&&!l&&i.length<2))return c.open(s,d)})}}};exports.default=_default;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vxe-table",
-  "version": "3.7.0-beta.1",
-  "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器等...",
+  "version": "3.7.0-beta.11",
+  "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式为零代码而设计...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
     "serve": "vue-cli-service serve",

package/packages/button/src/button.js

@@ -21,7 +21,8 @@ export default {
     disabled: Boolean,
     loading: Boolean,
     destroyOnClose: Boolean,
-    className: String,
+    className: [String, Function],
+    popupClassName: [String, Function],
     transfer: { type: Boolean, default: () => GlobalConfig.button.transfer }
   },
   data () {
@@ -58,10 +59,10 @@ export default {
     GlobalEvent.off(this, 'mousewheel')
   },
   render (h) {
-    const { $scopedSlots, $listeners, className, inited, type, destroyOnClose, isFormBtn, status, btnType, vSize, name, disabled, loading, showPanel, animatVisible, panelPlacement } = this
+    const { $scopedSlots, $listeners, className, popupClassName, inited, type, destroyOnClose, isFormBtn, status, btnType, vSize, name, disabled, loading, showPanel, animatVisible, panelPlacement } = this
     const downsSlot = $scopedSlots.dropdowns
     return downsSlot ? h('div', {
-      class: ['vxe-button--dropdown', className, {
+      class: ['vxe-button--dropdown', className ? (XEUtils.isFunction(className) ? className({ $button: this }) : className) : '', {
         [`size--${vSize}`]: vSize,
         'is--active': showPanel
       }]
@@ -92,7 +93,7 @@ export default {
       ])),
       h('div', {
         ref: 'panel',
-        class: ['vxe-button--dropdown-panel', {
+        class: ['vxe-button--dropdown-panel', popupClassName ? (XEUtils.isFunction(popupClassName) ? popupClassName({ $button: this }) : popupClassName) : '', {
           [`size--${vSize}`]: vSize,
           'animat--leave': animatVisible,
           'animat--enter': showPanel

package/packages/edit/src/mixin.js

@@ -7,19 +7,20 @@ import { warnLog, errLog, getLog } from '../../tools/log'
 
 function insertTreeRow (_vm, newRecords, isAppend) {
   const { tableFullTreeData, afterFullData, fullDataRowIdData, fullAllDataRowIdData, treeOpts } = _vm
-  const { rowField, parentField, children, mapChildren } = treeOpts
+  const { rowField, parentField, mapChildrenField } = treeOpts
+  const childrenField = treeOpts.children || treeOpts.childrenField
   const funcName = isAppend ? 'push' : 'unshift'
   newRecords.forEach(item => {
     const parentRowId = item[parentField]
     const rowid = getRowid(_vm, item)
-    const matchObj = parentRowId ? XEUtils.findTree(tableFullTreeData, item => parentRowId === item[rowField], { children: mapChildren }) : null
+    const matchObj = parentRowId ? XEUtils.findTree(tableFullTreeData, item => parentRowId === item[rowField], { children: mapChildrenField }) : null
     if (matchObj) {
       const { item: parentRow } = matchObj
       const parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)]
       const parentLevel = parentRest ? parentRest.level : 0
-      let parentChilds = parentRow[children]
+      let parentChilds = parentRow[childrenField]
       if (!XEUtils.isArray(parentChilds)) {
-        parentChilds = parentRow[children] = []
+        parentChilds = parentRow[childrenField] = []
       }
       parentChilds[funcName](item)
       const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds, parent, level: parentLevel + 1 }
@@ -60,7 +61,7 @@ export default {
      */
     _insertAt (records, row) {
       const { tableFullTreeData, mergeList, afterFullData, editStore, tableFullData, treeConfig, fullDataRowIdData, fullAllDataRowIdData, treeOpts } = this
-      const { transform, rowField, mapChildren } = treeOpts
+      const { transform, rowField, mapChildrenField } = treeOpts
       if (!XEUtils.isArray(records)) {
         records = [records]
       }
@@ -99,7 +100,7 @@ export default {
         } else {
           // 如果为虚拟树
           if (treeConfig && transform) {
-            const matchObj = XEUtils.findTree(tableFullTreeData, item => row[rowField] === item[rowField], { children: mapChildren })
+            const matchObj = XEUtils.findTree(tableFullTreeData, item => row[rowField] === item[rowField], { children: mapChildrenField })
             if (matchObj) {
               const { parent: parentRow } = matchObj
               const parentChilds = matchObj.items
@@ -192,7 +193,7 @@ export default {
      * 如果为空则删除所有
      */
     _remove (rows) {
-      const { afterFullData, tableFullData, tableFullTreeData, treeConfig, mergeList, editStore, checkboxOpts, selection, isInsertByRow, treeOpts } = this
+      const { afterFullData, tableFullData, tableFullTreeData, treeConfig, mergeList, editStore, checkboxOpts, selectCheckboxRows, isInsertByRow, treeOpts } = this
       const { transform } = treeOpts
       const { actived, removeList, insertList, insertMaps } = editStore
       const { checkField } = checkboxOpts
@@ -211,9 +212,9 @@ export default {
       // 如果绑定了多选属性，则更新状态
       if (!checkField) {
         rows.forEach(row => {
-          const sIndex = this.findRowIndexOf(selection, row)
+          const sIndex = this.findRowIndexOf(selectCheckboxRows, row)
           if (sIndex > -1) {
-            selection.splice(sIndex, 1)
+            selectCheckboxRows.splice(sIndex, 1)
           }
         })
       }

package/packages/export/src/mixin.js

@@ -38,7 +38,8 @@ function getExportBlobByContent (content, options) {
 
 function hasTreeChildren ($xetable, row) {
   const treeOpts = $xetable.treeOpts
-  return row[treeOpts.children] && row[treeOpts.children].length > 0
+  const childrenField = treeOpts.children || treeOpts.childrenField
+  return row[childrenField] && row[childrenField].length > 0
 }
 
 function getSeq ($xetable, row, $rowIndex, column, $columnIndex) {
@@ -77,7 +78,7 @@ function toBooleanValue (cellValue) {
 
 function getLabelData ($xetable, opts, columns, datas) {
   const { isAllExpand, mode } = opts
-  const { treeConfig, treeOpts, radioOpts, checkboxOpts } = $xetable
+  const { treeConfig, treeOpts, radioOpts, checkboxOpts, columnOpts } = $xetable
   if (!htmlCellElem) {
     htmlCellElem = document.createElement('div')
   }
@@ -99,15 +100,18 @@ function getLabelData ($xetable, opts, columns, datas) {
         columns.forEach((column, $columnIndex) => {
           let cellValue = ''
           const renderOpts = column.editRender || column.cellRender
-          let exportLabelMethod = column.exportMethod
-          if (!exportLabelMethod && renderOpts && renderOpts.name) {
+          let bodyExportMethod = column.exportMethod
+          if (!bodyExportMethod && renderOpts && renderOpts.name) {
             const compConf = VXETable.renderer.get(renderOpts.name)
             if (compConf) {
-              exportLabelMethod = compConf.exportMethod || compConf.cellExportMethod
+              bodyExportMethod = compConf.exportMethod || compConf.cellExportMethod
             }
           }
-          if (exportLabelMethod) {
-            cellValue = exportLabelMethod({ $table: $xetable, row, column, options: opts })
+          if (!bodyExportMethod) {
+            bodyExportMethod = columnOpts.exportMethod
+          }
+          if (bodyExportMethod) {
+            cellValue = bodyExportMethod({ $table: $xetable, row, column, options: opts })
           } else {
             switch (column.type) {
               case 'seq':
@@ -216,21 +220,26 @@ function getBooleanValue (cellValue) {
 }
 
 function getHeaderTitle ($xetable, opts, column) {
-  const { headerExportMethod } = column
-  return headerExportMethod ? headerExportMethod({ column, $table: $xetable }) : ((opts.original ? column.property : column.getTitle()) || '')
+  const { columnOpts } = $xetable
+  const headExportMethod = column.headerExportMethod || columnOpts.headerExportMethod
+  return headExportMethod ? headExportMethod({ column, options: opts, $table: $xetable }) : ((opts.original ? column.property : column.getTitle()) || '')
 }
 
 function getFooterCellValue ($xetable, opts, items, column) {
+  const { columnOpts } = $xetable
   const renderOpts = column.editRender || column.cellRender
-  let exportLabelMethod = column.footerExportMethod
-  if (!exportLabelMethod && renderOpts && renderOpts.name) {
+  let footLabelMethod = column.footerExportMethod
+  if (!footLabelMethod && renderOpts && renderOpts.name) {
     const compConf = VXETable.renderer.get(renderOpts.name)
     if (compConf) {
-      exportLabelMethod = compConf.footerExportMethod || compConf.footerCellExportMethod
+      footLabelMethod = compConf.footerExportMethod || compConf.footerCellExportMethod
     }
   }
+  if (!footLabelMethod) {
+    footLabelMethod = columnOpts.footerExportMethod
+  }
   const _columnIndex = $xetable.getVTColumnIndex(column)
-  const cellValue = exportLabelMethod ? exportLabelMethod({ $table: $xetable, items, itemIndex: _columnIndex, _columnIndex, column, options: opts }) : XEUtils.toValueString(items[_columnIndex])
+  const cellValue = footLabelMethod ? footLabelMethod({ $table: $xetable, items, itemIndex: _columnIndex, _columnIndex, column, options: opts }) : XEUtils.toValueString(items[_columnIndex])
   return cellValue
 }
 

package/packages/filter/src/mixin.js

@@ -171,12 +171,16 @@ export default {
         }
       })
       const filterList = this.getCheckedFilters()
+      const params = { $table: this, $event: evnt, column, field, property: field, values, datas, filters: filterList, filterList }
       // 如果是服务端筛选，则跳过本地筛选处理
       if (!filterOpts.remote) {
         this.handleTableData(true)
         this.checkSelectionStatus()
       }
-      this.emitEvent('filter-change', { column, field, property: field, values, datas, filters: filterList, filterList }, evnt)
+      if (this.mouseConfig && this.mouseOpts.area && this.handleFilterEvent) {
+        this.handleFilterEvent(evnt, params)
+      }
+      this.emitEvent('filter-change', params, evnt)
       this.closeFilter()
       this.updateFooter().then(() => {
         const { scrollXLoad, scrollYLoad } = this

package/packages/form/src/form.js

@@ -5,7 +5,7 @@ import VXETable from '../../v-x-e-table'
 import { isEnableConf, eqEmptyValue, getFuncText } from '../../tools/utils'
 import DomTools, { browse } from '../../tools/dom'
 import { createItem, handleFieldOrItem, isHiddenItem, isActivetem } from './util'
-import { errLog } from '../../tools/log'
+import { warnLog, errLog } from '../../tools/log'
 import VxeFormConfigItem from './form-config-item'
 import VxeLoading from '../../loading/index'
 import { getSlotVNs } from '../../tools/vn'
@@ -367,7 +367,9 @@ export default {
     },
     validateField (fieldOrItem, callback) {
       let fields = []
-      if (!XEUtils.isArray(fieldOrItem)) {
+      if (XEUtils.isArray(fieldOrItem)) {
+        fields = fieldOrItem
+      } else {
         fields = [fieldOrItem]
       }
       return this.beginValidate(fields.map(field => handleFieldOrItem(this, field)), '', callback)
@@ -459,10 +461,10 @@ export default {
             if (rules) {
               const itemValue = XEUtils.isUndefined(val) ? XEUtils.get(data, property) : val
               rules.forEach(rule => {
-                const { type, trigger, required } = rule
+                const { type, trigger, required, validator } = rule
                 if (validType === 'all' || !trigger || validType === rule.trigger) {
-                  if (XEUtils.isFunction(rule.validator)) {
-                    const customValid = rule.validator({
+                  if (validator) {
+                    const validParams = {
                       itemValue,
                       rule,
                       rules,
@@ -470,7 +472,26 @@ export default {
                       field: property,
                       property,
                       $form: this
-                    })
+                    }
+                    let customValid
+                    if (XEUtils.isString(validator)) {
+                      const gvItem = VXETable.validators.get(validator)
+                      if (gvItem) {
+                        if (gvItem.itemValidatorMethod) {
+                          customValid = gvItem.itemValidatorMethod(validParams)
+                        } else {
+                          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                            warnLog('vxe.error.notValidators', [validator])
+                          }
+                        }
+                      } else {
+                        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                          errLog('vxe.error.notValidators', [validator])
+                        }
+                      }
+                    } else {
+                      customValid = validator(validParams)
+                    }
                     if (customValid) {
                       if (XEUtils.isError(customValid)) {
                         errorRules.push(new Rule({ type: 'custom', trigger, content: customValid.message, rule: new Rule(rule) }))

package/packages/grid/src/grid.js

@@ -747,9 +747,13 @@ export default {
           break
         }
         default: {
-          const btnMethod = VXETable.commands.get(code)
-          if (btnMethod) {
-            btnMethod({ code, button, $grid: this, $table: $xetable }, ...args)
+          const gCommandOpts = VXETable.commands.get(code)
+          if (gCommandOpts.commandMethod) {
+            gCommandOpts.commandMethod({ code, button, $grid: this, $table: $xetable }, ...args)
+          } else {
+            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+              errLog('vxe.error.notCommands', [code])
+            }
           }
         }
       }

package/packages/input/src/input.js

@@ -624,7 +624,10 @@ export default {
     clearable: { type: Boolean, default: () => GlobalConfig.input.clearable },
     readonly: Boolean,
     disabled: Boolean,
-    placeholder: String,
+    placeholder: {
+      type: String,
+      default: () => XEUtils.eqNull(GlobalConfig.input.placeholder) ? GlobalConfig.i18n('vxe.base.pleaseInput') : GlobalConfig.input.placeholder
+    },
     maxlength: [String, Number],
     autocomplete: { type: String, default: 'off' },
     align: String,
@@ -1195,6 +1198,11 @@ export default {
       this.isActivated = false
       return this.$nextTick()
     },
+    select () {
+      this.$refs.input.select()
+      this.isActivated = false
+      return this.$nextTick()
+    },
     triggerEvent (evnt) {
       const { $refs, inputValue } = this
       this.$emit(evnt.type, { $panel: $refs.panel, value: inputValue, $event: evnt })

package/packages/locale/lang/en-US.js

@@ -1,5 +1,9 @@
 export default {
   vxe: {
+    base: {
+      pleaseInput: 'Please input',
+      pleaseSelect: 'Select'
+    },
     loading: {
       text: 'Loading...'
     },
@@ -19,6 +23,10 @@ export default {
       errProp: 'Unsupported parameter "{0}", possibly "{1}".',
       colRepet: 'column.{0}="{0}" is duplicated, which may make some features unusable',
       notFunc: 'method "{0}" not exist.',
+      errFunc: 'The argument "{0}" is not a method',
+      notValidators: 'Global validators "{0}" no existe.',
+      notFormats: 'Global formats "{0}" no existe.',
+      notCommands: 'Global commands "{0}" no existe.',
       notSlot: 'slot "{0}" does not exist',
       noTree: 'The tree structure does not support "{0}".',
       notProp: 'Unsupported parameters "{0}"',

package/packages/locale/lang/es-ES.js

@@ -1,5 +1,9 @@
 export default {
   vxe: {
+    base: {
+      pleaseInput: 'Please input',
+      pleaseSelect: 'Select'
+    },
     loading: {
       text: 'Cargando...'
     },
@@ -19,6 +23,10 @@ export default {
       errProp: 'Parámetro no compatible "{0}", posiblemente "{1}".',
       colRepet: 'columna.{0}="{0}" está duplicado, lo que puede hacer que algunas funciones sean inutilizables',
       notFunc: 'El método "{0}" no existe.',
+      errFunc: 'The argument "{0}" is not a method',
+      notValidators: 'Global validators "{0}" no existe.',
+      notFormats: 'Global formats "{0}" no existe.',
+      notCommands: 'Global commands "{0}" no existe.',
       notSlot: 'La ranura "{0}" no existe.',
       noTree: 'La estructura de árbol no soporta "{0}".',
       notProp: 'Parámetros no compatibles "{0}"',

package/packages/locale/lang/ja-JP.d.ts

@@ -5,4 +5,4 @@ import Language from './language'
  */
 declare const jaJP: Language
 
-export default jaJP
+export default jaJP

package/packages/locale/lang/ja-JP.js

@@ -1,5 +1,9 @@
 export default {
   vxe: {
+    base: {
+      pleaseInput: 'Please input',
+      pleaseSelect: 'Select'
+    },
     loading: {
       text: 'Loading...'
     },
@@ -19,6 +23,10 @@ export default {
       errProp: 'サポートされていないパラメーター "{0}"，"{1}" の可能性があります',
       colRepet: 'column.{0}="{0}" が重複しているため、機能が使えなくなることがあります。',
       notFunc: 'method "{0}" はありません',
+      errFunc: 'The argument "{0}" is not a method',
+      notValidators: 'Global validators "{0}" no existe.',
+      notFormats: 'Global formats "{0}" no existe.',
+      notCommands: 'Global commands "{0}" no existe.',
       notSlot: 'slot "{0}" はありません',
       noTree: 'Tree structureは "{0}" をサポートしていません',
       notProp: 'サポートされていないパラメータ "{0}"',

package/packages/locale/lang/pt-BR.d.ts

@@ -0,0 +1,8 @@
+import Language from './language'
+
+/**
+ * Brazilian Portuguese language
+ */
+declare const zhCN: Language
+
+export default zhCN