vxe-table 3.5.2 → 3.5.5-beta.0

package/lib/tooltip/src/tooltip.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=_interopRequireDefault(require("../../mixins/size")),_utils=_interopRequireDefault(require("../../tools/utils")),_dom=_interopRequireDefault(require("../../tools/dom"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,i){return t in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function updateTipStyle(e){var t,i,n,o,r,l,s,a=e.$el,u=e.tipTarget,c=e.tipStore;u&&(t=(l=_dom.default.getDomNode()).scrollTop,i=l.scrollLeft,n=l.visibleWidth,o=(s=_dom.default.getAbsolutePos(u)).top,r=s.left,e=a.offsetHeight,l=a.offsetWidth,s=o-e-6,i+n<(a=Math.max(6,r+Math.floor((u.offsetWidth-l)/2)))+l+6&&(a=i+n-l-6),o-e<t+6&&(c.placement="bottom",s=o+u.offsetHeight+6),c.style.top="".concat(s,"px"),c.style.left="".concat(a,"px"),c.arrowStyle.left="".concat(r-a+u.offsetWidth/2,"px"))}function showTip(e){var t=e.$el,i=e.tipStore,n=e.zIndex;return t.parentNode||document.body.appendChild(t),e.updateValue(!0),e.updateZindex(),i.placement="top",i.style={width:"auto",left:0,top:0,zIndex:n||e.tipZindex},i.arrowStyle={left:"50%"},e.updatePlacement()}function renderContent(e,t){var i=t.$scopedSlots,n=t.useHTML,t=t.tipContent;return i.content?e("div",{key:1,class:"vxe-table--tooltip-content"},i.content.call(this,{})):n?e("div",{key:2,class:"vxe-table--tooltip-content",domProps:{innerHTML:t}}):e("div",{key:3,class:"vxe-table--tooltip-content"},_utils.default.formatText(t))}var _default2={name:"VxeTooltip",mixins:[_size.default],props:{value:Boolean,size:{type:String,default:function(){return _conf.default.tooltip.size||_conf.default.size}},trigger:{type:String,default:function(){return _conf.default.tooltip.trigger}},theme:{type:String,default:function(){return _conf.default.tooltip.theme}},content:{type:[String,Number],default:null},useHTML:Boolean,zIndex:[String,Number],isArrow:{type:Boolean,default:!0},enterable:Boolean,enterDelay:{type:Number,default:function(){return _conf.default.tooltip.enterDelay}},leaveDelay:{type:Number,default:function(){return _conf.default.tooltip.leaveDelay}}},data:function(){return{isUpdate:!1,visible:!1,tipContent:"",tipActive:!1,tipTarget:null,tipZindex:0,tipStore:{style:{},placement:"",arrowStyle:null}}},watch:{content:function(e){this.tipContent=e},value:function(e){this.isUpdate||this[e?"open":"close"](),this.isUpdate=!1}},created:function(){var e=this;this.showDelayTip=_xeUtils.default.debounce(function(){e.tipActive&&showTip(e)},this.enterDelay,{leading:!1,trailing:!0})},mounted:function(){var i,n=this.$el,e=this.trigger,t=this.content,o=this.value,r=n.parentNode;this.tipContent=t,this.tipZindex=_utils.default.nextZIndex(),_xeUtils.default.arrayEach(n.children,function(e,t){1<t&&(r.insertBefore(e,n),i=i||e)}),r.removeChild(n),(this.target=i)&&("hover"===e?(i.onmouseleave=this.targetMouseleaveEvent,i.onmouseenter=this.targetMouseenterEvent):"click"===e&&(i.onclick=this.clickEvent)),o&&this.open()},beforeDestroy:function(){var e=this.$el,t=this.target,i=this.trigger,n=e.parentNode;n&&n.removeChild(e),t&&("hover"===i?(t.onmouseenter=null,t.onmouseleave=null):"click"===i&&(t.onclick=null))},render:function(e){var t,i=this.$scopedSlots,n=this.vSize,o=this.theme,r=this.tipActive,l=this.isArrow,s=this.visible,a=this.tipStore,u=this.enterable;return u&&(t={mouseenter:this.wrapperMouseenterEvent,mouseleave:this.wrapperMouseleaveEvent}),e("div",{class:["vxe-table--tooltip-wrapper","theme--".concat(o),(_defineProperty(o={},"size--".concat(n),n),_defineProperty(o,"placement--".concat(a.placement),a.placement),_defineProperty(o,"is--enterable",u),_defineProperty(o,"is--visible",s),_defineProperty(o,"is--arrow",l),_defineProperty(o,"is--actived",r),o)],style:a.style,ref:"tipWrapper",on:t},[renderContent(e,this),e("div",{class:"vxe-table--tooltip-arrow",style:a.arrowStyle})].concat(i.default?i.default.call(this,{}):[]))},methods:{open:function(e,t){return this.toVisible(e||this.target,t)},close:function(){return this.tipTarget=null,this.tipActive=!1,Object.assign(this.tipStore,{style:{},placement:"",arrowStyle:null}),this.updateValue(!1),this.$nextTick()},updateValue:function(e){e!==this.visible&&(this.visible=e,this.isUpdate=!0,this.$listeners.input&&this.$emit("input",this.visible))},updateZindex:function(){this.tipZindex<_utils.default.getLastZIndex()&&(this.tipZindex=_utils.default.nextZIndex())},toVisible:function(e,t){if(e){var i=this.trigger,n=this.enterDelay;if(this.tipActive=!0,this.tipTarget=e,t&&(this.tipContent=t),!n||"hover"!==i)return showTip(this);this.showDelayTip()}return this.$nextTick()},updatePlacement:function(){var t=this;return this.$nextTick().then(function(){var e=t.$el;if(t.tipTarget&&e)return updateTipStyle(t),t.$nextTick().then(function(){return updateTipStyle(t)})})},isActived:function(){return this.tipActive},setActived:function(e){this.tipActive=!!e},clickEvent:function(){this[this.visible?"close":"open"]()},targetMouseenterEvent:function(){this.open()},targetMouseleaveEvent:function(){var e=this,t=this.trigger,i=this.enterable,n=this.leaveDelay;this.tipActive=!1,i&&"hover"===t?setTimeout(function(){e.tipActive||e.close()},n):this.close()},wrapperMouseenterEvent:function(){this.tipActive=!0},wrapperMouseleaveEvent:function(){var e=this,t=this.trigger,i=this.enterable,n=this.leaveDelay;this.tipActive=!1,i&&"hover"===t&&setTimeout(function(){e.tipActive||e.close()},n)}}};exports.default=_default2;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=_interopRequireDefault(require("../../mixins/size")),_utils=_interopRequireDefault(require("../../tools/utils")),_dom=_interopRequireDefault(require("../../tools/dom"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,i){return t in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function updateTipStyle(e){var t,i,n,o,r,l,s,a=e.$el,u=e.tipTarget,c=e.tipStore;u&&(t=(l=_dom.default.getDomNode()).scrollTop,i=l.scrollLeft,n=l.visibleWidth,o=(s=_dom.default.getAbsolutePos(u)).top,r=s.left,e=a.offsetHeight,l=a.offsetWidth,s=o-e-6,i+n<(a=Math.max(6,r+Math.floor((u.offsetWidth-l)/2)))+l+6&&(a=i+n-l-6),o-e<t+6&&(c.placement="bottom",s=o+u.offsetHeight+6),c.style.top="".concat(s,"px"),c.style.left="".concat(a,"px"),c.arrowStyle.left="".concat(r-a+u.offsetWidth/2,"px"))}function showTip(e){var t=e.$el,i=e.tipStore,n=e.zIndex;return t.parentNode||document.body.appendChild(t),e.updateValue(!0),e.updateZindex(),i.placement="top",i.style={width:"auto",left:0,top:0,zIndex:n||e.tipZindex},i.arrowStyle={left:"50%"},e.updatePlacement()}function renderContent(e,t){var i=t.$scopedSlots,n=t.useHTML,t=t.tipContent;return i.content?e("div",{key:1,class:"vxe-table--tooltip-content"},i.content.call(this,{})):n?e("div",{key:2,class:"vxe-table--tooltip-content",domProps:{innerHTML:t}}):e("div",{key:3,class:"vxe-table--tooltip-content"},_utils.default.formatText(t))}var _default2={name:"VxeTooltip",mixins:[_size.default],props:{value:Boolean,size:{type:String,default:function(){return _conf.default.tooltip.size||_conf.default.size}},trigger:{type:String,default:function(){return _conf.default.tooltip.trigger}},theme:{type:String,default:function(){return _conf.default.tooltip.theme}},content:{type:[String,Number],default:null},useHTML:Boolean,zIndex:[String,Number],isArrow:{type:Boolean,default:!0},enterable:Boolean,enterDelay:{type:Number,default:function(){return _conf.default.tooltip.enterDelay}},leaveDelay:{type:Number,default:function(){return _conf.default.tooltip.leaveDelay}}},data:function(){return{isUpdate:!1,visible:!1,tipContent:"",tipActive:!1,tipTarget:null,tipZindex:0,tipStore:{style:{},placement:"",arrowStyle:null}}},watch:{content:function(e){this.tipContent=e},value:function(e){this.isUpdate||this[e?"open":"close"](),this.isUpdate=!1}},created:function(){var e=this;this.showDelayTip=_xeUtils.default.debounce(function(){e.tipActive&&showTip(e)},this.enterDelay,{leading:!1,trailing:!0})},mounted:function(){var i,n=this.$el,e=this.trigger,t=this.content,o=this.value,r=n.parentNode;r&&(this.tipContent=t,this.tipZindex=_utils.default.nextZIndex(),_xeUtils.default.arrayEach(n.children,function(e,t){1<t&&(r.insertBefore(e,n),i=i||e)}),r.removeChild(n),(this.target=i)&&("hover"===e?(i.onmouseleave=this.targetMouseleaveEvent,i.onmouseenter=this.targetMouseenterEvent):"click"===e&&(i.onclick=this.clickEvent)),o&&this.open())},beforeDestroy:function(){var e=this.$el,t=this.target,i=this.trigger,n=e.parentNode;n&&n.removeChild(e),t&&("hover"===i?(t.onmouseenter=null,t.onmouseleave=null):"click"===i&&(t.onclick=null))},render:function(e){var t,i=this.$scopedSlots,n=this.vSize,o=this.theme,r=this.tipActive,l=this.isArrow,s=this.visible,a=this.tipStore,u=this.enterable;return u&&(t={mouseenter:this.wrapperMouseenterEvent,mouseleave:this.wrapperMouseleaveEvent}),e("div",{class:["vxe-table--tooltip-wrapper","theme--".concat(o),(_defineProperty(o={},"size--".concat(n),n),_defineProperty(o,"placement--".concat(a.placement),a.placement),_defineProperty(o,"is--enterable",u),_defineProperty(o,"is--visible",s),_defineProperty(o,"is--arrow",l),_defineProperty(o,"is--actived",r),o)],style:a.style,ref:"tipWrapper",on:t},[renderContent(e,this),e("div",{class:"vxe-table--tooltip-arrow",style:a.arrowStyle})].concat(i.default?i.default.call(this,{}):[]))},methods:{open:function(e,t){return this.toVisible(e||this.target,t)},close:function(){return this.tipTarget=null,this.tipActive=!1,Object.assign(this.tipStore,{style:{},placement:"",arrowStyle:null}),this.updateValue(!1),this.$nextTick()},updateValue:function(e){e!==this.visible&&(this.visible=e,this.isUpdate=!0,this.$listeners.input&&this.$emit("input",this.visible))},updateZindex:function(){this.tipZindex<_utils.default.getLastZIndex()&&(this.tipZindex=_utils.default.nextZIndex())},toVisible:function(e,t){if(e){var i=this.trigger,n=this.enterDelay;if(this.tipActive=!0,this.tipTarget=e,t&&(this.tipContent=t),!n||"hover"!==i)return showTip(this);this.showDelayTip()}return this.$nextTick()},updatePlacement:function(){var t=this;return this.$nextTick().then(function(){var e=t.$el;if(t.tipTarget&&e)return updateTipStyle(t),t.$nextTick().then(function(){return updateTipStyle(t)})})},isActived:function(){return this.tipActive},setActived:function(e){this.tipActive=!!e},clickEvent:function(){this[this.visible?"close":"open"]()},targetMouseenterEvent:function(){this.open()},targetMouseleaveEvent:function(){var e=this,t=this.trigger,i=this.enterable,n=this.leaveDelay;this.tipActive=!1,i&&"hover"===t?setTimeout(function(){e.tipActive||e.close()},n):this.close()},wrapperMouseenterEvent:function(){this.tipActive=!0},wrapperMouseleaveEvent:function(){var e=this,t=this.trigger,i=this.enterable,n=this.leaveDelay;this.tipActive=!1,i&&"hover"===t&&setTimeout(function(){e.tipActive||e.close()},n)}}};exports.default=_default2;

package/lib/v-x-e-table/index.js

@@ -221,7 +221,7 @@ var v = 'v3';
 exports.v = v;
 var VXETable = {
   v: v,
-  version: "3.5.2",
+  version: "3.5.5-beta.0",
   reg: reg,
   use: use,
   setup: _setup.setup,

package/lib/v-x-e-table/index.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,config:!0,t:!0,_t:!0,v:!0,VXETable:!0};exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor");Object.keys(_interceptor).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}}))});var _renderer=require("./src/renderer");Object.keys(_renderer).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}}))});var _commands=require("./src/commands");Object.keys(_commands).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}}))});var _menus=require("./src/menus");Object.keys(_menus).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}}))});var _formats=require("./src/formats");Object.keys(_formats).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}}))});var _setup=require("./src/setup");Object.keys(_setup).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}}))});var _utils=require("../tools/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),e}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var VXETableConfig=function(){function e(){_classCallCheck(this,e)}return _createClass(e,[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}]),e}(),config=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}exports.config=config;var v="v3",VXETable={v:exports.v=v,version:"3.5.2",reg:reg,use:use,setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,config:config,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,config:!0,t:!0,_t:!0,v:!0,VXETable:!0};exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor");Object.keys(_interceptor).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}}))});var _renderer=require("./src/renderer");Object.keys(_renderer).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}}))});var _commands=require("./src/commands");Object.keys(_commands).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}}))});var _menus=require("./src/menus");Object.keys(_menus).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}}))});var _formats=require("./src/formats");Object.keys(_formats).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}}))});var _setup=require("./src/setup");Object.keys(_setup).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}}))});var _utils=require("../tools/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),e}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var VXETableConfig=function(){function e(){_classCallCheck(this,e)}return _createClass(e,[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}]),e}(),config=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}exports.config=config;var v="v3",VXETable={v:exports.v=v,version:"3.5.5-beta.0",reg:reg,use:use,setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,config:config,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.5.2",
+  "version": "3.5.5-beta.0",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",

package/packages/edit/src/mixin.js

@@ -396,7 +396,9 @@ export default {
               this.clearCopyCellArea(evnt)
             }
             this.closeTooltip()
-            this.clearActived(evnt)
+            if (actived.column) {
+              this.clearActived(evnt)
+            }
             type = 'edit-actived'
             column.renderHeight = cell.offsetHeight
             actived.args = params
@@ -493,7 +495,7 @@ export default {
           $columnIndex: this.getVMColumnIndex(column)
         }, evnt)
       }
-      return (VXETable._valid ? this.clearValidate() : this.$nextTick()).then(this.recalculate)
+      return VXETable._valid ? this.clearValidate() : this.$nextTick()
     },
     _getActiveRecord () {
       const { $el, editStore, afterFullData } = this

package/packages/form/src/form.js

@@ -341,10 +341,12 @@ export default {
       evnt.preventDefault()
       if (!this.preventSubmit) {
         this.clearValidate()
-        this.beginValidate(this.getItems()).then(() => {
-          this.$emit('submit', { data: this.data, $form: this, $event: evnt })
-        }).catch(errMap => {
-          this.$emit('submit-invalid', { data: this.data, errMap, $form: this, $event: evnt })
+        this.beginValidate(this.getItems()).then((errMap) => {
+          if (errMap) {
+            this.$emit('submit-invalid', { data: this.data, errMap, $form: this, $event: evnt })
+          } else {
+
+          }
         })
       }
     },

package/packages/grid/src/grid.js

@@ -571,7 +571,7 @@ export default {
                 if (rest) {
                   if (isEnableConf(pagerConfig)) {
                     const total = XEUtils.get(rest, proxyProps.total || 'page.total') || 0
-                    tablePage.total = total
+                    tablePage.total = XEUtils.toNumber(total)
                     this.tableData = XEUtils.get(rest, proxyProps.result || 'result') || []
                     // 检验当前页码，不能超出当前最大页数
                     const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1)

package/packages/input/src/input.js

@@ -8,7 +8,7 @@ import { toStringTimeDate, getDateQuarter } from './date'
 import { handleNumber, toFloatValueFixed } from './number'
 import { warnLog } from '../../tools/log'
 
-const yearSize = 20
+const yearSize = 12
 const monthSize = 20
 const quarterSize = 8
 
@@ -68,7 +68,7 @@ function isDateDisabled (_vm, item) {
 }
 
 function renderDateDayTable (h, _vm) {
-  const { datePanelType, dateValue, datePanelValue, dateHeaders, dayDatas } = _vm
+  const { datePanelType, dateValue, datePanelValue, dateHeaders, dayDatas, multiple, dateListValue } = _vm
   const matchFormat = 'yyyy-MM-dd'
   return [
     h('table', {
@@ -93,7 +93,7 @@ function renderDateDayTable (h, _vm) {
               'is--now': item.isNow,
               'is--next': item.isNext,
               'is--disabled': isDateDisabled(_vm, item),
-              'is--selected': XEUtils.isDateSame(dateValue, item.date, matchFormat),
+              'is--selected': multiple ? dateListValue.some(val => XEUtils.isDateSame(val, item.date, matchFormat)) : XEUtils.isDateSame(dateValue, item.date, matchFormat),
               'is--hover': XEUtils.isDateSame(datePanelValue, item.date, matchFormat)
             },
             on: {
@@ -108,7 +108,7 @@ function renderDateDayTable (h, _vm) {
 }
 
 function renderDateWeekTable (h, _vm) {
-  const { datePanelType, dateValue, datePanelValue, weekHeaders, weekDates } = _vm
+  const { datePanelType, dateValue, datePanelValue, weekHeaders, weekDates, multiple, dateListValue } = _vm
   const matchFormat = 'yyyyMMdd'
   return [
     h('table', {
@@ -125,7 +125,7 @@ function renderDateWeekTable (h, _vm) {
         }))
       ]),
       h('tbody', weekDates.map(rows => {
-        const isSelected = rows.some(item => XEUtils.isDateSame(dateValue, item.date, matchFormat))
+        const isSelected = multiple ? rows.some((item) => dateListValue.some(val => XEUtils.isDateSame(val, item.date, matchFormat))) : rows.some(item => XEUtils.isDateSame(dateValue, item.date, matchFormat))
         const isHover = rows.some(item => XEUtils.isDateSame(datePanelValue, item.date, matchFormat))
         return h('tr', rows.map(item => {
           return h('td', {
@@ -150,7 +150,7 @@ function renderDateWeekTable (h, _vm) {
 }
 
 function renderDateMonthTable (h, _vm) {
-  const { dateValue, datePanelType, monthDatas, datePanelValue } = _vm
+  const { dateValue, datePanelType, monthDatas, datePanelValue, multiple, dateListValue } = _vm
   const matchFormat = 'yyyyMM'
   return [
     h('table', {
@@ -170,7 +170,7 @@ function renderDateMonthTable (h, _vm) {
               'is--now': item.isNow,
               'is--next': item.isNext,
               'is--disabled': isDateDisabled(_vm, item),
-              'is--selected': XEUtils.isDateSame(dateValue, item.date, matchFormat),
+              'is--selected': multiple ? dateListValue.some(val => XEUtils.isDateSame(val, item.date, matchFormat)) : XEUtils.isDateSame(dateValue, item.date, matchFormat),
               'is--hover': XEUtils.isDateSame(datePanelValue, item.date, matchFormat)
             },
             on: {
@@ -185,7 +185,7 @@ function renderDateMonthTable (h, _vm) {
 }
 
 function renderDateQuarterTable (h, _vm) {
-  const { dateValue, datePanelType, quarterDatas, datePanelValue } = _vm
+  const { dateValue, datePanelType, quarterDatas, datePanelValue, multiple, dateListValue } = _vm
   const matchFormat = 'yyyyq'
   return [
     h('table', {
@@ -205,7 +205,7 @@ function renderDateQuarterTable (h, _vm) {
               'is--now': item.isNow,
               'is--next': item.isNext,
               'is--disabled': isDateDisabled(_vm, item),
-              'is--selected': XEUtils.isDateSame(dateValue, item.date, matchFormat),
+              'is--selected': multiple ? dateListValue.some(val => XEUtils.isDateSame(val, item.date, matchFormat)) : XEUtils.isDateSame(dateValue, item.date, matchFormat),
               'is--hover': XEUtils.isDateSame(datePanelValue, item.date, matchFormat)
             },
             on: {
@@ -220,7 +220,7 @@ function renderDateQuarterTable (h, _vm) {
 }
 
 function renderDateYearTable (h, _vm) {
-  const { dateValue, datePanelType, yearDatas, datePanelValue } = _vm
+  const { dateValue, datePanelType, yearDatas, datePanelValue, multiple, dateListValue } = _vm
   const matchFormat = 'yyyy'
   return [
     h('table', {
@@ -235,10 +235,12 @@ function renderDateYearTable (h, _vm) {
         return h('tr', rows.map(item => {
           return h('td', {
             class: {
-              'is--disabled': isDateDisabled(_vm, item),
+              'is--prev': item.isPrev,
               'is--current': item.isCurrent,
               'is--now': item.isNow,
-              'is--selected': XEUtils.isDateSame(dateValue, item.date, matchFormat),
+              'is--next': item.isNext,
+              'is--disabled': isDateDisabled(item),
+              'is--selected': multiple ? dateListValue.some(val => XEUtils.isDateSame(val, item.date, matchFormat)) : XEUtils.isDateSame(dateValue, item.date, matchFormat),
               'is--hover': XEUtils.isDateSame(datePanelValue, item.date, matchFormat)
             },
             on: {
@@ -268,7 +270,7 @@ function renderDateTable (h, _vm) {
 }
 
 function renderDatePanel (h, _vm) {
-  const { datePanelType, selectDatePanelLabel, isDisabledPrevDateBtn, isDisabledNextDateBtn } = _vm
+  const { datePanelType, selectDatePanelLabel, isDisabledPrevDateBtn, isDisabledNextDateBtn, multiple, supportMultiples } = _vm
   return [
     h('div', {
       class: 'vxe-input--date-picker-header'
@@ -321,7 +323,20 @@ function renderDatePanel (h, _vm) {
           h('i', {
             class: 'vxe-icon--caret-right'
           })
-        ])
+        ]),
+        multiple && supportMultiples ? h('span', {
+          class: 'vxe-input--date-picker-btn vxe-input--date-picker-confirm-btn'
+        }, [
+          h('button', {
+            class: 'vxe-input--date-picker-confirm',
+            attrs: {
+              type: 'button'
+            },
+            on: {
+              click: _vm.dateConfirmEvent
+            }
+          }, GlobalConfig.i18n('vxe.button.confirm'))
+        ]) : null
       ])
     ]),
     h('div', {
@@ -612,6 +627,7 @@ export default {
     form: String,
     className: String,
     size: { type: String, default: () => GlobalConfig.input.size || GlobalConfig.size },
+    multiple: Boolean,
 
     // number、integer、float
     min: { type: [String, Number], default: null },
@@ -669,9 +685,9 @@ export default {
       return ['number', 'integer', 'float'].indexOf(this.type) > -1
     },
     isDatePickerType () {
-      return this.hasTime || ['date', 'week', 'month', 'quarter', 'year'].indexOf(this.type) > -1
+      return this.isDateTimeType || ['date', 'week', 'month', 'quarter', 'year'].indexOf(this.type) > -1
     },
-    hasTime () {
+    isDateTimeType () {
       const { type } = this
       return type === 'time' || type === 'datetime'
     },
@@ -716,6 +732,30 @@ export default {
     dateMaxTime () {
       return this.maxDate ? XEUtils.toStringDate(this.maxDate) : null
     },
+    supportMultiples () {
+      return ['date', 'week', 'month', 'quarter', 'year'].includes(this.type)
+    },
+    dateListValue () {
+      const { value, multiple, isDatePickerType, dateValueFormat } = this
+      if (multiple && value && isDatePickerType) {
+        return XEUtils.toValueString(value).split(',').map(item => {
+          const date = this.parseDate(item, dateValueFormat)
+          if (XEUtils.isValidDate(date)) {
+            return date
+          }
+          return null
+        })
+      }
+      return []
+    },
+    dateMultipleValue () {
+      const { dateListValue, dateValueFormat } = this
+      return dateListValue.map(date => XEUtils.toDateString(date, dateValueFormat))
+    },
+    dateMultipleLabel () {
+      const { dateListValue, dateLabelFormat } = this
+      return dateListValue.map(date => XEUtils.toDateString(date, dateLabelFormat)).join(', ')
+    },
     dateValue () {
       const { value, isDatePickerType, dateValueFormat } = this
       let val = null
@@ -736,7 +776,7 @@ export default {
     },
     hmsTime () {
       const { dateValue } = this
-      return dateValue && (this.hasTime) ? (dateValue.getHours() * 3600 + dateValue.getMinutes() * 60 + dateValue.getSeconds()) * 1000 : 0
+      return dateValue && (this.isDateTimeType) ? (dateValue.getHours() * 3600 + dateValue.getMinutes() * 60 + dateValue.getSeconds()) * 1000 : 0
     },
     dateLabelFormat () {
       if (this.isDatePickerType) {
@@ -810,14 +850,17 @@ export default {
       const months = []
       if (selectMonth && currentDate) {
         const currFullYear = currentDate.getFullYear()
-        const startYear = new Date(('' + selectMonth.getFullYear()).replace(/\d{1}$/, '0'), 0, 1)
-        for (let index = -10; index < yearSize - 10; index++) {
-          const date = XEUtils.getWhatYear(startYear, index, 'first')
+        const selectFullYear = selectMonth.getFullYear()
+        const startYearDate = new Date(selectFullYear - selectFullYear % yearSize, 0, 1)
+        for (let index = -4; index < yearSize + 4; index++) {
+          const date = XEUtils.getWhatYear(startYearDate, index, 'first')
           const itemFullYear = date.getFullYear()
           months.push({
             date,
             isCurrent: true,
+            isPrev: index < 0,
             isNow: currFullYear === itemFullYear,
+            isNext: index >= yearSize,
             year: itemFullYear
           })
         }
@@ -933,7 +976,7 @@ export default {
     },
     hourList () {
       const list = []
-      if (this.hasTime) {
+      if (this.isDateTimeType) {
         for (let index = 0; index < 24; index++) {
           list.push({
             value: index,
@@ -945,7 +988,7 @@ export default {
     },
     minuteList () {
       const list = []
-      if (this.hasTime) {
+      if (this.isDateTimeType) {
         for (let index = 0; index < 60; index++) {
           list.push({
             value: index,
@@ -982,8 +1025,8 @@ export default {
       return isNumType && !XEUtils.toNumber(maxlength) ? 16 : maxlength
     },
     inpReadonly () {
-      const { type, readonly, editable } = this
-      return readonly || !editable || (type === 'week' || type === 'quarter')
+      const { type, readonly, editable, multiple } = this
+      return readonly || multiple || !editable || (type === 'week' || type === 'quarter')
     }
   },
   watch: {
@@ -1007,7 +1050,7 @@ export default {
     dateLabelFormat () {
       if (this.isDatePickerType) {
         this.dateParseValue(this.datePanelValue)
-        this.inputValue = this.datePanelLabel
+        this.inputValue = this.multiple ? this.dateMultipleLabel : this.datePanelLabel
       }
     }
   },
@@ -1257,7 +1300,7 @@ export default {
     changeValue () {
       if (this.isDatePickerType) {
         this.dateParseValue(this.inputValue)
-        this.inputValue = this.datePanelLabel
+        this.inputValue = this.multiple ? this.dateMultipleLabel : this.datePanelLabel
       }
     },
     afterCheckValue () {
@@ -1471,8 +1514,10 @@ export default {
     },
     dateTodayMonthEvent (evnt) {
       this.dateNowHandle()
-      this.dateChange(this.currentDate)
-      this.hidePanel()
+      if (!this.multiple) {
+        this.dateChange(this.currentDate)
+        this.hidePanel()
+      }
       this.$emit('date-today', { type: this.type, $event: evnt })
     },
     dateNextEvent (evnt) {
@@ -1504,7 +1549,7 @@ export default {
       }
     },
     dateSelectItem (date) {
-      const { type, datePanelType } = this
+      const { type, datePanelType, multiple } = this
       const isWeekType = type === 'week'
       if (type === 'month') {
         if (datePanelType === 'year') {
@@ -1512,18 +1557,24 @@ export default {
           this.dateCheckMonth(date)
         } else {
           this.dateChange(date)
-          this.hidePanel()
+          if (!multiple) {
+            this.hidePanel()
+          }
         }
       } else if (type === 'year') {
-        this.hidePanel()
         this.dateChange(date)
+        if (!multiple) {
+          this.hidePanel()
+        }
       } else if (type === 'quarter') {
         if (datePanelType === 'year') {
           this.datePanelType = 'quarter'
           this.dateCheckMonth(date)
         } else {
           this.dateChange(date)
-          this.hidePanel()
+          if (!multiple) {
+            this.hidePanel()
+          }
         }
       } else {
         if (datePanelType === 'month') {
@@ -1534,7 +1585,9 @@ export default {
           this.dateCheckMonth(date)
         } else {
           this.dateChange(date)
-          this.hidePanel()
+          if (!multiple) {
+            this.hidePanel()
+          }
         }
       }
       if (isWeekType) {
@@ -1714,19 +1767,47 @@ export default {
       }
     },
     dateChange (date) {
-      const { value, datetimePanelValue, dateValueFormat, firstDayOfWeek } = this
+      const { value, datetimePanelValue, dateValueFormat, firstDayOfWeek, isDateTimeType, multiple } = this
       if (this.type === 'week') {
         const sWeek = XEUtils.toNumber(this.selectDay)
         date = XEUtils.getWhatWeek(date, 0, sWeek, firstDayOfWeek)
-      } else if (this.hasTime) {
+      } else if (isDateTimeType) {
         date.setHours(datetimePanelValue.getHours())
         date.setMinutes(datetimePanelValue.getMinutes())
         date.setSeconds(datetimePanelValue.getSeconds())
       }
       const inpVal = XEUtils.toDateString(date, dateValueFormat, { firstDay: firstDayOfWeek })
       this.dateCheckMonth(date)
-      if (!XEUtils.isEqual(value, inpVal)) {
-        this.emitModel(inpVal, { type: 'update' })
+      if (multiple) {
+        // 如果为多选
+        const { dateMultipleValue } = this
+        if (isDateTimeType) {
+          // 如果是datetime特殊类型
+          const { dateListValue } = this
+          const datetimeRest = []
+          dateListValue.forEach(item => {
+            if (item && !XEUtils.isDateSame(date, item, 'yyyyMMdd')) {
+              item.setHours(datetimePanelValue.getHours())
+              item.setMinutes(datetimePanelValue.getMinutes())
+              item.setSeconds(datetimePanelValue.getSeconds())
+              datetimeRest.push(item)
+            }
+          })
+          datetimeRest.push(date)
+          this.emitModel(datetimeRest.map(date => XEUtils.toDateString(date, dateValueFormat)).join(','), { type: 'update' })
+        } else {
+          // 如果是日期类型
+          if (dateMultipleValue.some(val => XEUtils.isEqual(val, inpVal))) {
+            this.emitModel(dateMultipleValue.filter(val => !XEUtils.isEqual(val, inpVal)).join(','), { type: 'update' })
+          } else {
+            this.emitModel(dateMultipleValue.concat([inpVal]).join(','), { type: 'update' })
+          }
+        }
+      } else {
+        // 如果为单选
+        if (!XEUtils.isEqual(value, inpVal)) {
+          this.emitModel(inpVal, { type: 'update' })
+        }
       }
     },
     dateCheckMonth (date) {
@@ -1749,7 +1830,7 @@ export default {
       } else {
         this.dateNowHandle()
       }
-      if (this.hasTime) {
+      if (this.isDateTimeType) {
         this.datetimePanelValue = this.datePanelValue || XEUtils.getWhatDay(Date.now(), 0, 'first')
         this.$nextTick(() => {
           XEUtils.arrayEach(this.$refs.timeBody.querySelectorAll('li.is--selected'), this.updateTimePos)
@@ -1757,7 +1838,7 @@ export default {
       }
     },
     dateRevert () {
-      this.inputValue = this.datePanelLabel
+      this.inputValue = this.multiple ? this.dateMultipleLabel : this.datePanelLabel
     },
     // 日期
 

package/packages/table/src/methods.js

@@ -3757,10 +3757,13 @@ const Methods = {
     const rest = this.fullAllDataRowMap.get(row)
     return new Promise(resolve => {
       this.expandLazyLoadeds.push(row)
-      this.expandOpts.loadMethod({ $table: this, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) }).catch(e => e).then(() => {
+      this.expandOpts.loadMethod({ $table: this, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) }).then(() => {
         rest.expandLoaded = true
-        XEUtils.remove(this.expandLazyLoadeds, item => item === row)
         this.rowExpandeds.push(row)
+      }).catch(() => {
+        rest.expandLoaded = false
+      }).finally(() => {
+        XEUtils.remove(this.expandLazyLoadeds, item => item === row)
         resolve(this.$nextTick().then(this.recalculate))
       })
     })
@@ -3968,14 +3971,15 @@ const Methods = {
     const rest = fullAllDataRowMap.get(row)
     return new Promise(resolve => {
       treeLazyLoadeds.push(row)
-      loadMethod({ $table: this, row }).catch(() => []).then(childRecords => {
+      loadMethod({ $table: this, row }).then(childRecords => {
+        // 响应成功后则展开行，并将子节点挂载到该节点下
         rest.treeLoaded = true
         XEUtils.remove(treeLazyLoadeds, item => item === row)
         if (!XEUtils.isArray(childRecords)) {
           childRecords = []
         }
         if (childRecords) {
-          this.loadTreeChildren(row, childRecords).then(childRows => {
+          return this.loadTreeChildren(row, childRecords).then(childRows => {
             if (childRows.length && treeExpandeds.indexOf(row) === -1) {
               treeExpandeds.push(row)
             }
@@ -3983,17 +3987,19 @@ const Methods = {
             if (!checkStrictly && this.isCheckedByCheckboxRow(row)) {
               this.setCheckboxRow(childRows, true)
             }
-            this.$nextTick().then(() => {
+            return this.$nextTick().then(() => {
               if (transform) {
                 return this.handleTableData()
               }
-            }).then(() => {
-              return this.recalculate()
-            }).then(() => resolve())
+            })
           })
-        } else {
-          this.$nextTick().then(() => this.recalculate()).then(() => resolve())
         }
+      }).catch(() => {
+        // 如果响应异常，则不展开，再次点击后将重新触发懒加载
+        rest.treeLoaded = false
+        XEUtils.remove(treeLazyLoadeds, item => item === row)
+      }).finally(() => {
+        this.$nextTick().then(() => this.recalculate()).then(() => resolve())
       })
     })
   },
@@ -4253,7 +4259,7 @@ const Methods = {
     this.tableColumn = scrollXLoad ? visibleColumn.slice(scrollXStore.startIndex, scrollXStore.endIndex) : visibleColumn.slice(0)
   },
   updateScrollXData () {
-    this.tableColumn = []
+    // this.tableColumn = []
     this.$nextTick(() => {
       this.handleTableColumn()
       this.updateScrollXSpace()
@@ -4296,7 +4302,7 @@ const Methods = {
     }
   },
   updateScrollYData () {
-    this.tableData = []
+    // this.tableData = []
     this.$nextTick(() => {
       this.handleTableData()
       this.updateScrollYSpace()

package/packages/tooltip/src/tooltip.js

@@ -116,30 +116,32 @@ export default {
   mounted () {
     const { $el, trigger, content, value } = this
     const parentNode = $el.parentNode
-    let target
-    this.tipContent = content
-    this.tipZindex = UtilTools.nextZIndex()
-    XEUtils.arrayEach($el.children, (elem, index) => {
-      if (index > 1) {
-        parentNode.insertBefore(elem, $el)
-        if (!target) {
-          target = elem
+    if (parentNode) {
+      let target
+      this.tipContent = content
+      this.tipZindex = UtilTools.nextZIndex()
+      XEUtils.arrayEach($el.children, (elem, index) => {
+        if (index > 1) {
+          parentNode.insertBefore(elem, $el)
+          if (!target) {
+            target = elem
+          }
+        }
+      })
+      parentNode.removeChild($el)
+      this.target = target
+      if (target) {
+        if (trigger === 'hover') {
+          target.onmouseleave = this.targetMouseleaveEvent
+          target.onmouseenter = this.targetMouseenterEvent
+        } else if (trigger === 'click') {
+          target.onclick = this.clickEvent
         }
       }
-    })
-    parentNode.removeChild($el)
-    this.target = target
-    if (target) {
-      if (trigger === 'hover') {
-        target.onmouseleave = this.targetMouseleaveEvent
-        target.onmouseenter = this.targetMouseenterEvent
-      } else if (trigger === 'click') {
-        target.onclick = this.clickEvent
+      if (value) {
+        this.open()
       }
     }
-    if (value) {
-      this.open()
-    }
   },
   beforeDestroy () {
     const { $el, target, trigger } = this

package/styles/header.scss

@@ -46,7 +46,7 @@
 .vxe-header--column {
   position: relative;
   font-weight: $vxe-table-header-font-weight;
-  user-select: none;
+  // user-select: none;
   &.col--ellipsis {
     & > .vxe-cell {
       display: flex;