vxe-table 3.4.14-beta.1 → 3.4.15

package/lib/tooltip/src/tooltip.js

@@ -53,6 +53,33 @@ function updateTipStyle(_vm) {
   }
 }
 
+function showTip(_vm) {
+  var $el = _vm.$el,
+      tipStore = _vm.tipStore,
+      zIndex = _vm.zIndex;
+  var parentNode = $el.parentNode;
+
+  if (!parentNode) {
+    document.body.appendChild($el);
+  }
+
+  _vm.updateValue(true);
+
+  _vm.updateZindex();
+
+  tipStore.placement = 'top';
+  tipStore.style = {
+    width: 'auto',
+    left: 0,
+    top: 0,
+    zIndex: zIndex || _vm.tipZindex
+  };
+  tipStore.arrowStyle = {
+    left: '50%'
+  };
+  return _vm.updatePlacement();
+}
+
 var _default2 = {
   name: 'VxeTooltip',
   mixins: [_size.default],
@@ -83,6 +110,12 @@ var _default2 = {
       default: true
     },
     enterable: Boolean,
+    enterDelay: {
+      type: Number,
+      default: function _default() {
+        return _conf.default.tooltip.enterDelay;
+      }
+    },
     leaveDelay: {
       type: Number,
       default: function _default() {
@@ -94,9 +127,9 @@ var _default2 = {
   data: function data() {
     return {
       isUpdate: false,
-      isHover: false,
       visible: false,
       message: '',
+      tipActive: false,
       tipTarget: null,
       tipZindex: 0,
       tipStore: {
@@ -118,6 +151,18 @@ var _default2 = {
       this.isUpdate = false;
     }
   },
+  created: function created() {
+    var _this = this;
+
+    this.showDelayTip = _xeUtils.default.debounce(function () {
+      if (_this.tipActive) {
+        showTip(_this);
+      }
+    }, this.enterDelay, {
+      leading: false,
+      trailing: true
+    });
+  },
   mounted: function mounted() {
     var $el = this.$el,
         trigger = this.trigger,
@@ -180,7 +225,7 @@ var _default2 = {
         vSize = this.vSize,
         theme = this.theme,
         message = this.message,
-        isHover = this.isHover,
+        tipActive = this.tipActive,
         isArrow = this.isArrow,
         visible = this.visible,
         tipStore = this.tipStore,
@@ -195,7 +240,7 @@ var _default2 = {
     }
 
     return h('div', {
-      class: ['vxe-table--tooltip-wrapper', "theme--".concat(theme), (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, "placement--".concat(tipStore.placement), tipStore.placement), _defineProperty(_ref, 'is--enterable', enterable), _defineProperty(_ref, 'is--visible', visible), _defineProperty(_ref, 'is--arrow', isArrow), _defineProperty(_ref, 'is--hover', isHover), _ref)],
+      class: ['vxe-table--tooltip-wrapper', "theme--".concat(theme), (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, "placement--".concat(tipStore.placement), tipStore.placement), _defineProperty(_ref, 'is--enterable', enterable), _defineProperty(_ref, 'is--visible', visible), _defineProperty(_ref, 'is--arrow', isArrow), _defineProperty(_ref, 'is--actived', tipActive), _ref)],
       style: tipStore.style,
       ref: 'tipWrapper',
       on: on
@@ -212,15 +257,16 @@ var _default2 = {
     },
     close: function close() {
       this.tipTarget = null;
+      this.tipActive = false;
       Object.assign(this.tipStore, {
         style: {},
         placement: '',
         arrowStyle: null
       });
-      this.update(false);
+      this.updateValue(false);
       return this.$nextTick();
     },
-    update: function update(value) {
+    updateValue: function updateValue(value) {
       if (value !== this.visible) {
         this.visible = value;
         this.isUpdate = true;
@@ -236,55 +282,46 @@ var _default2 = {
       }
     },
     toVisible: function toVisible(target, message) {
-      this.targetActive = true;
-
       if (target) {
-        var $el = this.$el,
-            tipStore = this.tipStore,
-            zIndex = this.zIndex;
-        var parentNode = $el.parentNode;
-
-        if (!parentNode) {
-          document.body.appendChild($el);
-        }
+        var trigger = this.trigger,
+            enterDelay = this.enterDelay;
+        this.tipActive = true;
+        this.tipTarget = target;
 
         if (message) {
           this.message = message;
         }
 
-        this.tipTarget = target;
-        this.update(true);
-        this.updateZindex();
-        tipStore.placement = 'top';
-        tipStore.style = {
-          width: 'auto',
-          left: 0,
-          top: 0,
-          zIndex: zIndex || this.tipZindex
-        };
-        tipStore.arrowStyle = {
-          left: '50%'
-        };
-        return this.updatePlacement();
+        if (enterDelay && trigger === 'hover') {
+          this.showDelayTip();
+        } else {
+          return showTip(this);
+        }
       }
 
       return this.$nextTick();
     },
     updatePlacement: function updatePlacement() {
-      var _this = this;
+      var _this2 = this;
 
       return this.$nextTick().then(function () {
-        var wrapperElem = _this.$el,
-            tipTarget = _this.tipTarget;
+        var wrapperElem = _this2.$el,
+            tipTarget = _this2.tipTarget;
 
         if (tipTarget && wrapperElem) {
-          updateTipStyle(_this);
-          return _this.$nextTick().then(function () {
-            return updateTipStyle(_this);
+          updateTipStyle(_this2);
+          return _this2.$nextTick().then(function () {
+            return updateTipStyle(_this2);
           });
         }
       });
     },
+    isActived: function isActived() {
+      return this.tipActive;
+    },
+    setActived: function setActived(actived) {
+      this.tipActive = !!actived;
+    },
     clickEvent: function clickEvent() {
       this[this.visible ? 'close' : 'open']();
     },
@@ -292,17 +329,17 @@ var _default2 = {
       this.open();
     },
     targetMouseleaveEvent: function targetMouseleaveEvent() {
-      var _this2 = this;
+      var _this3 = this;
 
       var trigger = this.trigger,
           enterable = this.enterable,
           leaveDelay = this.leaveDelay;
-      this.targetActive = false;
+      this.tipActive = false;
 
       if (enterable && trigger === 'hover') {
         setTimeout(function () {
-          if (!_this2.isHover) {
-            _this2.close();
+          if (!_this3.tipActive) {
+            _this3.close();
           }
         }, leaveDelay);
       } else {
@@ -310,24 +347,24 @@ var _default2 = {
       }
     },
     wrapperMouseenterEvent: function wrapperMouseenterEvent() {
-      this.isHover = true;
+      this.tipActive = true;
     },
     wrapperMouseleaveEvent: function wrapperMouseleaveEvent(evnt) {
-      var _this3 = this;
+      var _this4 = this;
 
       var leaveMethod = this.leaveMethod,
           trigger = this.trigger,
           enterable = this.enterable,
           leaveDelay = this.leaveDelay;
-      this.isHover = false;
+      this.tipActive = false;
 
       if (!leaveMethod || leaveMethod({
         $event: evnt
       }) !== false) {
         if (enterable && trigger === 'hover') {
           setTimeout(function () {
-            if (!_this3.targetActive) {
-              _this3.close();
+            if (!_this4.tipActive) {
+              _this4.close();
             }
           }, leaveDelay);
         }

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")),_tools=require("../../tools");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,o,n,s,r,l,a=e.$el,u=e.tipTarget,c=e.tipStore;u&&(t=(r=_tools.DomTools.getDomNode()).scrollTop,i=r.scrollLeft,o=r.visibleWidth,n=(l=_tools.DomTools.getAbsolutePos(u)).top,s=l.left,e=a.offsetHeight,r=a.offsetWidth,l=n-e-6,i+o<(a=Math.max(6,s+Math.floor((u.offsetWidth-r)/2)))+r+6&&(a=i+o-r-6),n-e<t+6&&(c.placement="bottom",l=n+u.offsetHeight+6),c.style.top="".concat(l,"px"),c.style.left="".concat(a,"px"),c.arrowStyle.left="".concat(s-a+u.offsetWidth/2,"px"))}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:[String,Number],zIndex:[String,Number],isArrow:{type:Boolean,default:!0},enterable:Boolean,leaveDelay:{type:Number,default:function(){return _conf.default.tooltip.leaveDelay}},leaveMethod:Function},data:function(){return{isUpdate:!1,isHover:!1,visible:!1,message:"",tipTarget:null,tipZindex:0,tipStore:{style:{},placement:"",arrowStyle:null}}},watch:{content:function(e){this.message=e},value:function(e){this.isUpdate||this[e?"open":"close"](),this.isUpdate=!1}},mounted:function(){var i,o=this.$el,e=this.trigger,t=this.content,n=this.value,s=o.parentNode;this.message=t,this.tipZindex=_tools.UtilTools.nextZIndex(),_xeUtils.default.arrayEach(o.children,function(e,t){1<t&&(s.insertBefore(e,o),i=i||e)}),s.removeChild(o),(this.target=i)&&("hover"===e?(i.onmouseleave=this.targetMouseleaveEvent,i.onmouseenter=this.targetMouseenterEvent):"click"===e&&(i.onclick=this.clickEvent)),n&&this.open()},beforeDestroy:function(){var e=this.$el,t=this.target,i=this.trigger,o=e.parentNode;o&&o.removeChild(e),t&&("hover"===i?(t.onmouseenter=null,t.onmouseleave=null):"click"===i&&(t.onclick=null))},render:function(e){var t,i=this.$scopedSlots,o=this.vSize,n=this.theme,s=this.message,r=this.isHover,l=this.isArrow,a=this.visible,u=this.tipStore,c=this.enterable;return c&&(t={mouseenter:this.wrapperMouseenterEvent,mouseleave:this.wrapperMouseleaveEvent}),e("div",{class:["vxe-table--tooltip-wrapper","theme--".concat(n),(_defineProperty(n={},"size--".concat(o),o),_defineProperty(n,"placement--".concat(u.placement),u.placement),_defineProperty(n,"is--enterable",c),_defineProperty(n,"is--visible",a),_defineProperty(n,"is--arrow",l),_defineProperty(n,"is--hover",r),n)],style:u.style,ref:"tipWrapper",on:t},[e("div",{class:"vxe-table--tooltip-content"},i.content?i.content.call(this,{}):s),e("div",{class:"vxe-table--tooltip-arrow",style:u.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,Object.assign(this.tipStore,{style:{},placement:"",arrowStyle:null}),this.update(!1),this.$nextTick()},update:function(e){e!==this.visible&&(this.visible=e,this.isUpdate=!0,this.$listeners.input&&this.$emit("input",this.visible))},updateZindex:function(){this.tipZindex<_tools.UtilTools.getLastZIndex()&&(this.tipZindex=_tools.UtilTools.nextZIndex())},toVisible:function(e,t){if(this.targetActive=!0,e){var i=this.$el,o=this.tipStore,n=this.zIndex;return i.parentNode||document.body.appendChild(i),t&&(this.message=t),this.tipTarget=e,this.update(!0),this.updateZindex(),o.placement="top",o.style={width:"auto",left:0,top:0,zIndex:n||this.tipZindex},o.arrowStyle={left:"50%"},this.updatePlacement()}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)})})},clickEvent:function(){this[this.visible?"close":"open"]()},targetMouseenterEvent:function(){this.open()},targetMouseleaveEvent:function(){var e=this,t=this.trigger,i=this.enterable,o=this.leaveDelay;this.targetActive=!1,i&&"hover"===t?setTimeout(function(){e.isHover||e.close()},o):this.close()},wrapperMouseenterEvent:function(){this.isHover=!0},wrapperMouseleaveEvent:function(e){var t=this,i=this.leaveMethod,o=this.trigger,n=this.enterable,s=this.leaveDelay;this.isHover=!1,i&&!1===i({$event:e})||n&&"hover"===o&&setTimeout(function(){t.targetActive||t.close()},s)}}};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")),_tools=require("../../tools");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,s,l,a=e.$el,u=e.tipTarget,c=e.tipStore;u&&(t=(s=_tools.DomTools.getDomNode()).scrollTop,i=s.scrollLeft,n=s.visibleWidth,o=(l=_tools.DomTools.getAbsolutePos(u)).top,r=l.left,e=a.offsetHeight,s=a.offsetWidth,l=o-e-6,i+n<(a=Math.max(6,r+Math.floor((u.offsetWidth-s)/2)))+s+6&&(a=i+n-s-6),o-e<t+6&&(c.placement="bottom",l=o+u.offsetHeight+6),c.style.top="".concat(l,"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()}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:[String,Number],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}},leaveMethod:Function},data:function(){return{isUpdate:!1,visible:!1,message:"",tipActive:!1,tipTarget:null,tipZindex:0,tipStore:{style:{},placement:"",arrowStyle:null}}},watch:{content:function(e){this.message=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.message=t,this.tipZindex=_tools.UtilTools.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.message,s=this.tipActive,l=this.isArrow,a=this.visible,u=this.tipStore,c=this.enterable;return c&&(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(u.placement),u.placement),_defineProperty(o,"is--enterable",c),_defineProperty(o,"is--visible",a),_defineProperty(o,"is--arrow",l),_defineProperty(o,"is--actived",s),o)],style:u.style,ref:"tipWrapper",on:t},[e("div",{class:"vxe-table--tooltip-content"},i.content?i.content.call(this,{}):r),e("div",{class:"vxe-table--tooltip-arrow",style:u.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<_tools.UtilTools.getLastZIndex()&&(this.tipZindex=_tools.UtilTools.nextZIndex())},toVisible:function(e,t){if(e){var i=this.trigger,n=this.enterDelay;if(this.tipActive=!0,this.tipTarget=e,t&&(this.message=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(e){var t=this,i=this.leaveMethod,n=this.trigger,o=this.enterable,r=this.leaveDelay;this.tipActive=!1,i&&!1===i({$event:e})||o&&"hover"===n&&setTimeout(function(){t.tipActive||t.close()},r)}}};exports.default=_default2;

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

@@ -229,6 +229,7 @@ var _default = {
     // size: null,
     trigger: 'hover',
     theme: 'dark',
+    enterDelay: 500,
     leaveDelay: 300
   },
   pager: {// size: null,

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var iconPrefix="vxe-icon--",_default={size:null,zIndex:999,version:0,emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,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",mapChildren:"_X_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0},importConfig:{modes:["insert","covering"]},exportConfig:{modes:["current","selected"]},printConfig:{modes:["current","selected"]},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{enabled:!0,gt:60},scrollY:{enabled:!0,gt:100}},export:{types:{}},icon:{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:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},checkbox:{},switch:{},modal:{top:15,showHeader:!0,minWidth:340,minHeight:140,lockView:!0,mask:!0,duration:3e3,marginSize:0,dblclickZoom:!0,showTitleOverflow:!0,animat:!0,showClose:!0,draggable:!0,storageKey:"VXE_MODAL_POSITION"},list:{scrollY:{enabled:!0,gt:100}},i18n:function(e){return e}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var iconPrefix="vxe-icon--",_default={size:null,zIndex:999,version:0,emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,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",mapChildren:"_X_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0},importConfig:{modes:["insert","covering"]},exportConfig:{modes:["current","selected"]},printConfig:{modes:["current","selected"]},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{enabled:!0,gt:60},scrollY:{enabled:!0,gt:100}},export:{types:{}},icon:{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",enterDelay:500,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:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},checkbox:{},switch:{},modal:{top:15,showHeader:!0,minWidth:340,minHeight:140,lockView:!0,mask:!0,duration:3e3,marginSize:0,dblclickZoom:!0,showTitleOverflow:!0,animat:!0,showClose:!0,draggable:!0,storageKey:"VXE_MODAL_POSITION"},list:{scrollY:{enabled:!0,gt:100}},i18n:function(e){return e}};exports.default=_default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.4.14-beta.1",
+  "version": "3.4.15",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -66,11 +66,11 @@
     "vuex": "^3.4.0",
     "xe-ajax": "^4.0.5",
     "xe-clipboard": "^1.10.1",
-    "xe-utils": "^3.5.2"
+    "xe-utils": "^3.5.4"
   },
   "peerDependencies": {
     "vue": "^2.6.0",
-    "xe-utils": "^3.5.2"
+    "xe-utils": "^3.5.0"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/filter/src/mixin.js

@@ -159,7 +159,7 @@ export default {
      * @param {Event} evnt 事件
      */
     confirmFilterEvent (evnt) {
-      const { filterStore, filterOpts, scrollXLoad, scrollYLoad } = this
+      const { filterStore, filterOpts, scrollXLoad: oldScrollXLoad, scrollYLoad: oldScrollYLoad } = this
       const { column } = filterStore
       const { property } = column
       const values = []
@@ -175,19 +175,26 @@ export default {
       if (!filterOpts.remote) {
         this.handleTableData(true)
         this.checkSelectionStatus()
-        this.updateFooter()
-        if (scrollXLoad || scrollYLoad) {
-          this.refreshScroll()
-          if (scrollYLoad) {
-            this.updateScrollYSpace()
-          }
-        }
       }
       this.emitEvent('filter-change', { column, property, values, datas, filters: filterList, filterList }, evnt)
       this.closeFilter()
-      this.$nextTick(() => {
-        this.recalculate()
+      this.updateFooter().then(() => {
+        const { scrollXLoad, scrollYLoad } = this
+        if ((oldScrollXLoad || scrollXLoad) || (oldScrollYLoad || scrollYLoad)) {
+          if ((oldScrollXLoad || scrollXLoad)) {
+            this.updateScrollXSpace()
+          }
+          if ((oldScrollYLoad || scrollYLoad)) {
+            this.updateScrollYSpace()
+          }
+          return this.refreshScroll()
+        }
+      }).then(() => {
         this.updateCellAreas()
+        return this.recalculate(true)
+      }).then(() => {
+        // 存在滚动行为未结束情况
+        setTimeout(() => this.recalculate(), 50)
       })
     },
     handleClearFilter (column) {

package/packages/form/src/form-item.js

@@ -137,6 +137,11 @@ export default {
       default: null
     }
   },
+  data () {
+    return {
+      itemConfig: null
+    }
+  },
   watch,
   mounted () {
     assemItem(this)

package/packages/form/src/form.js

@@ -3,7 +3,7 @@ import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
 import VXETable from '../../v-x-e-table'
 import { UtilTools, DomTools, isEnableConf } from '../../tools'
-import { createItem } from './util'
+import { createItem, handleFieldOrItem } from './util'
 import { renderTitle } from './render'
 import { eqEmptyValue } from '../../tools/src/utils'
 import { browse } from '../../tools/src/dom'
@@ -325,6 +325,10 @@ export default {
       }, { children: 'children' })
       return itemList
     },
+    getItemByField (field) {
+      const rest = XEUtils.findTree(this.formItems, item => item.field === field, { children: 'children' })
+      return rest ? rest.item : null
+    },
     toggleCollapse () {
       const status = !this.collapseAll
       this.collapseAll = status
@@ -416,11 +420,15 @@ export default {
     },
     handleTargetLeaveEvent () {
       const { tooltipOpts } = this
+      let $tooltip = this.$refs.tooltip
       this.tooltipActive = false
+      if ($tooltip) {
+        $tooltip.setActived(false)
+      }
       if (tooltipOpts.enterable) {
         this.tooltipTimeout = setTimeout(() => {
-          const $tooltip = this.$refs.tooltip
-          if ($tooltip && !$tooltip.isHover) {
+          $tooltip = this.$refs.tooltip
+          if ($tooltip && !$tooltip.isActived()) {
             this.closeTooltip()
           }
         }, tooltipOpts.leaveDelay)
@@ -428,15 +436,14 @@ export default {
         this.closeTooltip()
       }
     },
-    clearValidate (field) {
-      const itemList = this.getItems()
-      if (field) {
-        const item = itemList.find(item => item.field === field)
+    clearValidate (fieldOrItem) {
+      if (fieldOrItem) {
+        const item = handleFieldOrItem(this, fieldOrItem)
         if (item) {
           item.showError = false
         }
       } else {
-        itemList.forEach(item => {
+        this.getItems().forEach(item => {
           item.showError = false
         })
       }
@@ -446,8 +453,9 @@ export default {
       this.clearValidate()
       return this.beginValidate(this.getItems(), '', callback)
     },
-    validateField (field, callback) {
-      return this.beginValidate(this.getItems().filter(item => item.field === field), '', callback)
+    validateField (fieldOrItem, callback) {
+      const item = handleFieldOrItem(this, fieldOrItem)
+      return this.beginValidate(item ? [item] : [], '', callback)
     },
     beginValidate (itemList, type, callback) {
       const { data, rules: formRules, validOpts } = this
@@ -480,7 +488,7 @@ export default {
             callback()
           }
         }).catch(() => {
-          return new Promise((resolve, reject) => {
+          return new Promise((resolve) => {
             this.showErrTime = setTimeout(() => {
               itemList.forEach(item => {
                 if (item.errRule) {
@@ -497,7 +505,7 @@ export default {
               callback(validRest)
               resolve()
             } else {
-              reject(validRest)
+              resolve(validRest)
             }
           })
         })
@@ -574,9 +582,8 @@ export default {
     },
     handleFocus (fields) {
       const { $el } = this
-      const itemList = this.getItems()
       fields.some((property, index) => {
-        const item = itemList.find(item => item.field === property)
+        const item = this.getItemByField(property)
         if (item && isEnableConf(item.itemRender)) {
           const { itemRender } = item
           const compConf = VXETable.renderer.get(itemRender.name)
@@ -619,8 +626,7 @@ export default {
             this.clearValidate(property)
           })
           .catch(({ rule }) => {
-            const itemList = this.getItems()
-            const item = itemList.find(item => item.field === property)
+            const item = this.getItemByField(property)
             if (item) {
               item.showError = true
               item.errRule = rule

package/packages/form/src/util.js

@@ -49,6 +49,13 @@ export function getItemConfig ($xeform, _vm, options) {
   return isItem(_vm) ? _vm : new ItemConfig($xeform, _vm, options)
 }
 
+export const handleFieldOrItem = ($xeform, fieldOrItem) => {
+  if (fieldOrItem) {
+    return XEUtils.isString(fieldOrItem) ? $xeform.getItemByField(fieldOrItem) : fieldOrItem
+  }
+  return null
+}
+
 export function createItem ($xeform, _vm) {
   return getItemConfig($xeform, _vm)
 }

package/packages/input/src/date.js

@@ -0,0 +1,38 @@
+import XEUtils from 'xe-utils'
+
+export function toStringTimeDate (str) {
+  if (str) {
+    const rest = new Date()
+    let h, m, s
+    if (XEUtils.isDate(str)) {
+      h = str.getHours()
+      m = str.getMinutes()
+      s = str.getSeconds()
+    } else {
+      str = XEUtils.toValueString(str)
+      const parses = str.match(/^(\d{1,2})(:(\d{1,2}))?(:(\d{1,2}))?/)
+      if (parses) {
+        h = parses[1]
+        m = parses[3]
+        s = parses[5]
+      }
+    }
+    rest.setHours(h || 0)
+    rest.setMinutes(m || 0)
+    rest.setSeconds(s || 0)
+    return rest
+  }
+  return new Date('')
+}
+
+export function getDateQuarter (date) {
+  const month = date.getMonth()
+  if (month < 3) {
+    return 1
+  } else if (month < 6) {
+    return 2
+  } else if (month < 9) {
+    return 3
+  }
+  return 4
+}

package/packages/input/src/input.js

@@ -2,55 +2,13 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
 import { UtilTools, DomTools, GlobalEvent } from '../../tools'
+import { toStringTimeDate, getDateQuarter } from './date'
+import { handleNumber, toFloatValueFixed } from './number'
 
 const yearSize = 20
 const monthSize = 20
 const quarterSize = 8
 
-function toStringTimeDate (str) {
-  if (str) {
-    const rest = new Date()
-    let h, m, s
-    if (XEUtils.isDate(str)) {
-      h = str.getHours()
-      m = str.getMinutes()
-      s = str.getSeconds()
-    } else {
-      str = XEUtils.toValueString(str)
-      const parses = str.match(/^(\d{1,2})(:(\d{1,2}))?(:(\d{1,2}))?/)
-      if (parses) {
-        h = parses[1]
-        m = parses[3]
-        s = parses[5]
-      }
-    }
-    rest.setHours(h || 0)
-    rest.setMinutes(m || 0)
-    rest.setSeconds(s || 0)
-    return rest
-  }
-  return new Date('')
-}
-
-function getDateQuarter (date) {
-  const month = date.getMonth()
-  if (month < 3) {
-    return 1
-  } else if (month < 6) {
-    return 2
-  } else if (month < 9) {
-    return 3
-  }
-  return 4
-}
-
-function toFloatValueFixed (inputValue, digitsValue) {
-  if (/^-/.test('' + inputValue)) {
-    return XEUtils.toFixed(XEUtils.ceil(inputValue, digitsValue), digitsValue)
-  }
-  return XEUtils.toFixed(XEUtils.floor(inputValue, digitsValue), digitsValue)
-}
-
 function getNumberValue (_vm, val) {
   const { type, exponential, digitsValue, inpMaxlength } = _vm
   const restVal = (type === 'float' ? toFloatValueFixed(val, digitsValue) : XEUtils.toValueString(val))
@@ -1304,7 +1262,7 @@ export default {
       if (!inpReadonly) {
         if (isNumType) {
           if (inputValue) {
-            let inpNumVal = type === 'integer' ? XEUtils.toInteger(inputValue) : XEUtils.toNumber(inputValue)
+            let inpNumVal = type === 'integer' ? XEUtils.toInteger(handleNumber(inputValue)) : XEUtils.toNumber(handleNumber(inputValue))
             if (!this.vaildMinNum(inpNumVal)) {
               inpNumVal = min
             } else if (!this.vaildMaxNum(inpNumVal)) {
@@ -1446,7 +1404,7 @@ export default {
     },
     numberChange (isPlus, evnt) {
       const { min, max, type, inputValue, stepValue } = this
-      const numValue = type === 'integer' ? XEUtils.toInteger(inputValue) : XEUtils.toNumber(inputValue)
+      const numValue = type === 'integer' ? XEUtils.toInteger(handleNumber(inputValue)) : XEUtils.toNumber(handleNumber(inputValue))
       const newValue = isPlus ? XEUtils.add(numValue, stepValue) : XEUtils.subtract(numValue, stepValue)
       let restNum
       if (!this.vaildMinNum(newValue)) {

package/packages/input/src/number.js

@@ -0,0 +1,12 @@
+import XEUtils from 'xe-utils'
+
+export function handleNumber (val) {
+  return XEUtils.isString(val) ? val.replace(/,/g, '') : val
+}
+
+export function toFloatValueFixed (inputValue, digitsValue) {
+  if (/^-/.test('' + inputValue)) {
+    return XEUtils.toFixed(XEUtils.ceil(inputValue, digitsValue), digitsValue)
+  }
+  return XEUtils.toFixed(XEUtils.floor(inputValue, digitsValue), digitsValue)
+}