vxe-table 4.1.5 → 4.1.8

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

@@ -16,6 +16,7 @@ var GlobalConfig = {
     showHeader: true,
     animat: true,
     delayHover: 250,
+    autoResize: true,
     // keepSource: false,
     // showOverflow: null,
     // showHeaderOverflow: null,
@@ -23,7 +24,6 @@ var GlobalConfig = {
     // resizeInterval: 500,
     // size: null,
     // zIndex: null,
-    // autoResize: false,
     // stripe: false,
     // border: false,
     // round: false,
@@ -96,6 +96,9 @@ var GlobalConfig = {
     mouseConfig: {
       extension: true
     },
+    keyboardConfig: {
+      isEsc: true
+    },
     areaConfig: {
       selectCellByHeader: true
     },

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--",GlobalConfig={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}},_default=GlobalConfig;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var iconPrefix="vxe-icon--",GlobalConfig={size:null,zIndex:999,version:0,emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,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},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:{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}},_default=GlobalConfig;exports.default=_default;

package/lib/validator/src/hook.js

@@ -203,7 +203,7 @@ var validatorHook = {
           var ruleProps = Object.keys(validRest);
           return (0, _vue.nextTick)().then(function () {
             if (ruleProps.length) {
-              return Promise.reject(validRest[ruleProps[0]][0]);
+              return validRest[ruleProps[0]][0];
             }
 
             if (cb) {
@@ -211,14 +211,14 @@ var validatorHook = {
             }
           });
         }).catch(function (firstErrParams) {
-          return new Promise(function (resolve, reject) {
+          return new Promise(function (resolve) {
             var finish = function finish() {
               (0, _vue.nextTick)(function () {
                 if (cb) {
                   cb(validRest);
                   resolve();
                 } else {
-                  reject(validRest);
+                  resolve(validRest);
                 }
               });
             };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../tools/utils"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,r=1,l=arguments.length;r<l;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},Rule=function(){function e(e){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 Object.defineProperty(e.prototype,"content",{get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"message",{get:function(){return this.content},enumerable:!1,configurable:!0}),e}(),tableValidatorMethodKeys=["fullValidate","validate","clearValidate"],validatorHook={setupTable:function(f){function r(e,o,l){var a={},n=v.editRules,s=v.treeConfig,c=m.afterFullData,t=x.value,d=_.value;!0===e?r=c:e&&(_xeUtils.default.isFunction(e)?o=e:r=_xeUtils.default.isArray(e)?e:[e]);var r=r||(f.getInsertRecords?f.getInsertRecords().concat(f.getUpdateRecords()):[]),i=[];if(m._lastCallTime=Date.now(),g=!1,w.clearValidate(),n){var u=f.getColumns(),e=function(r){var e;!l&&g||(e=[],u.forEach(function(t){!l&&g||!_xeUtils.default.has(n,t.property)||e.push(b.validCellRules("all",r,t).catch(function(e){e={rule:e.rule,rules:e.rules,rowIndex:f.getRowIndex(r),row:r,columnIndex:f.getColumnIndex(t),column:t,$table:f};if(a[t.property]||(a[t.property]=[]),a[t.property].push(e),!l)return g=!0,Promise.reject(e)}))}),i.push(Promise.all(e)))};return s?_xeUtils.default.eachTree(r,e,t):r.forEach(e),Promise.all(i).then(function(){var e=Object.keys(a);return(0,_vue.nextTick)().then(function(){return e.length?Promise.reject(a[e[0]][0]):void(o&&o())})}).catch(function(u){return new Promise(function(e,t){function r(){var t;u.cell=f.getCell(u.row,u.column),(0,_dom.scrollToView)(u.cell),t=u,new Promise(function(e){!1===_.value.autoPos?(f.dispatchEvent("valid-error",t,null),e()):f.handleActived(t,{type:"valid-error",trigger:"call"}).then(function(){setTimeout(function(){e(b.showValidTooltip(t))},10)})}).then(l)}var l=function(){(0,_vue.nextTick)(function(){o?(o(a),e()):t(a)})},n=u.row,i=c.indexOf(n),n=0<i?c[i-1]:n;!1===d.autoPos?l():(s?f.scrollToTreeRow(n):f.scrollToRow(n)).then(r)})})}return(0,_vue.nextTick)().then(function(){o&&o()})}function p(e,t){var r=e.type,l=e.min,n=e.max,i=e.pattern,r=(e="number"===r)?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(l)&&r<_xeUtils.default.toNumber(l)||(!_xeUtils.default.eqNull(n)&&r>_xeUtils.default.toNumber(n)||!(!i||(_xeUtils.default.isRegExp(i)?i:new RegExp(i)).test(t))))}var g,v=f.props,d=f.reactData,m=f.internalData,h=f.getRefMaps().refValidTooltip,e=f.getComputeMaps(),_=e.computeValidOpts,x=e.computeTreeOpts,s=e.computeEditOpts,w={},b={},b={validCellRules:function(i,u,o,e){var a,s,t=v.editRules,r=o.property,c=[],d=[];return r&&t&&((a=_xeUtils.default.get(t,r))&&(s=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(u,r):e,a.forEach(function(t){var e,r=t.type,l=t.trigger,n=t.required;"all"!==i&&l&&i!==l||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({cellValue:s,rule:t,rules:a,row:u,rowIndex:f.getRowIndex(u),column:o,columnIndex:f.getColumnIndex(o),$table:f}))&&(_xeUtils.default.isError(e)?(g=!0,c.push(new Rule({type:"custom",trigger:l,content:e.message,rule:new Rule(t)}))):e.catch&&d.push(e.catch(function(e){g=!0,c.push(new Rule({type:"custom",trigger:l,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),(n?r||p(t,s):!r&&p(t,s))&&(g=!0,c.push(new Rule(t)))))}))),Promise.all(d).then(function(){if(c.length){var e={rules:c,rule:c[0]};return Promise.reject(e)}})},hasCellRules:function(t,e,r){var l=v.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},triggerValidate:function(t){var e=v.editConfig,r=v.editRules,l=d.editStore,n=d.validStore,l=l.actived,i=s.value;if(e&&r&&l.row){var l=l.args,u=l.row,o=l.column,a=l.cell;if(b.hasCellRules(t,u,o))return b.validCellRules(t,u,o).then(function(){"row"===i.mode&&n.visible&&n.row===u&&n.column===o&&w.clearValidate()}).catch(function(e){e=e.rule;if(e.trigger&&t!==e.trigger)return Promise.resolve();e={rule:e,row:u,column:o,cell:a};return b.showValidTooltip(e),Promise.reject(e)})}return Promise.resolve()},showValidTooltip:function(e){var t=v.height,r=d.tableData,l=d.validStore,n=_.value,i=e.rule,u=e.row,o=e.column,a=e.cell,s=h.value,c=i.content;return(0,_vue.nextTick)().then(function(){if(Object.assign(l,{row:u,column:o,rule:i,content:c,visible:!0}),f.dispatchEvent("valid-error",e,null),s&&("tooltip"===n.message||"default"===n.message&&!t&&r.length<2))return s.open(a,c)})}};return __assign(__assign({},w={fullValidate:function(e,t){return r(e,t,!0)},validate:function(e,t){return r(e,t)},clearValidate:function(){var e=d.validStore,t=h.value;return Object.assign(e,{visible:!1,row:null,column:null,content:"",rule:null}),t&&t.reactData.visible&&t.close(),(0,_vue.nextTick)()}}),b)},setupGrid:function(e){return e.extendTableMethods(tableValidatorMethodKeys)}},_default=validatorHook;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../tools/utils"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,r=1,l=arguments.length;r<l;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},Rule=function(){function e(e){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 Object.defineProperty(e.prototype,"content",{get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"message",{get:function(){return this.content},enumerable:!1,configurable:!0}),e}(),tableValidatorMethodKeys=["fullValidate","validate","clearValidate"],validatorHook={setupTable:function(f){function r(e,u,l){var o={},n=v.editRules,a=v.treeConfig,s=m.afterFullData,t=x.value,c=_.value;!0===e?r=s:e&&(_xeUtils.default.isFunction(e)?u=e:r=_xeUtils.default.isArray(e)?e:[e]);var r=r||(f.getInsertRecords?f.getInsertRecords().concat(f.getUpdateRecords()):[]),i=[];if(m._lastCallTime=Date.now(),g=!1,w.clearValidate(),n){var d=f.getColumns(),e=function(r){var e;!l&&g||(e=[],d.forEach(function(t){!l&&g||!_xeUtils.default.has(n,t.property)||e.push(b.validCellRules("all",r,t).catch(function(e){e={rule:e.rule,rules:e.rules,rowIndex:f.getRowIndex(r),row:r,columnIndex:f.getColumnIndex(t),column:t,$table:f};if(o[t.property]||(o[t.property]=[]),o[t.property].push(e),!l)return g=!0,Promise.reject(e)}))}),i.push(Promise.all(e)))};return a?_xeUtils.default.eachTree(r,e,t):r.forEach(e),Promise.all(i).then(function(){var e=Object.keys(o);return(0,_vue.nextTick)().then(function(){return e.length?o[e[0]][0]:void(u&&u())})}).catch(function(i){return new Promise(function(e){function t(){var t;i.cell=f.getCell(i.row,i.column),(0,_dom.scrollToView)(i.cell),t=i,new Promise(function(e){!1===_.value.autoPos?(f.dispatchEvent("valid-error",t,null),e()):f.handleActived(t,{type:"valid-error",trigger:"call"}).then(function(){setTimeout(function(){e(b.showValidTooltip(t))},10)})}).then(r)}var r=function(){(0,_vue.nextTick)(function(){u?(u(o),e()):e(o)})},l=i.row,n=s.indexOf(l),l=0<n?s[n-1]:l;!1===c.autoPos?r():(a?f.scrollToTreeRow(l):f.scrollToRow(l)).then(t)})})}return(0,_vue.nextTick)().then(function(){u&&u()})}function p(e,t){var r=e.type,l=e.min,n=e.max,i=e.pattern,r=(e="number"===r)?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(l)&&r<_xeUtils.default.toNumber(l)||(!_xeUtils.default.eqNull(n)&&r>_xeUtils.default.toNumber(n)||!(!i||(_xeUtils.default.isRegExp(i)?i:new RegExp(i)).test(t))))}var g,v=f.props,d=f.reactData,m=f.internalData,h=f.getRefMaps().refValidTooltip,e=f.getComputeMaps(),_=e.computeValidOpts,x=e.computeTreeOpts,s=e.computeEditOpts,w={},b={},b={validCellRules:function(i,u,o,e){var a,s,t=v.editRules,r=o.property,c=[],d=[];return r&&t&&((a=_xeUtils.default.get(t,r))&&(s=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(u,r):e,a.forEach(function(t){var e,r=t.type,l=t.trigger,n=t.required;"all"!==i&&l&&i!==l||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({cellValue:s,rule:t,rules:a,row:u,rowIndex:f.getRowIndex(u),column:o,columnIndex:f.getColumnIndex(o),$table:f}))&&(_xeUtils.default.isError(e)?(g=!0,c.push(new Rule({type:"custom",trigger:l,content:e.message,rule:new Rule(t)}))):e.catch&&d.push(e.catch(function(e){g=!0,c.push(new Rule({type:"custom",trigger:l,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),(n?r||p(t,s):!r&&p(t,s))&&(g=!0,c.push(new Rule(t)))))}))),Promise.all(d).then(function(){if(c.length){var e={rules:c,rule:c[0]};return Promise.reject(e)}})},hasCellRules:function(t,e,r){var l=v.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},triggerValidate:function(t){var e=v.editConfig,r=v.editRules,l=d.editStore,n=d.validStore,l=l.actived,i=s.value;if(e&&r&&l.row){var l=l.args,u=l.row,o=l.column,a=l.cell;if(b.hasCellRules(t,u,o))return b.validCellRules(t,u,o).then(function(){"row"===i.mode&&n.visible&&n.row===u&&n.column===o&&w.clearValidate()}).catch(function(e){e=e.rule;if(e.trigger&&t!==e.trigger)return Promise.resolve();e={rule:e,row:u,column:o,cell:a};return b.showValidTooltip(e),Promise.reject(e)})}return Promise.resolve()},showValidTooltip:function(e){var t=v.height,r=d.tableData,l=d.validStore,n=_.value,i=e.rule,u=e.row,o=e.column,a=e.cell,s=h.value,c=i.content;return(0,_vue.nextTick)().then(function(){if(Object.assign(l,{row:u,column:o,rule:i,content:c,visible:!0}),f.dispatchEvent("valid-error",e,null),s&&("tooltip"===n.message||"default"===n.message&&!t&&r.length<2))return s.open(a,c)})}};return __assign(__assign({},w={fullValidate:function(e,t){return r(e,t,!0)},validate:function(e,t){return r(e,t)},clearValidate:function(){var e=d.validStore,t=h.value;return Object.assign(e,{visible:!1,row:null,column:null,content:"",rule:null}),t&&t.reactData.visible&&t.close(),(0,_vue.nextTick)()}}),b)},setupGrid:function(e){return e.extendTableMethods(tableValidatorMethodKeys)}},_default=validatorHook;exports.default=_default;

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "vxe-table",
-  "version": "4.1.5",
+  "version": "4.1.8",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",
     "lint": "vue-cli-service lint",
-    "build": "npm run build:examples & npm run build:docs",
-    "build:examples": "vue-cli-service build",
-    "build:docs": "gulp update_docs",
+    "build": "vue-cli-service build",
     "lib:modules": "gulp build",
     "lib:pack": "vue-cli-service build --target lib --name index --dest lib_temp index.ts",
     "lib": "npm run lib:pack && npm run lib:modules",
@@ -29,9 +27,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "devDependencies": {
-    "@types/qrcode": "^1.4.1",
     "@types/resize-observer-browser": "^0.1.6",
-    "@types/sortablejs": "^1.10.7",
     "@typescript-eslint/eslint-plugin": "^4.18.0",
     "@typescript-eslint/parser": "^4.18.0",
     "@vue/cli-plugin-babel": "~4.5.0",
@@ -43,18 +39,13 @@
     "@vue/compiler-sfc": "^3.2.18",
     "@vue/eslint-config-standard": "^5.1.2",
     "@vue/eslint-config-typescript": "^7.0.0",
-    "ant-design-vue": "^2.2.8",
     "core-js": "^3.6.5",
-    "dayjs": "^1.10.7",
-    "element-plus": "^1.1.0-beta.24",
     "eslint": "^6.7.2",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.0",
     "eslint-plugin-vue": "^7.0.0",
-    "exceljs": "^4.3.0",
-    "font-awesome": "^4.7.0",
     "gulp": "^4.0.2",
     "gulp-autoprefixer": "^6.1.0",
     "gulp-babel": "^8.0.0",
@@ -67,29 +58,15 @@
     "gulp-sourcemaps": "^2.6.5",
     "gulp-typescript": "^5.0.1",
     "gulp-uglify": "^3.0.2",
-    "highlight.js": "^11.2.0",
-    "jsbarcode": "^3.11.0",
-    "jspdf": "^2.4.0",
     "node-sass": "^6.0.1",
-    "qrcode": "^1.4.4",
     "sass-loader": "^10.0.5",
-    "sortablejs": "^1.14.0",
     "typescript": "~4.3.5",
     "vue": "^3.2.21",
     "vue-i18n": "^9.1.7",
     "vue-router": "^4.0.11",
     "vuex": "^4.0.2",
-    "vxe-table-plugin-antd": "^3.0.5",
-    "vxe-table-plugin-element": "^3.0.5",
-    "vxe-table-plugin-export-pdf": "^3.0.2",
-    "vxe-table-plugin-export-xlsx": "^3.0.3",
-    "vxe-table-plugin-menus": "^3.0.6",
-    "vxe-table-plugin-renderer": "^3.0.2",
-    "vxe-table-plugin-shortcut-key": "^3.0.2",
     "xe-ajax": "^4.0.5",
-    "xe-clipboard": "^1.10.1",
-    "xe-utils": "^3.4.0",
-    "xlsx": "^0.17.2"
+    "xe-utils": "^3.4.0"
   },
   "peerDependencies": {
     "vue": "^3.2.2",

package/packages/export/src/hook.ts

@@ -100,6 +100,9 @@ function getFooterData (opts: any, footerTableData: any) {
 
 function getCsvCellTypeLabel (column: any, cellValue: any) {
   if (cellValue) {
+    if (column.type === 'seq') {
+      return `\t${cellValue}`
+    }
     switch (column.cellType) {
       case 'string':
         if (!isNaN(cellValue)) {
@@ -292,10 +295,16 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
       return row[treeOpts.children] && row[treeOpts.children].length
     }
 
-    const getSeq = (row: any, rowIndex: any, column: any, columnIndex: any) => {
+    const getSeq = (row: any, rowIndex: any, column: any, columnIndex: any, paths: string[] | null) => {
       const seqOpts = computeSeqOpts.value
       const seqMethod = seqOpts.seqMethod || column.seqMethod
-      return seqMethod ? seqMethod({ row, rowIndex, column, columnIndex }) : (seqOpts.startIndex + rowIndex + 1)
+      if (seqMethod) {
+        return seqMethod({ row, rowIndex, column, columnIndex })
+      }
+      if (paths) {
+        return paths.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('')
+      }
+      return seqOpts.startIndex + rowIndex + 1
     }
 
     const toBooleanValue = (cellValue: any) => {
@@ -314,10 +323,11 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
       if (treeConfig) {
         // 如果是树表格只允许导出数据源
         const rest: any[] = []
+        const expandMaps: Map<any, number> = new Map()
         XEUtils.eachTree(datas, (item, rowIndex, items, path, parent, nodes) => {
           const row = item._row || item
           const parentRow = parent && parent._row ? parent._row : parent
-          if ((isAllExpand || !parentRow || $xetable.isTreeExpandByRow(parentRow))) {
+          if ((isAllExpand || !parentRow || (expandMaps.has(parentRow) && $xetable.isTreeExpandByRow(parentRow)))) {
             const hasRowChild = hasTreeChildren(row)
             const item: any = {
               _row: row,
@@ -340,7 +350,7 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
               } else {
                 switch (column.type) {
                   case 'seq':
-                    cellValue = getSeq(row, rowIndex, column, columnIndex)
+                    cellValue = getSeq(row, rowIndex, column, columnIndex, path)
                     break
                   case 'checkbox':
                     cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row))
@@ -371,6 +381,7 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
               }
               item[column.id] = XEUtils.toValueString(cellValue)
             })
+            expandMaps.set(row, 1)
             rest.push(Object.assign(item, row))
           }
         }, treeOpts)
@@ -395,7 +406,7 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
           } else {
             switch (column.type) {
               case 'seq':
-                cellValue = getSeq(row, rowIndex, column, columnIndex)
+                cellValue = getSeq(row, rowIndex, column, columnIndex, [])
                 break
               case 'checkbox':
                 cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row))

package/packages/form/src/form.ts

@@ -395,7 +395,7 @@ export default defineComponent({
             callback()
           }
         }).catch(() => {
-          return new Promise<void>((resolve, reject) => {
+          return new Promise<void>((resolve) => {
             showErrTime = window.setTimeout(() => {
               itemList.forEach((item) => {
                 if (item.errRule) {
@@ -412,7 +412,7 @@ export default defineComponent({
               callback(validRest)
               resolve()
             } else {
-              reject(validRest)
+              resolve(validRest)
             }
           })
         })

package/packages/grid/src/grid.ts

@@ -871,7 +871,11 @@ export default defineComponent({
                 body.insertRecords = insertRecords.filter((row) => $xetable.findRowIndexOf(pendingRecords, row) === -1)
               }
               // 只校验新增和修改的数据
-              return $xetable.validate(body.insertRecords.concat(updateRecords)).then(() => {
+              return $xetable.validate(body.insertRecords.concat(updateRecords)).then((errMap) => {
+                if (errMap) {
+                  // 如果校验不通过
+                  return
+                }
                 if (body.insertRecords.length || removeRecords.length || updateRecords.length || body.pendingRecords.length) {
                   reactData.tableLoading = true
                   return Promise.resolve((beforeSave || ajaxMethods)(...applyArgs))
@@ -916,7 +920,7 @@ export default defineComponent({
                     VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.dataUnchanged'), status: 'info' })
                   }
                 }
-              }).catch((errMap: any) => errMap)
+              })
             } else {
               if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                 errLog('vxe.error.notFunc', ['proxy-config.ajax.save'])

package/packages/table/src/props.ts

@@ -34,15 +34,15 @@ export default {
   footerAlign: { type: String as PropType<VxeTablePropTypes.FooterAlign>, default: () => GlobalConfig.table.footerAlign },
   // 是否显示表头
   showHeader: { type: Boolean as PropType<VxeTablePropTypes.ShowHeader>, default: () => GlobalConfig.table.showHeader },
-  // 是否要高亮当前选中行
+  // （即将废弃）是否要高亮当前选中行
   highlightCurrentRow: { type: Boolean as PropType<VxeTablePropTypes.HighlightCurrentRow>, default: () => GlobalConfig.table.highlightCurrentRow },
-  // 鼠标移到行是否要高亮显示
+  // （即将废弃）鼠标移到行是否要高亮显示
   highlightHoverRow: { type: Boolean as PropType<VxeTablePropTypes.HighlightHoverRow>, default: () => GlobalConfig.table.highlightHoverRow },
-  // 是否要高亮当前选中列
+  // （即将废弃）是否要高亮当前选中列
   highlightCurrentColumn: { type: Boolean as PropType<VxeTablePropTypes.HighlightCurrentColumn>, default: () => GlobalConfig.table.highlightCurrentColumn },
-  // 鼠标移到列是否要高亮显示
+  // （即将废弃）鼠标移到列是否要高亮显示
   highlightHoverColumn: { type: Boolean as PropType<VxeTablePropTypes.HighlightHoverColumn>, default: () => GlobalConfig.table.highlightHoverColumn },
-  // 激活单元格编辑时是否高亮显示
+  // （即将废弃）激活单元格编辑时是否高亮显示
   highlightCell: Boolean as PropType<VxeTablePropTypes.HighlightCell>,
   // 是否显示表尾合计
   showFooter: Boolean as PropType<VxeTablePropTypes.ShowFooter>,
@@ -153,7 +153,7 @@ export default {
   scrollX: Object as PropType<VxeTablePropTypes.ScrollX>,
   // 纵向虚拟滚动配置项
   scrollY: Object as PropType<VxeTablePropTypes.ScrollY>,
-  // 优化相关
+  // （即将废弃）优化相关
   animat: { type: Boolean as PropType<VxeTablePropTypes.Animat>, default: () => GlobalConfig.table.animat },
   delayHover: { type: Number as PropType<VxeTablePropTypes.DelayHover>, default: () => GlobalConfig.table.delayHover as number },
   // 额外的参数

package/packages/table/src/table.ts

@@ -3086,6 +3086,16 @@ export default defineComponent({
         const treeOpts = computeTreeOpts.value
         const reserveSelection: any[] = []
         if (checkboxOpts.reserve) {
+          const afterFullIdMaps: { [key: string]: number } = {}
+          if (treeConfig) {
+            XEUtils.eachTree(afterFullData, row => {
+              afterFullIdMaps[getRowid($xetable, row)] = 1
+            }, treeOpts)
+          } else {
+            afterFullData.forEach(row => {
+              afterFullIdMaps[getRowid($xetable, row)] = 1
+            })
+          }
           XEUtils.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
             if (oldRow) {
               if (isFull) {
@@ -3093,14 +3103,8 @@ export default defineComponent({
                   reserveSelection.push(oldRow)
                 }
               } else {
-                if (treeConfig) {
-                  if (!XEUtils.findTree(afterFullData, row => getRowid($xetable, row) === oldRowid, treeOpts)) {
-                    reserveSelection.push(oldRow)
-                  }
-                } else {
-                  if (!afterFullData.some(row => getRowid($xetable, row) === oldRowid)) {
-                    reserveSelection.push(oldRow)
-                  }
+                if (!afterFullIdMaps[oldRowid]) {
+                  reserveSelection.push(oldRow)
                 }
               }
             }
@@ -3226,7 +3230,7 @@ export default defineComponent({
                 return selectRow
               }
             } else {
-              if (afterFullData.indexOf(selectRow) > -1) {
+              if ($xetable.findRowIndexOf(afterFullData, selectRow) > -1) {
                 return selectRow
               }
             }
@@ -3989,6 +3993,7 @@ export default defineComponent({
       const { mouseConfig, keyboardConfig } = props
       const { filterStore, ctxMenuStore, editStore } = reactData
       const mouseOpts = computeMouseOpts.value
+      const keyboardOpts = computeKeyboardOpts.value
       const { actived } = editStore
       const isEsc = hasEventKey(evnt, EVENT_KEYS.ESCAPE)
       if (isEsc) {
@@ -4002,13 +4007,15 @@ export default defineComponent({
               $xetable.closeMenu()
             }
             tableMethods.closeFilter()
-            // 如果是激活编辑状态，则取消编辑
-            if (actived.row) {
-              const params = actived.args
-              $xetable.clearActived(evnt)
-              // 如果配置了选中功能，则为选中状态
-              if (mouseOpts.selected) {
-                nextTick(() => $xetable.handleSelected(params, evnt))
+            if (keyboardConfig && keyboardOpts.isEsc) {
+              // 如果是激活编辑状态，则取消编辑
+              if (actived.row) {
+                const params = actived.args
+                $xetable.clearActived(evnt)
+                // 如果配置了选中功能，则为选中状态
+                if (mouseOpts.selected) {
+                  nextTick(() => $xetable.handleSelected(params, evnt))
+                }
               }
             }
           }
@@ -4072,7 +4079,7 @@ export default defineComponent({
               $xetable.closeMenu()
             }
             tableMethods.closeFilter()
-            if (actived.row) {
+            if (keyboardConfig && keyboardOpts.isEsc) {
               // 如果是激活编辑状态，则取消编辑
               if (actived.row) {
                 const params = actived.args

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

@@ -13,6 +13,7 @@ const GlobalConfig: VXETableGlobalConfig = {
     showHeader: true,
     animat: true,
     delayHover: 250,
+    autoResize: true,
     // keepSource: false,
     // showOverflow: null,
     // showHeaderOverflow: null,
@@ -20,7 +21,6 @@ const GlobalConfig: VXETableGlobalConfig = {
     // resizeInterval: 500,
     // size: null,
     // zIndex: null,
-    // autoResize: false,
     // stripe: false,
     // border: false,
     // round: false,
@@ -93,6 +93,9 @@ const GlobalConfig: VXETableGlobalConfig = {
     mouseConfig: {
       extension: true
     },
+    keyboardConfig: {
+      isEsc: true
+    },
     areaConfig: {
       selectCellByHeader: true
     },

package/packages/v-x-e-table/src/renderer.ts

@@ -685,7 +685,7 @@ export const renderer: VxeGlobalRenderer = {
     XEUtils.each(opts, (options, name) => renderer.add(name, options))
     return renderer
   },
-  get (name) {
+  get (name: string) {
     return renderMap[name] || null
   },
   add (name, options) {

package/packages/validator/src/hook.ts

@@ -149,21 +149,21 @@ const validatorHook: VxeGlobalHooksHandles.HookOptions = {
           const ruleProps = Object.keys(validRest)
           return nextTick().then(() => {
             if (ruleProps.length) {
-              return Promise.reject(validRest[ruleProps[0]][0])
+              return validRest[ruleProps[0]][0]
             }
             if (cb) {
               cb()
             }
           })
         }).catch(firstErrParams => {
-          return new Promise<void>((resolve, reject) => {
+          return new Promise<void>((resolve) => {
             const finish = () => {
               nextTick(() => {
                 if (cb) {
                   cb(validRest)
                   resolve()
                 } else {
-                  reject(validRest)
+                  resolve(validRest)
                 }
               })
             }

package/types/table.d.ts

@@ -1555,6 +1555,10 @@ export namespace VxeTablePropTypes {
      * 是否开启非编辑状态下，上下左右移动功能
      */
     isArrow?: boolean;
+    /**
+     * 是否开启Esc键退出编辑功能
+     */
+    isEsc?: boolean;
     /**
      * 是否开启删除键功能
      */

package/types/v-x-e-table/renderer.d.ts

@@ -17,6 +17,8 @@ export interface DefineRendererOption<T> {
   filterRemoteMethod?(params: VxeGlobalRendererHandles.FilterRemoteMethod): boolean;
   filterResetMethod?(params: VxeGlobalRendererHandles.FilterResetMethodParams): void;
   filterRecoverMethod?(params: VxeGlobalRendererHandles.FilterRecoverMethodParams): void;
+  // 默认行为
+  defaultFilterMethod?(params: VxeGlobalRendererHandles.FilterMethodParams): boolean;
 
   // 单元格渲染
   renderHeader?(renderOpts: VxeGlobalRendererHandles.RenderHeaderOptions, params: VxeGlobalRendererHandles.RenderHeaderParams): T;
@@ -197,7 +199,7 @@ export namespace VxeGlobalRendererHandles {
     /**
      * 渲染器名称
      */
-    name: string;
+    name?: string;
     /**
      * 目标组件渲染的参数
      */
@@ -246,7 +248,7 @@ export interface VxeGlobalRenderer {
   mixin(options: {
     [name: string]: RendererOptions;
   }): VxeGlobalRenderer;
-  get(name: string): DefineRendererOption<VxeGlobalRendererHandles.RenderResult>;
+  get(name: string | null | undefined): DefineRendererOption<VxeGlobalRendererHandles.RenderResult>;
   add(name: string, options: RendererOptions): VxeGlobalRenderer;
   delete(name: string): void;
 }