vxe-table 3.7.0-beta.8 → 3.7.0-beta.9

package/lib/v-x-e-table/src/conf.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var iconPrefix="vxe-icon-",_default={size:null,zIndex:999,version:0,emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},sortConfig:{showIcon:!0},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",children:"children",hasChild:"hasChild",mapChildren:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0},importConfig:{modes:["insert","covering"]},exportConfig:{modes:["current","selected"]},printConfig:{modes:["current","selected"]},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{enabled:!0,gt:60},scrollY:{enabled:!0,gt:100}},export:{types:{}},icon:{LOADING:iconPrefix+"spinner roll vxe-loading--default-icon",TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_HELP:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",BUTTON_DROPDOWN:iconPrefix+"arrow-down",BUTTON_LOADING:iconPrefix+"spinner roll",SELECT_LOADED:iconPrefix+"spinner roll",SELECT_OPEN:iconPrefix+"caret-down rotate180",SELECT_CLOSE:iconPrefix+"caret-down",PAGER_JUMP_PREV:iconPrefix+"arrow-double-left",PAGER_JUMP_NEXT:iconPrefix+"arrow-double-right",PAGER_PREV_PAGE:iconPrefix+"arrow-left",PAGER_NEXT_PAGE:iconPrefix+"arrow-right",PAGER_JUMP_MORE:iconPrefix+"ellipsis-h",INPUT_CLEAR:iconPrefix+"error-circle-fill",INPUT_PWD:iconPrefix+"eye-fill",INPUT_SHOW_PWD:iconPrefix+"eye-fill-close",INPUT_PREV_NUM:iconPrefix+"caret-up",INPUT_NEXT_NUM:iconPrefix+"caret-down",INPUT_DATE:iconPrefix+"calendar",INPUT_SEARCH:iconPrefix+"search",MODAL_ZOOM_IN:iconPrefix+"square",MODAL_ZOOM_OUT:iconPrefix+"maximize",MODAL_CLOSE:iconPrefix+"close",MODAL_INFO:iconPrefix+"info-circle-fill",MODAL_SUCCESS:iconPrefix+"success-circle-fill",MODAL_WARNING:iconPrefix+"warnion-circle-fill",MODAL_ERROR:iconPrefix+"error-circle-fill",MODAL_QUESTION:iconPrefix+"question-circle-fill",MODAL_LOADING:iconPrefix+"spinner roll",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED:iconPrefix+"fixed-right-fill",FORM_PREFIX:iconPrefix+"question-circle-fill",FORM_SUFFIX:iconPrefix+"question-circle-fill",FORM_FOLDING:iconPrefix+"arrow-up rotate180",FORM_UNFOLDING:iconPrefix+"arrow-up"},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,message:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},tooltip:{trigger:"hover",theme:"dark",enterDelay:500,leaveDelay:300},pager:{},form:{validConfig:{showMessage:!0,autoPos:!0},tooltipConfig:{enterable:!0},titleAsterisk:!0},input:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},textarea:{},select:{multiCharOverflow:8},toolbar:{custom:{allowFixed:!0,showFooter:!0}},button:{},radio:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},checkbox:{},switch:{},modal:{top:15,showHeader:!0,minWidth:340,minHeight:140,lockView:!0,mask:!0,duration:3e3,marginSize:0,dblclickZoom:!0,showTitleOverflow:!0,animat:!0,showClose:!0,draggable:!0,storageKey:"VXE_MODAL_POSITION"},list:{scrollY:{enabled:!0,gt:100}},i18n:function(e){return e}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var iconPrefix="vxe-icon-",_default={size:null,zIndex:999,version:0,emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},sortConfig:{showIcon:!0},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0},importConfig:{modes:["insert","covering"]},exportConfig:{modes:["current","selected"]},printConfig:{modes:["current","selected"]},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{enabled:!0,gt:60},scrollY:{enabled:!0,gt:100}},export:{types:{}},icon:{LOADING:iconPrefix+"spinner roll vxe-loading--default-icon",TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_HELP:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",BUTTON_DROPDOWN:iconPrefix+"arrow-down",BUTTON_LOADING:iconPrefix+"spinner roll",SELECT_LOADED:iconPrefix+"spinner roll",SELECT_OPEN:iconPrefix+"caret-down rotate180",SELECT_CLOSE:iconPrefix+"caret-down",PAGER_JUMP_PREV:iconPrefix+"arrow-double-left",PAGER_JUMP_NEXT:iconPrefix+"arrow-double-right",PAGER_PREV_PAGE:iconPrefix+"arrow-left",PAGER_NEXT_PAGE:iconPrefix+"arrow-right",PAGER_JUMP_MORE:iconPrefix+"ellipsis-h",INPUT_CLEAR:iconPrefix+"error-circle-fill",INPUT_PWD:iconPrefix+"eye-fill",INPUT_SHOW_PWD:iconPrefix+"eye-fill-close",INPUT_PREV_NUM:iconPrefix+"caret-up",INPUT_NEXT_NUM:iconPrefix+"caret-down",INPUT_DATE:iconPrefix+"calendar",INPUT_SEARCH:iconPrefix+"search",MODAL_ZOOM_IN:iconPrefix+"square",MODAL_ZOOM_OUT:iconPrefix+"maximize",MODAL_CLOSE:iconPrefix+"close",MODAL_INFO:iconPrefix+"info-circle-fill",MODAL_SUCCESS:iconPrefix+"success-circle-fill",MODAL_WARNING:iconPrefix+"warnion-circle-fill",MODAL_ERROR:iconPrefix+"error-circle-fill",MODAL_QUESTION:iconPrefix+"question-circle-fill",MODAL_LOADING:iconPrefix+"spinner roll",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED:iconPrefix+"fixed-right-fill",FORM_PREFIX:iconPrefix+"question-circle-fill",FORM_SUFFIX:iconPrefix+"question-circle-fill",FORM_FOLDING:iconPrefix+"arrow-up rotate180",FORM_UNFOLDING:iconPrefix+"arrow-up"},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,message:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},tooltip:{trigger:"hover",theme:"dark",enterDelay:500,leaveDelay:300},pager:{},form:{validConfig:{showMessage:!0,autoPos:!0},tooltipConfig:{enterable:!0},titleAsterisk:!0},input:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},textarea:{},select:{multiCharOverflow:8},toolbar:{custom:{allowFixed:!0,showFooter:!0}},button:{},radio:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},checkbox:{},switch:{},modal:{top:15,showHeader:!0,minWidth:340,minHeight:140,lockView:!0,mask:!0,duration:3e3,marginSize:0,dblclickZoom:!0,showTitleOverflow:!0,animat:!0,showClose:!0,draggable:!0,storageKey:"VXE_MODAL_POSITION"},list:{scrollY:{enabled:!0,gt:100}},i18n:function(e){return e}};exports.default=_default;

package/lib/v-x-e-table/src/formats.js

@@ -34,11 +34,13 @@ var VXEFormatsStore = /*#__PURE__*/function () {
     value: function add(name, render) {
       var conf = this.store[name];
       // 兼容
-      if (_xeUtils["default"].isFunction(render)) {
-        // warnLog('vxe.error.delProp', ['callback', 'formatMethod'])
-        render = {
-          formatMethod: render
-        };
+      if (process.env.NODE_ENV === 'development') {
+        if (_xeUtils["default"].isFunction(render)) {
+          (0, _log.warnLog)('vxe.error.delProp', ['callback', 'cellFormatMethod']);
+          render = {
+            cellFormatMethod: render
+          };
+        }
       }
 
       // 检测是否覆盖

package/lib/v-x-e-table/src/formats.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formats=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_log=require("../../tools/log");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 o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}var VXEFormatsStore=function(){function n(){_classCallCheck(this,n),this.store={}}return _createClass(n,[{key:"mixin",value:function(e){var r=this;return _xeUtils.default.each(e,function(e,t){r.add(t,e)}),n}},{key:"get",value:function(e){return this.store[e]}},{key:"add",value:function(r,e){var o,t=this.store[r];return _xeUtils.default.isFunction(e)&&(e={formatMethod:e}),"development"===process.env.NODE_ENV&&(o=_xeUtils.default.keys(t),_xeUtils.default.each(e,function(e,t){o.includes(t)&&(0,_log.warnLog)("vxe.error.coverProp",[r,t])})),this.store[r]=t?_xeUtils.default.merge(t,e):e,n}},{key:"delete",value:function(e){return delete this.store[e],n}}]),n}(),formats=new VXEFormatsStore;exports.formats=formats,"development"===process.env.NODE_ENV&&Object.assign(formats,{_name:"Formats"});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formats=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_log=require("../../tools/log");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 o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}var VXEFormatsStore=function(){function n(){_classCallCheck(this,n),this.store={}}return _createClass(n,[{key:"mixin",value:function(e){var r=this;return _xeUtils.default.each(e,function(e,t){r.add(t,e)}),n}},{key:"get",value:function(e){return this.store[e]}},{key:"add",value:function(r,e){var o,t=this.store[r];return"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(e)&&((0,_log.warnLog)("vxe.error.delProp",["callback","cellFormatMethod"]),e={cellFormatMethod:e}),"development"===process.env.NODE_ENV&&(o=_xeUtils.default.keys(t),_xeUtils.default.each(e,function(e,t){o.includes(t)&&(0,_log.warnLog)("vxe.error.coverProp",[r,t])})),this.store[r]=t?_xeUtils.default.merge(t,e):e,n}},{key:"delete",value:function(e){return delete this.store[e],n}}]),n}(),formats=new VXEFormatsStore;exports.formats=formats,"development"===process.env.NODE_ENV&&Object.assign(formats,{_name:"Formats"});

package/lib/v-x-e-table/src/menus.js

@@ -34,11 +34,13 @@ var VXEMenusStore = /*#__PURE__*/function () {
     value: function add(name, render) {
       var conf = this.store[name];
       // 兼容
-      if (_xeUtils["default"].isFunction(render)) {
-        // warnLog('vxe.error.delProp', ['callback', 'menuMethod'])
-        render = {
-          menuMethod: render
-        };
+      if (process.env.NODE_ENV === 'development') {
+        if (_xeUtils["default"].isFunction(render)) {
+          (0, _log.warnLog)('vxe.error.delProp', ['callback', 'menuMethod']);
+          render = {
+            menuMethod: render
+          };
+        }
       }
 
       // 检测是否覆盖

package/lib/v-x-e-table/src/menus.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.menus=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_log=require("../../tools/log");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 n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}var VXEMenusStore=function(){function o(){_classCallCheck(this,o),this.store={}}return _createClass(o,[{key:"mixin",value:function(e){var r=this;return _xeUtils.default.each(e,function(e,t){r.add(t,e)}),o}},{key:"get",value:function(e){return this.store[e]}},{key:"add",value:function(r,e){var n,t=this.store[r];return _xeUtils.default.isFunction(e)&&(e={menuMethod:e}),"development"===process.env.NODE_ENV&&(n=_xeUtils.default.keys(t),_xeUtils.default.each(e,function(e,t){n.includes(t)&&(0,_log.warnLog)("vxe.error.coverProp",[r,t])})),this.store[r]=t?_xeUtils.default.merge(t,e):e,o}},{key:"delete",value:function(e){return delete this.store[e],o}}]),o}(),menus=new VXEMenusStore;exports.menus=menus,"development"===process.env.NODE_ENV&&Object.assign(menus,{_name:"Menus"});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.menus=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_log=require("../../tools/log");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 n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}var VXEMenusStore=function(){function o(){_classCallCheck(this,o),this.store={}}return _createClass(o,[{key:"mixin",value:function(e){var r=this;return _xeUtils.default.each(e,function(e,t){r.add(t,e)}),o}},{key:"get",value:function(e){return this.store[e]}},{key:"add",value:function(r,e){var n,t=this.store[r];return"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(e)&&((0,_log.warnLog)("vxe.error.delProp",["callback","menuMethod"]),e={menuMethod:e}),"development"===process.env.NODE_ENV&&(n=_xeUtils.default.keys(t),_xeUtils.default.each(e,function(e,t){n.includes(t)&&(0,_log.warnLog)("vxe.error.coverProp",[r,t])})),this.store[r]=t?_xeUtils.default.merge(t,e):e,o}},{key:"delete",value:function(e){return delete this.store[e],o}}]),o}(),menus=new VXEMenusStore;exports.menus=menus,"development"===process.env.NODE_ENV&&Object.assign(menus,{_name:"Menus"});

package/lib/validator/src/mixin.js

@@ -81,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);
     },
     /**

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")),_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 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,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,p=[],g=[];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,p.push(new Rule({type:"custom",trigger:n,content:e.message,rule:new Rule(t)}))):e.catch&&g.push(e.catch(function(e){h.validRuleErr=!0,p.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,p.push(new Rule(t)))))})),Promise.all(g).then(function(){if(p.length)return Promise.reject({rules:p,rule:p[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;
+"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,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.7.0-beta.8",
+  "version": "3.7.0-beta.9",
   "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式为零代码而设计...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/edit/src/mixin.js

@@ -7,19 +7,19 @@ 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, childrenField, children, mapChildrenField } = treeOpts
   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 || children]
       if (!XEUtils.isArray(parentChilds)) {
-        parentChilds = parentRow[children] = []
+        parentChilds = parentRow[childrenField || children] = []
       }
       parentChilds[funcName](item)
       const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds, parent, level: parentLevel + 1 }
@@ -60,7 +60,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 +99,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

package/packages/export/src/mixin.js

@@ -38,7 +38,7 @@ function getExportBlobByContent (content, options) {
 
 function hasTreeChildren ($xetable, row) {
   const treeOpts = $xetable.treeOpts
-  return row[treeOpts.children] && row[treeOpts.children].length > 0
+  return row[treeOpts.childrenField || treeOpts.children] && row[treeOpts.childrenField || treeOpts.children].length > 0
 }
 
 function getSeq ($xetable, row, $rowIndex, column, $columnIndex) {

package/packages/table/src/body.js

@@ -30,7 +30,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'
@@ -350,7 +350,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[treeOpts.childrenField || treeOpts.children]
       isExpandTree = rowChildren && rowChildren.length && treeExpandeds.indexOf(row) > -1
     }
     rows.push(

package/packages/table/src/cell.js

@@ -207,8 +207,8 @@ export const Cell = {
     const { treeOpts, treeExpandeds, treeLazyLoadeds } = $table
     const { row, column, level } = params
     const { slots } = column
-    const { children, hasChild, indent, lazy, trigger, iconLoaded, showIcon, iconOpen, iconClose } = treeOpts
-    const rowChilds = row[children]
+    const { childrenField, children, hasChildField, hasChild, indent, lazy, trigger, iconLoaded, showIcon, iconOpen, iconClose } = treeOpts
+    const rowChilds = row[childrenField || children]
     let hasLazyChilds = false
     let isAceived = false
     let isLazyLoaded = false
@@ -220,7 +220,7 @@ export const Cell = {
       isAceived = $table.findRowIndexOf(treeExpandeds, row) > -1
       if (lazy) {
         isLazyLoaded = $table.findRowIndexOf(treeLazyLoadeds, row) > -1
-        hasLazyChilds = row[hasChild]
+        hasLazyChilds = row[hasChildField || hasChild]
       }
     }
     if (!trigger || trigger === 'default') {

package/packages/table/src/columnInfo.js

@@ -28,7 +28,7 @@ export class ColumnInfo {
         warnLog('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render'])
       }
       if (_vm.type === 'expand') {
-        if ($xetable.treeConfig && $xetable.treeOpts.line) {
+        if ($xetable.treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
           errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand'])
         }
       }
@@ -41,12 +41,12 @@ export class ColumnInfo {
       if (formatter) {
         if (XEUtils.isString(formatter)) {
           const gFormatOpts = formats.get(formatter) || XEUtils[formatter]
-          if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.formatMethod)) {
+          if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.cellFormatMethod)) {
             errLog('vxe.error.notFormats', [formatter])
           }
         } else if (XEUtils.isArray(formatter)) {
           const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]]
-          if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.formatMethod)) {
+          if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.cellFormatMethod)) {
             errLog('vxe.error.notFormats', [formatter[0]])
           }
         }

package/packages/table/src/methods.js

@@ -369,26 +369,26 @@ const Methods = {
           if (!treeOpts.parentField) {
             errLog('vxe.error.reqProp', ['table.tree-config.parentField'])
           }
-          if (!treeOpts.children) {
-            errLog('vxe.error.reqProp', ['tree-config.children'])
+          if (!(treeOpts.childrenField || treeOpts.children)) {
+            errLog('vxe.error.reqProp', ['tree-config.childrenField'])
           }
-          if (!treeOpts.mapChildren) {
-            errLog('vxe.error.reqProp', ['tree-config.mapChildren'])
+          if (!treeOpts.mapChildrenField) {
+            errLog('vxe.error.reqProp', ['tree-config.mapChildrenField'])
           }
-          if (treeOpts.children === treeOpts.mapChildren) {
-            errLog('vxe.error.errConflicts', ['tree-config.children', 'tree-config.mapChildren'])
+          if ((treeOpts.treeOpts || treeOpts.children) === treeOpts.mapChildrenField) {
+            errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField'])
           }
           fullData.forEach(row => {
-            if (row[treeOpts.children] && row[treeOpts.children].length) {
-              warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
+            if (row[treeOpts.childrenField || treeOpts.children] && row[treeOpts.childrenField || treeOpts.children].length) {
+              warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.childrenField || treeOpts.children}`])
             }
           })
         }
         treeData = XEUtils.toArrayTree(fullData, {
           key: treeOpts.rowField,
           parentKey: treeOpts.parentField,
-          children: treeOpts.children,
-          mapChildren: treeOpts.mapChildren
+          children: treeOpts.childrenField || treeOpts.children,
+          mapChildren: treeOpts.mapChildrenField
         })
         fullData = treeData.slice(0)
       } else {
@@ -602,8 +602,8 @@ const Methods = {
         rowid = getRowUniqueId()
         XEUtils.set(row, rowkey, rowid)
       }
-      if (isLazy && row[treeOpts.hasChild] && XEUtils.isUndefined(row[treeOpts.children])) {
-        row[treeOpts.children] = null
+      if (isLazy && row[treeOpts.hasChildField || treeOpts.hasChild] && XEUtils.isUndefined(row[treeOpts.childrenField || treeOpts.children])) {
+        row[treeOpts.childrenField || treeOpts.children] = null
       }
       const rest = { row, rowid, seq, index: treeConfig && parent ? -1 : index, _index: -1, $index: -1, items, parent, level }
       if (source) {
@@ -651,7 +651,7 @@ const Methods = {
   },
   loadTreeChildren (row, childRecords) {
     const { keepSource, tableSourceData, treeOpts, fullDataRowIdData, fullDataRowMap, fullAllDataRowMap, fullAllDataRowIdData } = this
-    const { transform, children, mapChildren } = treeOpts
+    const { transform, childrenField, children, mapChildrenField } = treeOpts
     const rest = fullAllDataRowIdData[getRowid(this, row)]
     const parentLevel = rest ? rest.level : 0
     return this.createData(childRecords).then((rows) => {
@@ -659,7 +659,7 @@ const Methods = {
         const rowid = getRowid(this, row)
         const matchObj = XEUtils.findTree(tableSourceData, (item) => rowid === getRowid(this, item), treeOpts)
         if (matchObj) {
-          matchObj.item[children] = XEUtils.clone(rows, true)
+          matchObj.item[childrenField || children] = XEUtils.clone(rows, true)
         }
       }
       XEUtils.eachTree(rows, (childRow, index, items, path, parent, nodes) => {
@@ -670,9 +670,9 @@ const Methods = {
         fullAllDataRowIdData[rowid] = rest
         fullAllDataRowMap.set(childRow, rest)
       }, treeOpts)
-      row[children] = rows
+      row[childrenField || children] = rows
       if (transform) {
-        row[mapChildren] = rows
+        row[mapChildrenField] = rows
       }
       this.updateAfterDataIndex()
       return rows
@@ -956,8 +956,8 @@ const Methods = {
           XEUtils.set(record, key, null)
         }
       })
-      if (treeConfig && treeOpts.lazy && XEUtils.isUndefined(record[treeOpts.children])) {
-        record[treeOpts.children] = null
+      if (treeConfig && treeOpts.lazy && XEUtils.isUndefined(record[treeOpts.childrenField || treeOpts.children])) {
+        record[treeOpts.childrenField || treeOpts.children] = null
       }
       // 必须有行数据的唯一主键，可以自行设置；也可以默认生成一个随机数
       if (eqEmptyValue(XEUtils.get(record, rowkey))) {
@@ -1156,20 +1156,20 @@ const Methods = {
    */
   getCheckboxRecords (isFull) {
     const { tableFullData, afterFullData, treeConfig, treeOpts, checkboxOpts, tableFullTreeData, afterTreeFullData } = this
-    const { transform, children, mapChildren } = treeOpts
+    const { transform, childrenField, children, mapChildrenField } = treeOpts
     const { checkField } = checkboxOpts
     const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData)
     let rowList = []
     if (checkField) {
       if (treeConfig) {
-        rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, checkField), { children: transform ? mapChildren : children })
+        rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, checkField), { children: transform ? mapChildrenField : (childrenField || children) })
       } else {
         rowList = currTableData.filter(row => XEUtils.get(row, checkField))
       }
     } else {
       const { selectCheckboxRows } = this
       if (treeConfig) {
-        rowList = XEUtils.filterTree(currTableData, row => this.findRowIndexOf(selectCheckboxRows, row) > -1, { children: transform ? mapChildren : children })
+        rowList = XEUtils.filterTree(currTableData, row => this.findRowIndexOf(selectCheckboxRows, row) > -1, { children: transform ? mapChildrenField : (childrenField || children) })
       } else {
         rowList = currTableData.filter(row => this.findRowIndexOf(selectCheckboxRows, row) > -1)
       }
@@ -1190,7 +1190,7 @@ const Methods = {
           expandMaps.set(row, 1)
           fullData.push(row)
         }
-      }, { children: treeOpts.mapChildren })
+      }, { children: treeOpts.mapChildrenField })
       this.afterFullData = fullData
       this.updateScrollYStatus(fullData)
       return fullData
@@ -1327,7 +1327,7 @@ const Methods = {
           fullAllDataRowIdData[rowid] = rest
           fullDataRowIdData[rowid] = rest
         }
-      }, { children: treeOpts.transform ? treeOpts.mapChildren : treeOpts.children })
+      }, { children: treeOpts.transform ? treeOpts.mapChildrenField : (treeOpts.childrenField || treeOpts.children) })
     } else {
       afterFullData.forEach((row, index) => {
         const rowid = getRowid(this, row)
@@ -4142,8 +4142,8 @@ const Methods = {
    */
   reloadTreeExpand (row) {
     const { treeOpts, treeLazyLoadeds } = this
-    const { transform, lazy, hasChild } = treeOpts
-    if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
+    const { transform, lazy, hasChildField, hasChild } = treeOpts
+    if (lazy && row[hasChildField || hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(() => {
         return this.handleAsyncTreeExpandChilds(row)
       }).then(() => {
@@ -4252,10 +4252,10 @@ const Methods = {
    */
   setAllTreeExpand (expanded) {
     const { tableFullData, treeOpts } = this
-    const { lazy, children } = treeOpts
+    const { lazy, childrenField, children } = treeOpts
     const expandeds = []
     XEUtils.eachTree(tableFullData, row => {
-      const rowChildren = row[children]
+      const rowChildren = row[childrenField || children]
       if (lazy || (rowChildren && rowChildren.length)) {
         expandeds.push(row)
       }
@@ -4270,7 +4270,7 @@ const Methods = {
    */
   handleBaseTreeExpand (rows, expanded) {
     const { fullAllDataRowMap, tableFullData, treeExpandeds, treeOpts, treeLazyLoadeds, treeNodeColumn } = this
-    const { reserve, lazy, hasChild, children, accordion, toggleMethod } = treeOpts
+    const { reserve, lazy, hasChildField, hasChild, childrenField, children, accordion, toggleMethod } = treeOpts
     const result = []
     const columnIndex = this.getColumnIndex(treeNodeColumn)
     const $columnIndex = this.getVMColumnIndex(treeNodeColumn)
@@ -4287,12 +4287,12 @@ const Methods = {
       validRows.forEach(row => {
         if (treeExpandeds.indexOf(row) === -1) {
           const rest = fullAllDataRowMap.get(row)
-          const isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1
+          const isLoad = lazy && row[(hasChildField || hasChild)] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1
           // 是否使用懒加载
           if (isLoad) {
             result.push(this.handleAsyncTreeExpandChilds(row))
           } else {
-            if (row[children] && row[children].length) {
+            if (row[childrenField || children] && row[childrenField || children].length) {
               treeExpandeds.push(row)
             }
           }
@@ -4865,10 +4865,10 @@ const Methods = {
       const formatParams = { cellValue, row, rowIndex: this.getRowIndex(row), column, columnIndex: this.getColumnIndex(column) }
       if (XEUtils.isString(formatter)) {
         const gFormatOpts = formats.get(formatter)
-        cellLabel = gFormatOpts && gFormatOpts.formatMethod ? gFormatOpts.formatMethod(formatParams) : ''
+        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : ''
       } else if (XEUtils.isArray(formatter)) {
         const gFormatOpts = formats.get(formatter[0])
-        cellLabel = gFormatOpts && gFormatOpts.formatMethod ? gFormatOpts.formatMethod(formatParams, ...formatter.slice(1)) : ''
+        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams, ...formatter.slice(1)) : ''
       } else {
         cellLabel = formatter(formatParams)
       }

package/packages/table/src/table.js

@@ -775,7 +775,7 @@ export default {
       if (this.editConfig && editOpts.showStatus && !this.keepSource) {
         warnLog('vxe.error.reqProp', ['keep-source'])
       }
-      if (treeConfig && treeOpts.line && (!(this.rowKey || rowOpts.useKey) || !showOverflow)) {
+      if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(this.rowKey || rowOpts.useKey) || !showOverflow)) {
         warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow'])
       }
       if (this.showFooter && !this.footerMethod) {
@@ -832,6 +832,12 @@ export default {
           return
         }
       }
+      if (this.treeConfig && treeOpts.children) {
+        warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField'])
+      }
+      if (this.treeConfig && treeOpts.line) {
+        warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine'])
+      }
       if (this.mouseOpts.area && this.mouseOpts.selected) {
         warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected'])
       }
@@ -876,9 +882,9 @@ export default {
       if (this.emptyRender && !XEUtils.isObject(this.emptyRender)) {
         warnLog('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}'])
       }
-      // if (this.editConfig && this.editConfig.activeMethod) {
-      //   warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod'])
-      // }
+      if (this.editConfig && this.editOpts.activeMethod) {
+        warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod'])
+      }
     }
 
     // 检查是否有安装需要的模块
@@ -1033,7 +1039,7 @@ export default {
         'is--header': showHeader,
         'is--footer': showFooter,
         'is--group': isGroup,
-        'is--tree-line': treeConfig && treeOpts.line,
+        'is--tree-line': treeConfig && (treeOpts.showLine || treeOpts.line),
         'is--fixed-left': leftList.length,
         'is--fixed-right': rightList.length,
         'is--animat': !!this.animat,

package/packages/table/src/util.js

@@ -157,7 +157,7 @@ function countTreeExpand (prevRow, params) {
     return count
   }
   const { $table } = params
-  const rowChildren = prevRow[$table.treeOpts.children]
+  const rowChildren = prevRow[$table.treeOpts.childrenField || $table.treeOpts.children]
   if ($table.isTreeExpandByRow(prevRow)) {
     for (let index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params)

package/packages/toolbar/src/toolbar.js

@@ -352,7 +352,7 @@ export default {
     }
   },
   created () {
-    const { refresh, refreshOpts } = this
+    const { refresh, refreshOpts, customOpts } = this
     this.$nextTick(() => {
       const $xetable = this.fintTable()
       const queryMethod = refreshOpts.queryMethod || refreshOpts.query
@@ -363,6 +363,9 @@ export default {
         $xetable.connect(this)
       }
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (customOpts.isFooter) {
+          warnLog('vxe.error.notValidators', ['custom.isFooter', 'custom.showFooter'])
+        }
         if (this.buttons) {
           this.buttons.forEach(item => {
             const { buttonRender } = item

package/packages/v-x-e-table/src/commands.js

@@ -20,10 +20,12 @@ class VXECommandsStore {
   add (name, render) {
     const conf = this.store[name]
     // 兼容
-    if (XEUtils.isFunction(render)) {
-      // warnLog('vxe.error.delProp', ['callback', 'commandMethod'])
-      render = {
-        commandMethod: render
+    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (XEUtils.isFunction(render)) {
+        warnLog('vxe.error.delProp', ['callback', 'commandMethod'])
+        render = {
+          commandMethod: render
+        }
       }
     }
 

package/packages/v-x-e-table/src/conf.js

@@ -76,9 +76,9 @@ export default {
     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
     },

package/packages/v-x-e-table/src/formats.js

@@ -20,10 +20,12 @@ class VXEFormatsStore {
   add (name, render) {
     const conf = this.store[name]
     // 兼容
-    if (XEUtils.isFunction(render)) {
-      // warnLog('vxe.error.delProp', ['callback', 'formatMethod'])
-      render = {
-        formatMethod: render
+    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (XEUtils.isFunction(render)) {
+        warnLog('vxe.error.delProp', ['callback', 'cellFormatMethod'])
+        render = {
+          cellFormatMethod: render
+        }
       }
     }
 

package/packages/v-x-e-table/src/menus.js

@@ -20,10 +20,12 @@ class VXEMenusStore {
   add (name, render) {
     const conf = this.store[name]
     // 兼容
-    if (XEUtils.isFunction(render)) {
-      // warnLog('vxe.error.delProp', ['callback', 'menuMethod'])
-      render = {
-        menuMethod: render
+    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (XEUtils.isFunction(render)) {
+        warnLog('vxe.error.delProp', ['callback', 'menuMethod'])
+        render = {
+          menuMethod: render
+        }
       }
     }
 

package/packages/validator/src/mixin.js

@@ -65,12 +65,22 @@ export default {
      * 完整校验，和 validate 的区别就是会给有效数据中的每一行进行校验
      */
     _fullValidate (rows, cb) {
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (XEUtils.isFunction(cb)) {
+          warnLog('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)'])
+        }
+      }
       return this.beginValidate(rows, cb, true)
     },
     /**
      * 快速校验，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
      */
     _validate (rows, cb) {
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (XEUtils.isFunction(cb)) {
+          warnLog('vxe.error.notValidators', ['validate(rows, callback)', 'validate(rows)'])
+        }
+      }
       return this.beginValidate(rows, cb)
     },
     /**