vxe-table 3.3.16 → 3.4.2

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,delayHover:250,radioConfig:{strict:!0},checkboxConfig:{strict:!0},validConfig:{showMessage:!0,message:"default"},sortConfig:{showIcon:!0},filterConfig:{showIcon:!0},treeConfig:{rowtKey:"id",parentKey:"parentId",children:"children",hasChild:"hasChild",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},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:{TABLE_SORT_ASC:iconPrefix+"caret-top",TABLE_SORT_DESC:iconPrefix+"caret-bottom",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit-outline",TABLE_HELP:iconPrefix+"question",TABLE_TREE_LOADED:iconPrefix+"refresh roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"refresh roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",BUTTON_DROPDOWN:iconPrefix+"arrow-bottom",BUTTON_LOADING:iconPrefix+"refresh roll",SELECT_LOADED:iconPrefix+"refresh roll",SELECT_OPEN:iconPrefix+"caret-bottom rotate180",SELECT_CLOSE:iconPrefix+"caret-bottom",PAGER_JUMP_PREV:iconPrefix+"d-arrow-left",PAGER_JUMP_NEXT:iconPrefix+"d-arrow-right",PAGER_PREV_PAGE:iconPrefix+"arrow-left",PAGER_NEXT_PAGE:iconPrefix+"arrow-right",PAGER_JUMP_MORE:iconPrefix+"more",INPUT_CLEAR:iconPrefix+"close",INPUT_PWD:iconPrefix+"eye-slash",INPUT_SHOW_PWD:iconPrefix+"eye",INPUT_PREV_NUM:iconPrefix+"caret-top",INPUT_NEXT_NUM:iconPrefix+"caret-bottom",INPUT_DATE:iconPrefix+"calendar",INPUT_SEARCH:iconPrefix+"search",MODAL_ZOOM_IN:iconPrefix+"square",MODAL_ZOOM_OUT:iconPrefix+"zoomout",MODAL_CLOSE:iconPrefix+"close",MODAL_INFO:iconPrefix+"info",MODAL_SUCCESS:iconPrefix+"success",MODAL_WARNING:iconPrefix+"warning",MODAL_ERROR:iconPrefix+"error",MODAL_QUESTION:iconPrefix+"question",MODAL_LOADING:iconPrefix+"refresh roll",TOOLBAR_TOOLS_REFRESH:iconPrefix+"refresh",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"refresh roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_ZOOM_IN:iconPrefix+"zoomin",TOOLBAR_TOOLS_ZOOM_OUT:iconPrefix+"zoomout",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"menu",FORM_PREFIX:iconPrefix+"question",FORM_SUFFIX:iconPrefix+"question",FORM_FOLDING:iconPrefix+"arrow-top rotate180",FORM_UNFOLDING:iconPrefix+"arrow-top"},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",leaveDelay:300},pager:{},form:{validConfig:{showMessage:!0,autoPos:!0},titleAsterisk:!0},input:{minDate:new Date(1900,0,1),maxDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},textarea:{},select:{multiCharOverflow:8},toolbar:{},button:{},radio:{},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,radioConfig:{strict:!0},checkboxConfig:{strict:!0},validConfig:{showMessage:!0,message:"default"},sortConfig:{showIcon:!0},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",children:"children",hasChild:"hasChild",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},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:{TABLE_SORT_ASC:iconPrefix+"caret-top",TABLE_SORT_DESC:iconPrefix+"caret-bottom",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit-outline",TABLE_HELP:iconPrefix+"question",TABLE_TREE_LOADED:iconPrefix+"refresh roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"refresh roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",BUTTON_DROPDOWN:iconPrefix+"arrow-bottom",BUTTON_LOADING:iconPrefix+"refresh roll",SELECT_LOADED:iconPrefix+"refresh roll",SELECT_OPEN:iconPrefix+"caret-bottom rotate180",SELECT_CLOSE:iconPrefix+"caret-bottom",PAGER_JUMP_PREV:iconPrefix+"d-arrow-left",PAGER_JUMP_NEXT:iconPrefix+"d-arrow-right",PAGER_PREV_PAGE:iconPrefix+"arrow-left",PAGER_NEXT_PAGE:iconPrefix+"arrow-right",PAGER_JUMP_MORE:iconPrefix+"more",INPUT_CLEAR:iconPrefix+"close",INPUT_PWD:iconPrefix+"eye-slash",INPUT_SHOW_PWD:iconPrefix+"eye",INPUT_PREV_NUM:iconPrefix+"caret-top",INPUT_NEXT_NUM:iconPrefix+"caret-bottom",INPUT_DATE:iconPrefix+"calendar",INPUT_SEARCH:iconPrefix+"search",MODAL_ZOOM_IN:iconPrefix+"square",MODAL_ZOOM_OUT:iconPrefix+"zoomout",MODAL_CLOSE:iconPrefix+"close",MODAL_INFO:iconPrefix+"info",MODAL_SUCCESS:iconPrefix+"success",MODAL_WARNING:iconPrefix+"warning",MODAL_ERROR:iconPrefix+"error",MODAL_QUESTION:iconPrefix+"question",MODAL_LOADING:iconPrefix+"refresh roll",TOOLBAR_TOOLS_REFRESH:iconPrefix+"refresh",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"refresh roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_ZOOM_IN:iconPrefix+"zoomin",TOOLBAR_TOOLS_ZOOM_OUT:iconPrefix+"zoomout",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"menu",FORM_PREFIX:iconPrefix+"question",FORM_SUFFIX:iconPrefix+"question",FORM_FOLDING:iconPrefix+"arrow-top rotate180",FORM_UNFOLDING:iconPrefix+"arrow-top"},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",leaveDelay:300},pager:{},form:{validConfig:{showMessage:!0,autoPos:!0},titleAsterisk:!0},input:{minDate:new Date(1900,0,1),maxDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},textarea:{},select:{multiCharOverflow:8},toolbar:{},button:{},radio:{},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/validator/src/mixin.js

@@ -45,9 +45,14 @@ var Rule = /*#__PURE__*/function () {
 
 
   _createClass(Rule, [{
+    key: "content",
+    get: function get() {
+      return _tools.UtilTools.getFuncText(this.$options.content || this.$options.message);
+    }
+  }, {
     key: "message",
     get: function get() {
-      return _tools.UtilTools.getFuncText(this.$options.message);
+      return this.content;
     }
   }]);
 
@@ -334,7 +339,7 @@ var _default = {
                     errorRules.push(new Rule({
                       type: 'custom',
                       trigger: trigger,
-                      message: customValid.message,
+                      content: customValid.message,
                       rule: new Rule(rule)
                     }));
                   } else if (customValid.catch) {
@@ -344,7 +349,7 @@ var _default = {
                       errorRules.push(new Rule({
                         type: 'custom',
                         trigger: trigger,
-                        message: e && e.message ? e.message : rule.message,
+                        content: e && e.message ? e.message : rule.content || rule.message,
                         rule: new Rule(rule)
                       }));
                     }));
@@ -456,7 +461,7 @@ var _default = {
           column = params.column,
           cell = params.cell;
       var validTip = $refs.validTip;
-      var content = rule.message;
+      var content = rule.content;
       return this.$nextTick(function () {
         Object.assign(_this5.validStore, {
           row: row,

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")),_tools=require("../../tools"),_utils=require("../../tools/src/utils");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),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:"message",get:function(){return _tools.UtilTools.getFuncText(this.$options.message)}}]),t}();function validErrorRuleValue(e,t){var r=e.type,l=e.min,i=e.max,n=e.pattern,e="number"===r,r=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(l)&&r<_xeUtils.default.toNumber(l)||(!_xeUtils.default.eqNull(i)&&r>_xeUtils.default.toNumber(i)||!(!n||(_xeUtils.default.isRegExp(n)?n:new RegExp(n)).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,u,l){var s=this,o={},i=this.editRules,c=this.afterFullData,d=this.treeConfig,t=this.treeOpts;!0===e?r=c:e&&(_xeUtils.default.isFunction(e)?u=e:r=_xeUtils.default.isArray(e)?e:[e]);var r=r||this.getInsertRecords().concat(this.getUpdateRecords()),n=[];if(this.lastCallTime=Date.now(),this.validRuleErr=!1,this.clearValidate(),i){var a=this.getColumns(),e=function(r){var e;!l&&s.validRuleErr||(e=[],a.forEach(function(t){!l&&s.validRuleErr||!_xeUtils.default.has(i,t.property)||e.push(s.validCellRules("all",r,t).catch(function(e){e={rule:e.rule,rules:e.rules,rowIndex:s.getRowIndex(r),row:r,columnIndex:s.getColumnIndex(t),column:t,$table:s};if(o[t.property]||(o[t.property]=[]),o[t.property].push(e),!l)return s.validRuleErr=!0,Promise.reject(e)}))}),n.push(Promise.all(e)))};return d?_xeUtils.default.eachTree(r,e,t):r.forEach(e),Promise.all(n).then(function(){var e=Object.keys(o);return s.$nextTick().then(function(){return e.length?Promise.reject(o[e[0]][0]):void(u&&u())})}).catch(function(a){return new Promise(function(e,t){function r(){s.$nextTick(function(){u?(u(o),e()):t(o)})}function l(){a.cell=s.getCell(a.row,a.column),_tools.DomTools.scrollToView(a.cell),s.handleValidError(a).then(r)}var i=a.row,n=c.indexOf(i),i=0<n?c[n-1]:i;!1===s.validOpts.autoPos?r():(d?s.scrollToTreeRow(i):s.scrollToRow(i)).then(l)})})}return this.$nextTick().then(function(){u&&u()})},hasCellRules:function(t,e,r){var l=this.editRules,r=r.property;if(r&&l){r=_xeUtils.default.get(l,r);return r&&_xeUtils.default.find(r,function(e){return"all"===t||!e.trigger||t===e.trigger})}return!1},validCellRules:function(n,a,u,e){var s,o,c=this,t=this.editRules,r=u.property,d=[],f=[];return r&&t&&((s=_xeUtils.default.get(t,r))&&(o=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(a,r):e,s.forEach(function(t){var e,r=t.type,l=t.trigger,i=t.required;"all"!==n&&l&&n!==l||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({cellValue:o,rule:t,rules:s,row:a,rowIndex:c.getRowIndex(a),column:u,columnIndex:c.getColumnIndex(u),$table:c}))&&(_xeUtils.default.isError(e)?(c.validRuleErr=!0,d.push(new Rule({type:"custom",trigger:l,message:e.message,rule:new Rule(t)}))):e.catch&&f.push(e.catch(function(e){c.validRuleErr=!0,d.push(new Rule({type:"custom",trigger:l,message:(e&&e.message?e:t).message,rule:new Rule(t)}))}))):(r="array"===r?!_xeUtils.default.isArray(o)||!o.length:(0,_utils.eqEmptyValue)(o),(i?r||validErrorRuleValue(t,o):!r&&validErrorRuleValue(t,o))&&(c.validRuleErr=!0,d.push(new Rule(t)))))}))),Promise.all(f).then(function(){if(d.length){var e={rules:d,rule:d[0]};return Promise.reject(e)}})},_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 l=l.args,a=l.row,u=l.column,s=l.cell;if(this.hasCellRules(t,a,u))return this.validCellRules(t,a,u).then(function(){"row"===e.mode&&n.visible&&n.row===a&&n.column===u&&r.clearValidate()}).catch(function(e){e=e.rule;if(e.trigger&&t!==e.trigger)return Promise.resolve();e={rule:e,row:a,column:u,cell:s};return r.showValidTooltip(e),Promise.reject(e)})}return Promise.resolve()},showValidTooltip:function(e){var t=this,r=this.$refs,l=this.height,i=this.tableData,n=this.validOpts,a=e.rule,u=e.row,s=e.column,o=e.cell,c=r.validTip,d=a.message;return this.$nextTick(function(){if(Object.assign(t.validStore,{row:u,column:s,rule:a,content:d,visible:!0}),t.emitEvent("valid-error",e),c&&("tooltip"===n.message||"default"===n.message&&!l&&i.length<2))return c.open(o,d)})}}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_tools=require("../../tools"),_utils=require("../../tools/src/utils");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),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 _tools.UtilTools.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,n=e.pattern,e="number"===r,r=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(i)&&r<_xeUtils.default.toNumber(i)||(!_xeUtils.default.eqNull(l)&&r>_xeUtils.default.toNumber(l)||!(!n||(_xeUtils.default.isRegExp(n)?n:new RegExp(n)).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,u,i){var a=this,s={},l=this.editRules,c=this.afterFullData,d=this.treeConfig,t=this.treeOpts;!0===e?r=c:e&&(_xeUtils.default.isFunction(e)?u=e:r=_xeUtils.default.isArray(e)?e:[e]);var r=r||this.getInsertRecords().concat(this.getUpdateRecords()),n=[];if(this.lastCallTime=Date.now(),this.validRuleErr=!1,this.clearValidate(),l){var o=this.getColumns(),e=function(r){var e;!i&&a.validRuleErr||(e=[],o.forEach(function(t){!i&&a.validRuleErr||!_xeUtils.default.has(l,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,$table:a};if(s[t.property]||(s[t.property]=[]),s[t.property].push(e),!i)return a.validRuleErr=!0,Promise.reject(e)}))}),n.push(Promise.all(e)))};return d?_xeUtils.default.eachTree(r,e,t):r.forEach(e),Promise.all(n).then(function(){var e=Object.keys(s);return a.$nextTick().then(function(){return e.length?Promise.reject(s[e[0]][0]):void(u&&u())})}).catch(function(o){return new Promise(function(e,t){function r(){a.$nextTick(function(){u?(u(s),e()):t(s)})}function i(){o.cell=a.getCell(o.row,o.column),_tools.DomTools.scrollToView(o.cell),a.handleValidError(o).then(r)}var l=o.row,n=c.indexOf(l),l=0<n?c[n-1]:l;!1===a.validOpts.autoPos?r():(d?a.scrollToTreeRow(l):a.scrollToRow(l)).then(i)})})}return this.$nextTick().then(function(){u&&u()})},hasCellRules:function(t,e,r){var i=this.editRules,r=r.property;if(r&&i){r=_xeUtils.default.get(i,r);return r&&_xeUtils.default.find(r,function(e){return"all"===t||!e.trigger||t===e.trigger})}return!1},validCellRules:function(n,o,u,e){var a,s,c=this,t=this.editRules,r=u.property,d=[],f=[];return r&&t&&((a=_xeUtils.default.get(t,r))&&(s=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(o,r):e,a.forEach(function(t){var e,r=t.type,i=t.trigger,l=t.required;"all"!==n&&i&&n!==i||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({cellValue:s,rule:t,rules:a,row:o,rowIndex:c.getRowIndex(o),column:u,columnIndex:c.getColumnIndex(u),$table:c}))&&(_xeUtils.default.isError(e)?(c.validRuleErr=!0,d.push(new Rule({type:"custom",trigger:i,content:e.message,rule:new Rule(t)}))):e.catch&&f.push(e.catch(function(e){c.validRuleErr=!0,d.push(new Rule({type:"custom",trigger:i,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))}))):(r="array"===r?!_xeUtils.default.isArray(s)||!s.length:(0,_utils.eqEmptyValue)(s),(l?r||validErrorRuleValue(t,s):!r&&validErrorRuleValue(t,s))&&(c.validRuleErr=!0,d.push(new Rule(t)))))}))),Promise.all(f).then(function(){if(d.length){var e={rules:d,rule:d[0]};return Promise.reject(e)}})},_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 i=i.args,o=i.row,u=i.column,a=i.cell;if(this.hasCellRules(t,o,u))return this.validCellRules(t,o,u).then(function(){"row"===e.mode&&n.visible&&n.row===o&&n.column===u&&r.clearValidate()}).catch(function(e){e=e.rule;if(e.trigger&&t!==e.trigger)return Promise.resolve();e={rule:e,row:o,column:u,cell:a};return r.showValidTooltip(e),Promise.reject(e)})}return Promise.resolve()},showValidTooltip:function(e){var t=this,r=this.$refs,i=this.height,l=this.tableData,n=this.validOpts,o=e.rule,u=e.row,a=e.column,s=e.cell,c=r.validTip,d=o.content;return this.$nextTick(function(){if(Object.assign(t.validStore,{row:u,column:a,rule:o,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.3.16",
+  "version": "3.4.2",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟滚动、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、虚拟列表、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -85,7 +85,6 @@
     "vxe-table-plugin-menus": "^2.0.2",
     "vxe-table-plugin-renderer": "^1.3.5",
     "vxe-table-plugin-shortcut-key": "^1.5.1",
-    "vxe-table-plugin-virtual-tree": "0.6.11",
     "xe-ajax": "^4.0.5",
     "xe-clipboard": "^1.10.1",
     "xe-utils": "^3.4.0",

package/packages/edit/src/mixin.js

@@ -73,7 +73,7 @@ export default {
       this.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length
       this.handleTableData()
       this.updateFooter()
-      this.updateCache()
+      this.cacheRowMap()
       this.checkSelectionStatus()
       if (scrollYLoad) {
         this.updateScrollYSpace()
@@ -161,7 +161,7 @@ export default {
       this.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length
       this.handleTableData()
       this.updateFooter()
-      this.updateCache()
+      this.cacheRowMap()
       this.checkSelectionStatus()
       if (scrollYLoad) {
         this.updateScrollYSpace()

package/packages/export/src/mixin.js

@@ -543,13 +543,20 @@ export function saveLocalFile (options) {
     if (navigator.msSaveBlob) {
       navigator.msSaveBlob(blob, name)
     } else {
+      const url = URL.createObjectURL(blob)
       const linkElem = document.createElement('a')
       linkElem.target = '_blank'
       linkElem.download = name
-      linkElem.href = URL.createObjectURL(blob)
+      linkElem.href = url
       document.body.appendChild(linkElem)
       linkElem.click()
       document.body.removeChild(linkElem)
+      requestAnimationFrame(() => {
+        if (linkElem.parentNode) {
+          linkElem.parentNode.removeChild(linkElem)
+        }
+        URL.revokeObjectURL(url)
+      })
     }
     return Promise.resolve()
   }
@@ -564,6 +571,12 @@ function downloadFile ($xetable, opts, content) {
   }
   saveLocalFile({ filename, type, content }).then(() => {
     if (opts.message !== false) {
+      // 检测弹窗模块
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (!VXETable.modal) {
+          UtilTools.error('vxe.error.reqModule', ['Modal'])
+        }
+      }
       VXETable.modal.message({ content: GlobalConfig.i18n('vxe.table.expSuccess'), status: 'success' })
     }
   })
@@ -785,6 +798,12 @@ function handleImport ($xetable, content, opts) {
           loadRest = $xetable.reloadData(data)
         }
         if (opts.message !== false) {
+          // 检测弹窗模块
+          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (!VXETable.modal) {
+              UtilTools.error('vxe.error.reqModule', ['Modal'])
+            }
+          }
           VXETable.modal.message({ content: GlobalConfig.i18n('vxe.table.impSuccess', [rows.length]), status: 'success' })
         }
         return loadRest.then(() => {
@@ -794,6 +813,12 @@ function handleImport ($xetable, content, opts) {
         })
       })
   } else if (opts.message !== false) {
+    // 检测弹窗模块
+    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (!VXETable.modal) {
+        UtilTools.error('vxe.error.reqModule', ['Modal'])
+      }
+    }
     VXETable.modal.message({ content: GlobalConfig.i18n('vxe.error.impFields'), status: 'error' })
     if (_importReject) {
       _importReject({ status: false })
@@ -808,6 +833,12 @@ function handleFileImport ($xetable, file, opts) {
   // 检查类型，如果为自定义导出，则不需要校验类型
   if (!importMethod && !XEUtils.includes(VXETable.config.importTypes, type)) {
     if (opts.message !== false) {
+      // 检测弹窗模块
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (!VXETable.modal) {
+          UtilTools.error('vxe.error.reqModule', ['Modal'])
+        }
+      }
       VXETable.modal.message({ content: GlobalConfig.i18n('vxe.error.notType', [type]), status: 'error' })
     }
     const params = { status: false }
@@ -910,6 +941,12 @@ export function readLocalFile (options = {}) {
         resolve({ status: true, files, file })
       } else {
         if (options.message !== false) {
+          // 检测弹窗模块
+          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (!VXETable.modal) {
+              UtilTools.error('vxe.error.reqModule', ['Modal'])
+            }
+          }
           VXETable.modal.message({ content: GlobalConfig.i18n('vxe.error.notType', [errType]), status: 'error' })
         }
         const params = { status: false, files, file }

package/packages/form/src/form.js

@@ -23,8 +23,12 @@ class Rule {
     })
   }
 
+  get content () {
+    return UtilTools.getFuncText(this.$options.content || this.$options.message)
+  }
+
   get message () {
-    return UtilTools.getFuncText(this.$options.message)
+    return this.content
   }
 }
 
@@ -158,7 +162,7 @@ function renderItems (h, _vm, itemList) {
               style: errRule.maxWidth ? {
                 width: `${errRule.maxWidth}px`
               } : null
-            }, errRule.message) : null
+            }, errRule.content) : null
           ])
         )
       ])
@@ -174,10 +178,10 @@ export default {
     loading: Boolean,
     data: Object,
     size: { type: String, default: () => GlobalConfig.form.size || GlobalConfig.size },
-    span: [String, Number],
+    span: { type: [String, Number], default: () => GlobalConfig.form.span },
     align: { type: String, default: () => GlobalConfig.form.align },
     titleAlign: { type: String, default: () => GlobalConfig.form.titleAlign },
-    titleWidth: [String, Number],
+    titleWidth: { type: [String, Number], default: () => GlobalConfig.form.titleWidth },
     titleColon: { type: Boolean, default: () => GlobalConfig.form.titleColon },
     titleAsterisk: { type: Boolean, default: () => GlobalConfig.form.titleAsterisk },
     titleOverflow: { type: [Boolean, String], default: null },
@@ -538,12 +542,12 @@ export default {
                 })
                 if (customValid) {
                   if (XEUtils.isError(customValid)) {
-                    errorRules.push(new Rule({ type: 'custom', trigger, message: customValid.message, rule: new Rule(rule) }))
+                    errorRules.push(new Rule({ type: 'custom', trigger, content: customValid.message, rule: new Rule(rule) }))
                   } else if (customValid.catch) {
                     // 如果为异步校验（注：异步校验是并发无序的）
                     syncVailds.push(
                       customValid.catch(e => {
-                        errorRules.push(new Rule({ type: 'custom', trigger, message: e ? e.message : rule.message, rule: new Rule(rule) }))
+                        errorRules.push(new Rule({ type: 'custom', trigger, content: e ? e.message : (rule.content || rule.message), rule: new Rule(rule) }))
                       })
                     )
                   }

package/packages/form/src/render.js

@@ -31,10 +31,10 @@ export function renderTitle (h, _vm, item) {
   const titVNs = []
   if (titlePrefix) {
     titVNs.push(
-      titlePrefix.message
+      (titlePrefix.content || titlePrefix.message)
         ? h('vxe-tooltip', {
           props: {
-            content: UtilTools.getFuncText(titlePrefix.message),
+            content: UtilTools.getFuncText(titlePrefix.content || titlePrefix.message),
             enterable: titlePrefix.enterable,
             theme: titlePrefix.theme
           }
@@ -57,10 +57,10 @@ export function renderTitle (h, _vm, item) {
   const fixVNs = []
   if (titleSuffix) {
     fixVNs.push(
-      titleSuffix.message
+      (titleSuffix.content || titleSuffix.message)
         ? h('vxe-tooltip', {
           props: {
-            content: UtilTools.getFuncText(titleSuffix.message),
+            content: UtilTools.getFuncText(titleSuffix.content || titleSuffix.message),
             enterable: titleSuffix.enterable,
             theme: titleSuffix.theme
           }

package/packages/grid/src/grid.js

@@ -610,6 +610,12 @@ export default {
                     this.tableLoading = false
                     this.pendingRecords = this.pendingRecords.filter(row => removeRecords.indexOf(row) === -1)
                     if (isMsg) {
+                      // 检测弹窗模块
+                      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                        if (!VXETable.modal) {
+                          UtilTools.error('vxe.error.reqModule', ['Modal'])
+                        }
+                      }
                       VXETable.modal.message({ content: this.getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' })
                     }
                     if (afterDelete) {
@@ -621,12 +627,24 @@ export default {
                   .catch(rest => {
                     this.tableLoading = false
                     if (isMsg) {
+                      // 检测弹窗模块
+                      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                        if (!VXETable.modal) {
+                          UtilTools.error('vxe.error.reqModule', ['Modal'])
+                        }
+                      }
                       VXETable.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                     }
                   })
               })
             } else {
               if (isMsg) {
+                // 检测弹窗模块
+                if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                  if (!VXETable.modal) {
+                    UtilTools.error('vxe.error.reqModule', ['Modal'])
+                  }
+                }
                 VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' })
               }
             }
@@ -660,6 +678,12 @@ export default {
                     this.tableLoading = false
                     this.pendingRecords = []
                     if (isMsg) {
+                      // 检测弹窗模块
+                      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                        if (!VXETable.modal) {
+                          UtilTools.error('vxe.error.reqModule', ['Modal'])
+                        }
+                      }
                       VXETable.modal.message({ content: this.getRespMsg(rest, 'vxe.grid.saveSuccess'), status: 'success' })
                     }
                     if (afterSave) {
@@ -671,11 +695,23 @@ export default {
                   .catch(rest => {
                     this.tableLoading = false
                     if (isMsg) {
+                      // 检测弹窗模块
+                      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                        if (!VXETable.modal) {
+                          UtilTools.error('vxe.error.reqModule', ['Modal'])
+                        }
+                      }
                       VXETable.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                     }
                   })
               } else {
                 if (isMsg) {
+                  // 检测弹窗模块
+                  if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                    if (!VXETable.modal) {
+                      UtilTools.error('vxe.error.reqModule', ['Modal'])
+                    }
+                  }
                   VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.dataUnchanged'), status: 'info' })
                 }
               }
@@ -714,6 +750,12 @@ export default {
             }
           })
         } else {
+          // 检测弹窗模块
+          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (!VXETable.modal) {
+              UtilTools.error('vxe.error.reqModule', ['Modal'])
+            }
+          }
           VXETable.modal.message({ id: `msg_${code}`, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' })
         }
       } else {
@@ -763,6 +805,12 @@ export default {
         this.clearCheckboxRow()
       } else {
         if (isMsg) {
+          // 检测弹窗模块
+          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (!VXETable.modal) {
+              UtilTools.error('vxe.error.reqModule', ['Modal'])
+            }
+          }
           VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' })
         }
       }

package/packages/header/src/header.js

@@ -41,7 +41,7 @@ export default {
   },
   render (h) {
     const { _e, $parent: $xetable, fixedType, headerColumn, fixedColumn } = this
-    const { $listeners: tableListeners, tId, isGroup, resizable, border, columnKey, headerRowClassName, headerCellClassName, headerRowStyle, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, highlightCurrentColumn, currentColumn, scrollXLoad, overflowX, scrollbarWidth, sortOpts, mouseConfig } = $xetable
+    const { $listeners: tableListeners, tId, isGroup, resizable, border, columnKey, headerRowClassName, headerCellClassName, headerRowStyle, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, highlightCurrentColumn, currentColumn, scrollXLoad, overflowX, scrollbarWidth, sortOpts, mouseConfig, columnOpts } = $xetable
     let { tableColumn } = this
     let headerGroups = headerColumn
     // 如果是使用优化模式
@@ -164,7 +164,7 @@ export default {
               /**
                * 列宽拖动
                */
-              !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : resizable) ? h('div', {
+              !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || resizable)) ? h('div', {
                 class: ['vxe-resizable', {
                   'is--line': !border || border === 'none'
                 }],

package/packages/select/src/select.js

@@ -291,17 +291,17 @@ export default {
         this.fullGroupList = []
         this.fullOptionList = value
       }
-      this.updateCache()
+      this.cacheItemMap()
     },
     options (value) {
       this.fullGroupList = []
       this.fullOptionList = value
-      this.updateCache()
+      this.cacheItemMap()
     },
     optionGroups (value) {
       this.fullOptionList = []
       this.fullGroupList = value
-      this.updateCache()
+      this.cacheItemMap()
     }
   },
   created () {
@@ -311,7 +311,7 @@ export default {
     } else if (options) {
       this.fullOptionList = options
     }
-    this.updateCache()
+    this.cacheItemMap()
     GlobalEvent.on(this, 'mousewheel', this.handleGlobalMousewheelEvent)
     GlobalEvent.on(this, 'mousedown', this.handleGlobalMousedownEvent)
     GlobalEvent.on(this, 'keydown', this.handleGlobalKeydownEvent)
@@ -401,7 +401,7 @@ export default {
       }
       return []
     },
-    updateCache () {
+    cacheItemMap () {
       const { fullOptionList, fullGroupList, groupOptionsField } = this
       const optkey = getOptkey(this)
       const handleOptis = (item) => {

package/packages/table/src/body.js

@@ -72,11 +72,13 @@ function renderColumn (h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel,
     validOpts,
     editStore,
     validStore,
-    tooltipConfig
+    tooltipConfig,
+    rowOpts
   } = $xetable
   const { type, cellRender, editRender, align, showOverflow, className, treeNode } = column
   const { actived } = editStore
-  const { rHeight } = sYOpts
+  const { rHeight: scrollYRHeight } = sYOpts
+  const { height: rowHeight } = rowOpts
   const showAllTip = tooltipOpts.showAll || tooltipOpts.enabled
   const columnIndex = $xetable.getColumnIndex(column)
   const _columnIndex = $xetable.getVTColumnIndex(column)
@@ -204,7 +206,7 @@ function renderColumn (h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel,
           'c--ellipsis': showEllipsis
         }],
         style: {
-          maxHeight: hasEllipsis && rHeight ? `${rHeight}px` : ''
+          maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
         }
       })
     )
@@ -219,7 +221,7 @@ function renderColumn (h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel,
           'c--ellipsis': showEllipsis
         }],
         style: {
-          maxHeight: hasEllipsis && rHeight ? `${rHeight}px` : ''
+          maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
         },
         attrs: {
           title: showTitle ? $xetable.getCellLabel(row, column) : null
@@ -258,13 +260,13 @@ function renderColumn (h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel,
     key: columnKey ? column.id : $columnIndex,
     attrs,
     style: Object.assign({
-      height: hasEllipsis && rHeight ? `${rHeight}px` : ''
+      height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
     }, cellStyle ? (XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle) : null),
     on: tdOns
   }, tdVNs)
 }
 
-function renderRows (h, _vm, $xetable, $seq, rowLevel, fixedType, tableData, tableColumn) {
+function renderRows (h, _vm, $xetable, $seq, fixedType, tableData, tableColumn) {
   const {
     stripe,
     rowKey,
@@ -284,7 +286,8 @@ function renderRows (h, _vm, $xetable, $seq, rowLevel, fixedType, tableData, tab
     radioOpts,
     checkboxOpts,
     expandColumn,
-    hasFixedColumn
+    hasFixedColumn,
+    fullAllDataRowIdData
   } = $xetable
   const rows = []
   tableData.forEach((row, $rowIndex) => {
@@ -313,6 +316,8 @@ function renderRows (h, _vm, $xetable, $seq, rowLevel, fixedType, tableData, tab
       }
     }
     const rowid = UtilTools.getRowid($xetable, row)
+    const rest = fullAllDataRowIdData[rowid]
+    const rowLevel = rest ? rest.level : 0
     const params = { $table: $xetable, $seq, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex }
     let isNewRow = false
     if (editConfig) {
@@ -375,10 +380,10 @@ function renderRows (h, _vm, $xetable, $seq, rowLevel, fixedType, tableData, tab
       )
     }
     // 如果是树形表格
-    if (treeConfig && treeExpandeds.length) {
+    if (treeConfig && !scrollYLoad && treeExpandeds.length) {
       const rowChildren = row[treeOpts.children]
       if (rowChildren && rowChildren.length && treeExpandeds.indexOf(row) > -1) {
-        rows.push(...renderRows(h, _vm, $xetable, $seq ? `${$seq}.${seq}` : `${seq}`, rowLevel + 1, fixedType, rowChildren, tableColumn))
+        rows.push(...renderRows(h, _vm, $xetable, $seq ? `${$seq}.${seq}` : `${seq}`, fixedType, rowChildren, tableColumn))
       }
     }
   })
@@ -523,7 +528,7 @@ export default {
          */
         h('tbody', {
           ref: 'tbody'
-        }, renderRows(h, this, $xetable, '', 0, fixedType, tableData, tableColumn))
+        }, renderRows(h, this, $xetable, '', fixedType, tableData, tableColumn))
       ]),
       h('div', {
         class: 'vxe-table--checkbox-range'