vxe-table 3.8.3 → 3.8.4

package/README.md

@@ -51,6 +51,7 @@
 * [x] 合并表尾
 * [x] 导入/导出/打印
 * [x] 显示/隐藏列
+* [x] 拖拽/自定义列排序
 * [x] 加载中
 * [x] 格式化内容
 * [x] 自定义插槽 - 模板

package/lib/button/src/button.js

@@ -74,9 +74,46 @@ var _default2 = exports.default = {
       return false;
     },
     btnMode: function btnMode() {
-      var mode = this.mode,
+      var $xebuttonggroup = this.$xebuttonggroup,
+        mode = this.mode,
         type = this.type;
-      return mode === 'text' || type === 'text' ? 'text' : 'button';
+      if (mode === 'text' || type === 'text' || $xebuttonggroup && $xebuttonggroup.mode === 'text') {
+        return 'text';
+      }
+      return 'button';
+    },
+    btnStatus: function btnStatus() {
+      var $xebuttonggroup = this.$xebuttonggroup,
+        status = this.status;
+      if (status) {
+        return status;
+      }
+      if ($xebuttonggroup) {
+        return $xebuttonggroup.status;
+      }
+      return '';
+    },
+    btnRound: function btnRound() {
+      var $xebuttonggroup = this.$xebuttonggroup,
+        round = this.round;
+      if (round) {
+        return round;
+      }
+      if ($xebuttonggroup) {
+        return $xebuttonggroup.round;
+      }
+      return false;
+    },
+    btnCircle: function btnCircle() {
+      var $xebuttonggroup = this.$xebuttonggroup,
+        circle = this.circle;
+      if (circle) {
+        return circle;
+      }
+      if ($xebuttonggroup) {
+        return $xebuttonggroup.circle;
+      }
+      return false;
     }
   },
   created: function created() {
@@ -106,8 +143,10 @@ var _default2 = exports.default = {
       type = this.type,
       destroyOnClose = this.destroyOnClose,
       isFormBtn = this.isFormBtn,
-      status = this.status,
       btnMode = this.btnMode,
+      btnStatus = this.btnStatus,
+      btnRound = this.btnRound,
+      btnCircle = this.btnCircle,
       vSize = this.vSize,
       name = this.name,
       disabled = this.disabled,
@@ -122,7 +161,7 @@ var _default2 = exports.default = {
       }) : className : '', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--active', showPanel)]
     }, [h('button', {
       ref: 'xBtn',
-      class: ['vxe-button', "type--".concat(btnMode), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(status), status), 'is--round', this.round), 'is--circle', this.circle), 'is--disabled', disabled || loading), 'is--loading', loading)],
+      class: ['vxe-button', "type--".concat(btnMode), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(btnStatus), btnStatus), 'is--round', btnRound), 'is--circle', btnCircle), 'is--disabled', disabled || loading), 'is--loading', loading)],
       attrs: {
         name: name,
         title: title,
@@ -157,7 +196,7 @@ var _default2 = exports.default = {
       ref: 'xBtn',
       class: ['vxe-button', "type--".concat(btnMode), className ? _xeUtils.default.isFunction(className) ? className({
         $button: this
-      }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(status), status), 'is--round', this.round), 'is--circle', this.circle), 'is--disabled', disabled || loading), 'is--loading', loading)],
+      }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), "theme--".concat(btnStatus), btnStatus), 'is--round', btnRound), 'is--circle', btnCircle), 'is--disabled', disabled || loading), 'is--loading', loading)],
       attrs: {
         name: name,
         title: title,

package/lib/button/src/button.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=_interopRequireWildcard(require("../../tools/utils")),_dom=_interopRequireDefault(require("../../tools/dom")),_event=require("../../tools/event");function _getRequireWildcardCache(e){var t,n;return"function"!=typeof WeakMap?null:(t=new WeakMap,n=new WeakMap,(_getRequireWildcardCache=function(e){return e?n:t})(e))}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!=_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var n,i,o={__proto__:null},s=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(n in e)"default"!==n&&{}.hasOwnProperty.call(e,n)&&((i=s?Object.getOwnPropertyDescriptor(e,n):null)&&(i.get||i.set)?Object.defineProperty(o,n,i):o[n]=e[n]);return o.default=e,t&&t.set(e,o),o}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _defineProperty(e,t,n){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var n=e[Symbol.toPrimitive];if(void 0===n)return("string"===t?String:Number)(e);n=n.call(e,t||"default");if("object"!=_typeof(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default={name:"VxeButton",mixins:[_size.default],props:{type:String,mode:String,size:{type:String,default:function(){return _conf.default.button.size||_conf.default.size}},name:[String,Number],content:String,placement:String,status:String,icon:String,round:Boolean,circle:Boolean,title:String,disabled:Boolean,loading:Boolean,destroyOnClose:Boolean,className:[String,Function],popupClassName:[String,Function],transfer:{type:Boolean,default:function(){return _conf.default.button.transfer}}},inject:{$xebuttonggroup:{default:null}},data:function(){return{inited:!1,showPanel:!1,animatVisible:!1,panelIndex:0,panelStyle:null,panelPlacement:null}},computed:{isFormBtn:function(){var e=this.type;return!!e&&-1<["submit","reset","button"].indexOf(e)},btnMode:function(){var e=this.mode,t=this.type;return"text"===e||"text"===t?"text":"button"}},created:function(){_event.GlobalEvent.on(this,"mousewheel",this.handleGlobalMousewheelEvent)},beforeDestroy:function(){var e=this.$refs.panel;e&&e.parentNode&&e.parentNode.removeChild(e)},destroyed:function(){_event.GlobalEvent.off(this,"mousewheel")},render:function(e){var t=this.$scopedSlots,n=this.className,i=this.popupClassName,o=this.title,s=this.inited,r=this.type,a=this.destroyOnClose,u=this.isFormBtn,l=this.status,c=this.btnMode,d=this.vSize,f=this.name,p=this.disabled,h=this.loading,m=this.showPanel,v=this.animatVisible,b=this.panelPlacement,t=t.dropdowns;return t?e("div",{class:["vxe-button--dropdown",n?_xeUtils.default.isFunction(n)?n({$button:this}):n:"",_defineProperty(_defineProperty({},"size--".concat(d),d),"is--active",m)]},[e("button",{ref:"xBtn",class:["vxe-button","type--".concat(c),_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(d),d),"theme--".concat(l),l),"is--round",this.round),"is--circle",this.circle),"is--disabled",p||h),"is--loading",h)],attrs:{name:f,title:o,type:u?r:"button",disabled:p||h},on:{mouseenter:this.mouseenterTargetEvent,mouseleave:this.mouseleaveTargetEvent,click:this.clickEvent}},this.renderContent(e).concat([e("i",{class:"vxe-button--dropdown-arrow ".concat(_conf.default.icon.BUTTON_DROPDOWN)})])),e("div",{ref:"panel",class:["vxe-button--dropdown-panel",i?_xeUtils.default.isFunction(i)?i({$button:this}):i:"",_defineProperty(_defineProperty(_defineProperty({},"size--".concat(d),d),"animat--leave",v),"animat--enter",m)],attrs:{placement:b},style:this.panelStyle},s?[e("div",{class:"vxe-button--dropdown-wrapper",on:{mousedown:this.mousedownDropdownEvent,click:this.clickDropdownEvent,mouseenter:this.mouseenterDropdownEvent,mouseleave:this.mouseleaveDropdownEvent}},a&&!m?[]:t.call(this,{},e))]:null)]):e("button",{ref:"xBtn",class:["vxe-button","type--".concat(c),n?_xeUtils.default.isFunction(n)?n({$button:this}):n:"",_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(d),d),"theme--".concat(l),l),"is--round",this.round),"is--circle",this.circle),"is--disabled",p||h),"is--loading",h)],attrs:{name:f,title:o,type:u?r:"button",disabled:p||h},on:{click:this.clickEvent,onMouseenter:this.mouseenterEvent,onMouseleave:this.mouseleaveEvent}},this.renderContent(e))},methods:{renderContent:function(e){var t=this.$scopedSlots,n=this.content,i=this.icon,o=[];return this.loading?o.push(e("i",{class:["vxe-button--loading-icon",_conf.default.icon.BUTTON_LOADING]})):t.icon?o.push(e("span",{class:"vxe-button--custom-icon"},t.icon.call(this,{}))):i&&o.push(e("i",{class:["vxe-button--icon",i]})),t.default?o.push(e("span",{class:"vxe-button--content"},t.default.call(this,{}))):n&&o.push(e("span",{class:"vxe-button--content"},[(0,_utils.getFuncText)(n)])),o},handleGlobalMousewheelEvent:function(e){this.showPanel&&!_dom.default.getEventTargetNode(e,this.$refs.panel).flag&&this.closePanel()},updateZindex:function(){this.panelIndex<_utils.default.getLastZIndex()&&(this.panelIndex=_utils.default.nextZIndex())},mousedownDropdownEvent:function(e){0===e.button&&e.stopPropagation()},clickEvent:function(e){var t=this.$xebuttonggroup;t?t.handleClick({name:this.name},e):this.$emit("click",{$event:e})},clickDropdownEvent:function(e){var t=this,n=e.currentTarget,i=this.$refs.panel,n=_dom.default.getEventTargetNode(e,n,"vxe-button"),o=n.flag,n=n.targetElem;o&&(i&&(i.dataset.active="N"),this.showPanel=!1,setTimeout(function(){i&&"Y"===i.dataset.active||(t.animatVisible=!1)},350),this.$emit("dropdown-click",{name:n.getAttribute("name"),$event:e}))},mouseleaveTargetEvent:function(e){this.closePanel(),this.mouseleaveEvent(e)},mouseenterEvent:function(e){this.$emit("mouseenter",{$event:e})},mouseleaveEvent:function(e){this.$emit("mouseleave",{$event:e})},mouseenterTargetEvent:function(e){var t=this,n=this.$refs.panel;n.dataset.active="Y",this.inited||(this.inited=!0,this.transfer&&document.body.appendChild(n)),this.showTime=setTimeout(function(){"Y"===n.dataset.active?t.mouseenterDropdownEvent():t.animatVisible=!1},250),this.$emit("mouseenter",{$event:e})},mouseenterDropdownEvent:function(){var e=this,t=this.$refs.panel;t.dataset.active="Y",this.animatVisible=!0,setTimeout(function(){"Y"===t.dataset.active&&(e.showPanel=!0,e.updateZindex(),e.updatePlacement(),setTimeout(function(){e.showPanel&&e.updatePlacement()},50))},20)},mouseleaveDropdownEvent:function(){this.closePanel()},closePanel:function(){var e=this,t=this.$refs.panel;clearTimeout(this.showTime),t?(t.dataset.active="N",setTimeout(function(){"Y"!==t.dataset.active&&(e.showPanel=!1,setTimeout(function(){"Y"!==t.dataset.active&&(e.animatVisible=!1)},350))},100)):(this.animatVisible=!1,this.showPanel=!1)},updatePlacement:function(){var p=this;return this.$nextTick().then(function(){var e,t,n,i,o,s,r,a,u=p.$refs,l=p.transfer,c=p.placement,d=p.panelIndex,f=u.xBtn,u=u.panel;if(u&&f)return e=f.offsetHeight,t=f.offsetWidth,n=u.offsetHeight,u=u.offsetWidth,d={zIndex:d},a=(f=_dom.default.getAbsolutePos(f)).top,i=f.left,o=f.boundingTop,s=f.visibleHeight,f=f.visibleWidth,r="bottom",l?(l=a+e,"top"===c?(r="top",l=a-n):c||(s<o+e+n+5&&(r="top",l=a-n),l<5&&(r="bottom",l=a+e)),f<(a=i+t-u)+u+5&&(a-=a+u+5-f),a<5&&(a=5),Object.assign(d,{left:"".concat(a,"px"),right:"auto",top:"".concat(l,"px"),minWidth:"".concat(t,"px")})):"top"===c?(r="top",d.bottom="".concat(e,"px")):c||s<o+e+n&&5<o-e-n&&(r="top",d.bottom="".concat(e,"px")),p.panelStyle=d,p.panelPlacement=r,p.$nextTick()})},focus:function(){return this.$el.focus(),this.$nextTick()},blur:function(){return this.$el.blur(),this.$nextTick()}}};
+"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=_interopRequireWildcard(require("../../tools/utils")),_dom=_interopRequireDefault(require("../../tools/dom")),_event=require("../../tools/event");function _getRequireWildcardCache(e){var t,n;return"function"!=typeof WeakMap?null:(t=new WeakMap,n=new WeakMap,(_getRequireWildcardCache=function(e){return e?n:t})(e))}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!=_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var n,i,o={__proto__:null},r=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(n in e)"default"!==n&&{}.hasOwnProperty.call(e,n)&&((i=r?Object.getOwnPropertyDescriptor(e,n):null)&&(i.get||i.set)?Object.defineProperty(o,n,i):o[n]=e[n]);return o.default=e,t&&t.set(e,o),o}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _defineProperty(e,t,n){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var n=e[Symbol.toPrimitive];if(void 0===n)return("string"===t?String:Number)(e);n=n.call(e,t||"default");if("object"!=_typeof(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default={name:"VxeButton",mixins:[_size.default],props:{type:String,mode:String,size:{type:String,default:function(){return _conf.default.button.size||_conf.default.size}},name:[String,Number],content:String,placement:String,status:String,icon:String,round:Boolean,circle:Boolean,title:String,disabled:Boolean,loading:Boolean,destroyOnClose:Boolean,className:[String,Function],popupClassName:[String,Function],transfer:{type:Boolean,default:function(){return _conf.default.button.transfer}}},inject:{$xebuttonggroup:{default:null}},data:function(){return{inited:!1,showPanel:!1,animatVisible:!1,panelIndex:0,panelStyle:null,panelPlacement:null}},computed:{isFormBtn:function(){var e=this.type;return!!e&&-1<["submit","reset","button"].indexOf(e)},btnMode:function(){var e=this.$xebuttonggroup,t=this.mode,n=this.type;return"text"===t||"text"===n||e&&"text"===e.mode?"text":"button"},btnStatus:function(){var e=this.$xebuttonggroup,t=this.status;return t||(e?e.status:"")},btnRound:function(){var e=this.$xebuttonggroup,t=this.round;return t||!!e&&e.round},btnCircle:function(){var e=this.$xebuttonggroup,t=this.circle;return t||!!e&&e.circle}},created:function(){_event.GlobalEvent.on(this,"mousewheel",this.handleGlobalMousewheelEvent)},beforeDestroy:function(){var e=this.$refs.panel;e&&e.parentNode&&e.parentNode.removeChild(e)},destroyed:function(){_event.GlobalEvent.off(this,"mousewheel")},render:function(e){var t=this.$scopedSlots,n=this.className,i=this.popupClassName,o=this.title,r=this.inited,s=this.type,a=this.destroyOnClose,u=this.isFormBtn,l=this.btnMode,c=this.btnStatus,d=this.btnRound,f=this.btnCircle,p=this.vSize,h=this.name,m=this.disabled,v=this.loading,b=this.showPanel,_=this.animatVisible,y=this.panelPlacement,t=t.dropdowns;return t?e("div",{class:["vxe-button--dropdown",n?_xeUtils.default.isFunction(n)?n({$button:this}):n:"",_defineProperty(_defineProperty({},"size--".concat(p),p),"is--active",b)]},[e("button",{ref:"xBtn",class:["vxe-button","type--".concat(l),_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(p),p),"theme--".concat(c),c),"is--round",d),"is--circle",f),"is--disabled",m||v),"is--loading",v)],attrs:{name:h,title:o,type:u?s:"button",disabled:m||v},on:{mouseenter:this.mouseenterTargetEvent,mouseleave:this.mouseleaveTargetEvent,click:this.clickEvent}},this.renderContent(e).concat([e("i",{class:"vxe-button--dropdown-arrow ".concat(_conf.default.icon.BUTTON_DROPDOWN)})])),e("div",{ref:"panel",class:["vxe-button--dropdown-panel",i?_xeUtils.default.isFunction(i)?i({$button:this}):i:"",_defineProperty(_defineProperty(_defineProperty({},"size--".concat(p),p),"animat--leave",_),"animat--enter",b)],attrs:{placement:y},style:this.panelStyle},r?[e("div",{class:"vxe-button--dropdown-wrapper",on:{mousedown:this.mousedownDropdownEvent,click:this.clickDropdownEvent,mouseenter:this.mouseenterDropdownEvent,mouseleave:this.mouseleaveDropdownEvent}},a&&!b?[]:t.call(this,{},e))]:null)]):e("button",{ref:"xBtn",class:["vxe-button","type--".concat(l),n?_xeUtils.default.isFunction(n)?n({$button:this}):n:"",_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(p),p),"theme--".concat(c),c),"is--round",d),"is--circle",f),"is--disabled",m||v),"is--loading",v)],attrs:{name:h,title:o,type:u?s:"button",disabled:m||v},on:{click:this.clickEvent,onMouseenter:this.mouseenterEvent,onMouseleave:this.mouseleaveEvent}},this.renderContent(e))},methods:{renderContent:function(e){var t=this.$scopedSlots,n=this.content,i=this.icon,o=[];return this.loading?o.push(e("i",{class:["vxe-button--loading-icon",_conf.default.icon.BUTTON_LOADING]})):t.icon?o.push(e("span",{class:"vxe-button--custom-icon"},t.icon.call(this,{}))):i&&o.push(e("i",{class:["vxe-button--icon",i]})),t.default?o.push(e("span",{class:"vxe-button--content"},t.default.call(this,{}))):n&&o.push(e("span",{class:"vxe-button--content"},[(0,_utils.getFuncText)(n)])),o},handleGlobalMousewheelEvent:function(e){this.showPanel&&!_dom.default.getEventTargetNode(e,this.$refs.panel).flag&&this.closePanel()},updateZindex:function(){this.panelIndex<_utils.default.getLastZIndex()&&(this.panelIndex=_utils.default.nextZIndex())},mousedownDropdownEvent:function(e){0===e.button&&e.stopPropagation()},clickEvent:function(e){var t=this.$xebuttonggroup;t?t.handleClick({name:this.name},e):this.$emit("click",{$event:e})},clickDropdownEvent:function(e){var t=this,n=e.currentTarget,i=this.$refs.panel,n=_dom.default.getEventTargetNode(e,n,"vxe-button"),o=n.flag,n=n.targetElem;o&&(i&&(i.dataset.active="N"),this.showPanel=!1,setTimeout(function(){i&&"Y"===i.dataset.active||(t.animatVisible=!1)},350),this.$emit("dropdown-click",{name:n.getAttribute("name"),$event:e}))},mouseleaveTargetEvent:function(e){this.closePanel(),this.mouseleaveEvent(e)},mouseenterEvent:function(e){this.$emit("mouseenter",{$event:e})},mouseleaveEvent:function(e){this.$emit("mouseleave",{$event:e})},mouseenterTargetEvent:function(e){var t=this,n=this.$refs.panel;n.dataset.active="Y",this.inited||(this.inited=!0,this.transfer&&document.body.appendChild(n)),this.showTime=setTimeout(function(){"Y"===n.dataset.active?t.mouseenterDropdownEvent():t.animatVisible=!1},250),this.$emit("mouseenter",{$event:e})},mouseenterDropdownEvent:function(){var e=this,t=this.$refs.panel;t.dataset.active="Y",this.animatVisible=!0,setTimeout(function(){"Y"===t.dataset.active&&(e.showPanel=!0,e.updateZindex(),e.updatePlacement(),setTimeout(function(){e.showPanel&&e.updatePlacement()},50))},20)},mouseleaveDropdownEvent:function(){this.closePanel()},closePanel:function(){var e=this,t=this.$refs.panel;clearTimeout(this.showTime),t?(t.dataset.active="N",setTimeout(function(){"Y"!==t.dataset.active&&(e.showPanel=!1,setTimeout(function(){"Y"!==t.dataset.active&&(e.animatVisible=!1)},350))},100)):(this.animatVisible=!1,this.showPanel=!1)},updatePlacement:function(){var p=this;return this.$nextTick().then(function(){var e,t,n,i,o,r,s,a,u=p.$refs,l=p.transfer,c=p.placement,d=p.panelIndex,f=u.xBtn,u=u.panel;if(u&&f)return e=f.offsetHeight,t=f.offsetWidth,n=u.offsetHeight,u=u.offsetWidth,d={zIndex:d},a=(f=_dom.default.getAbsolutePos(f)).top,i=f.left,o=f.boundingTop,r=f.visibleHeight,f=f.visibleWidth,s="bottom",l?(l=a+e,"top"===c?(s="top",l=a-n):c||(r<o+e+n+5&&(s="top",l=a-n),l<5&&(s="bottom",l=a+e)),f<(a=i+t-u)+u+5&&(a-=a+u+5-f),a<5&&(a=5),Object.assign(d,{left:"".concat(a,"px"),right:"auto",top:"".concat(l,"px"),minWidth:"".concat(t,"px")})):"top"===c?(s="top",d.bottom="".concat(e,"px")):c||r<o+e+n&&5<o-e-n&&(s="top",d.bottom="".concat(e,"px")),p.panelStyle=d,p.panelPlacement=s,p.$nextTick()})},focus:function(){return this.$el.focus(),this.$nextTick()},blur:function(){return this.$el.blur(),this.$nextTick()}}};

package/lib/button/src/group.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _conf = _interopRequireDefault(require("../../v-x-e-table/src/conf"));
+var _xeUtils = _interopRequireDefault(require("xe-utils"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -16,6 +17,11 @@ var _default2 = exports.default = {
   name: 'VxeButtonGroup',
   props: {
     options: Array,
+    mode: String,
+    status: String,
+    round: Boolean,
+    circle: Boolean,
+    className: [String, Function],
     disabled: Boolean,
     size: {
       type: String,
@@ -36,10 +42,13 @@ var _default2 = exports.default = {
   },
   render: function render(h) {
     var $scopedSlots = this.$scopedSlots,
+      className = this.className,
       options = this.options;
     var defaultSlot = $scopedSlots.default;
     return h('div', {
-      class: 'vxe-button-group'
+      class: ['vxe-button-group', className ? _xeUtils.default.isFunction(className) ? className({
+        $buttonGroup: this
+      }) : className : '']
     }, defaultSlot ? defaultSlot.cell(this, {}) : options ? options.map(function (item) {
       return h('vxe-button', {
         props: item

package/lib/button/src/group.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _conf=_interopRequireDefault(require("../../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function ownKeys(t,e){var r,o=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),o.push.apply(o,r)),o}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _defineProperty(e,t,r){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var r=e[Symbol.toPrimitive];if(void 0===r)return("string"===t?String:Number)(e);r=r.call(e,t||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default={name:"VxeButtonGroup",props:{options:Array,disabled:Boolean,size:{type:String,default:function(){return _conf.default.buttonGroup.size||_conf.default.size}}},provide:function(){return{$xebuttongroup:this}},computed:{vSize:function(){return this.size||this.$parent.size||this.$parent.vSize}},render:function(t){var e=this.$scopedSlots,r=this.options,e=e.default;return t("div",{class:"vxe-button-group"},e?e.cell(this,{}):r?r.map(function(e){return t("vxe-button",{props:e})}):[])},methods:{handleClick:function(e,t){var r=this.options,o=e.name,r=r?r.find(function(e){return e.name===o}):null;this.$emit("click",_objectSpread(_objectSpread({},e),{},{option:r,$event:t}))}}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function ownKeys(t,e){var r,o=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),o.push.apply(o,r)),o}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _defineProperty(e,t,r){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var r=e[Symbol.toPrimitive];if(void 0===r)return("string"===t?String:Number)(e);r=r.call(e,t||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default={name:"VxeButtonGroup",props:{options:Array,mode:String,status:String,round:Boolean,circle:Boolean,className:[String,Function],disabled:Boolean,size:{type:String,default:function(){return _conf.default.buttonGroup.size||_conf.default.size}}},provide:function(){return{$xebuttongroup:this}},computed:{vSize:function(){return this.size||this.$parent.size||this.$parent.vSize}},render:function(t){var e=this.$scopedSlots,r=this.className,o=this.options,e=e.default;return t("div",{class:["vxe-button-group",r?_xeUtils.default.isFunction(r)?r({$buttonGroup:this}):r:""]},e?e.cell(this,{}):o?o.map(function(e){return t("vxe-button",{props:e})}):[])},methods:{handleClick:function(e,t){var r=this.options,o=e.name,r=r?r.find(function(e){return e.name===o}):null;this.$emit("click",_objectSpread(_objectSpread({},e),{},{option:r,$event:t}))}}};

package/lib/custom/src/panel.js

@@ -161,6 +161,7 @@ function renderPopupPanel(h, _vm) {
     customStore = _vm.customStore;
   var customOpts = $xetable.customOpts,
     customColumnList = $xetable.customColumnList,
+    columnOpts = $xetable.columnOpts,
     isMaxFixedColumn = $xetable.isMaxFixedColumn;
   var checkMethod = customOpts.checkMethod,
     visibleMethod = customOpts.visibleMethod;
@@ -262,7 +263,7 @@ function renderPopupPanel(h, _vm) {
       title: _conf.default.i18n('vxe.custom.cstmTitle'),
       className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
       width: '40vw',
-      minWidth: 500,
+      minWidth: 520,
       height: '50vh',
       minHeight: 300,
       mask: true,
@@ -286,7 +287,7 @@ function renderPopupPanel(h, _vm) {
           class: 'vxe-table-custom-popup--table-wrapper'
         }, [h('table', {}, [h('colgroup', {}, [h('col', {
           style: {
-            width: '60px'
+            width: '80px'
           }
         }), h('col'), h('col', {
           style: {
@@ -296,7 +297,21 @@ function renderPopupPanel(h, _vm) {
           style: {
             width: '200px'
           }
-        })]), h('thead', {}, [h('tr', {}, [h('th', {}, _conf.default.i18n('vxe.custom.setting.colSort')), h('th', {}, _conf.default.i18n('vxe.custom.setting.colTitle')), h('th', {}, _conf.default.i18n('vxe.custom.setting.colVisible')), h('th', {}, _conf.default.i18n('vxe.custom.setting.colFixed'))])]), h('transition-group', {
+        })]), h('thead', {}, [h('tr', {}, [h('th', {}, [h('span', {
+          class: 'vxe-table-custom-popup--table-sort-help-title'
+        }, _conf.default.i18n('vxe.custom.setting.colSort')), h('vxe-tooltip', {
+          props: {
+            enterable: true,
+            content: '点击并拖动图标可以调整列的排序'
+          },
+          scopedSlots: {
+            default: function _default() {
+              return h('i', {
+                class: 'vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill'
+              });
+            }
+          }
+        })]), h('th', {}, _conf.default.i18n('vxe.custom.setting.colTitle')), h('th', {}, _conf.default.i18n('vxe.custom.setting.colVisible')), h('th', {}, _conf.default.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0]))])]), h('transition-group', {
           class: 'vxe-table-custom--body',
           props: {
             tag: 'tbody',

package/lib/custom/src/panel.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _utils=_interopRequireDefault(require("../../tools/utils")),_dom=_interopRequireDefault(require("../../tools/dom")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var formatText=_utils.default.formatText,addClass=_dom.default.addClass,removeClass=_dom.default.removeClass;function updateDropHint(e,t){var o,e=e.$refs,i=e.dragHintElemRef,e=e.bodyElemRef;e&&i&&(o=(e=e.parentNode).getBoundingClientRect(),i.style.display="block",i.style.top="".concat(Math.min(e.clientHeight-e.scrollTop-i.clientHeight,t.clientY-o.y),"px"),i.style.left="".concat(Math.min(e.clientWidth-e.scrollLeft-i.clientWidth-16,t.clientX-o.x),"px"))}function renderSimplePanel(u,d){var e=d.$xetable,t=d.customStore,f=e.customOpts,o=e.customColumnList,m=e.isMaxFixedColumn,e=t.maxHeight,v=f.checkMethod,p=f.visibleMethod,i=f.trigger,x=[],n={},i=("hover"===i&&(n.mouseenter=d.handleWrapperMouseenterEvent,n.mouseleave=d.handleWrapperMouseleaveEvent),_xeUtils.default.eachTree(o,function(e,t,o,i,n){var l,s,a,c,r;p&&!p({column:e})||(l=e.visible,s=e.halfVisible,a=e.children&&e.children.length,c=formatText(e.getTitle(),1),r=!!v&&!v({column:e}),x.push(u("li",{key:e.id,class:["vxe-table-custom--option","level--".concat(e.level),{"is--group":a}]},[u("div",{title:c,class:["vxe-table-custom--checkbox-option",{"is--checked":l,"is--indeterminate":s,"is--disabled":r}],on:{click:function(){r||d.changeCheckboxOption(e)}}},[u("span",{class:["vxe-checkbox--icon",s?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:l?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]}),u("span",{class:"vxe-checkbox--label"},c)]),!n&&f.allowFixed?u("div",{class:"vxe-table-custom--fixed-option"},[u("span",{class:["vxe-table-custom--fixed-left-option","left"===e.fixed?_conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED:_conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT,{"is--checked":"left"===e.fixed,"is--disabled":m&&!e.fixed}],attrs:{title:_conf.default.i18n("left"===e.fixed?"vxe.toolbar.cancelfixed":"vxe.toolbar.fixedLeft")},on:{click:function(){d.changeFixedOption(e,"left")}}}),u("span",{class:["vxe-table-custom--fixed-right-option","right"===e.fixed?_conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED:_conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT,{"is--checked":"right"===e.fixed,"is--disabled":m&&!e.fixed}],attrs:{title:_conf.default.i18n("right"===e.fixed?"vxe.toolbar.cancelfixed":"vxe.toolbar.fixedRight")},on:{click:function(){d.changeFixedOption(e,"right")}}})]):null])))}),t.isAll),o=t.isIndeterminate;return u("div",{key:"simple",class:["vxe-table-custom-wrapper",{"is--active":t.visible}]},[u("ul",{class:"vxe-table-custom--header"},[u("li",{class:"vxe-table-custom--option"},[u("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":i,"is--indeterminate":o}],attrs:{title:_conf.default.i18n("vxe.table.allTitle")},on:{click:d.allCustomEvent}},[u("span",{class:["vxe-checkbox--icon",o?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:i?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]}),u("span",{class:"vxe-checkbox--label"},_conf.default.i18n("vxe.toolbar.customAll"))])])]),u("ul",{class:"vxe-table-custom--body",style:e?{maxHeight:"".concat(e,"px")}:{},on:n},x),f.showFooter?u("div",{class:"vxe-table-custom--footer"},[u("button",{class:"btn--reset",on:{click:d.resetCustomEvent}},f.resetButtonText||_conf.default.i18n("vxe.toolbar.customRestore")),u("button",{class:"btn--confirm",on:{click:d.confirmCustomEvent}},f.confirmButtonText||_conf.default.i18n("vxe.toolbar.customConfirm"))]):null])}function renderPopupPanel(u,d){var e=d.$xetable,t=d.customStore,f=e.customOpts,o=e.customColumnList,m=e.isMaxFixedColumn,v=f.checkMethod,p=f.visibleMethod,x=[];return _xeUtils.default.eachTree(o,function(t,e,o,i,n){var l,s,a,c,r;p&&!p({column:t})||(l=t.visible,s=t.halfVisible,a=formatText(t.getTitle(),1),c=t.children&&t.children.length,r=!!v&&!v({column:t}),x.push(u("tr",{key:t.id,class:["vxe-table-custom-popup--row level--".concat(t.level),{"is--group":c}],attrs:{colid:t.id},on:{dragstart:d.sortDragstartEvent,dragend:d.sortDragendEvent,dragover:d.sortDragoverEvent}},[u("td",{class:"vxe-table-custom-popup--column-item col--sort"},[1===t.level?u("span",{class:"vxe-table-custom-popup--column-sort-btn",on:{mousedown:d.sortMousedownEvent,mouseup:d.sortMouseupEvent}},[u("i",{class:"vxe-icon-sort"})]):null]),u("td",{class:"vxe-table-custom-popup--column-item col--name"},[u("div",{class:"vxe-table-custom-popup--name",attrs:{title:a}},a)]),u("td",{class:"vxe-table-custom-popup--column-item col--visible"},[u("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":l,"is--indeterminate":s,"is--disabled":r}],on:{click:function(){r||d.changeCheckboxOption(t)}}},[u("span",{class:["vxe-checkbox--icon",s?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:l?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]})])]),u("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[!n&&f.allowFixed?u("vxe-radio-group",{props:{value:t.fixed||"",type:"button",size:"mini",options:[{label:_conf.default.i18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:m},{label:_conf.default.i18n("vxe.custom.setting.fixedUnset"),value:""},{label:_conf.default.i18n("vxe.custom.setting.fixedRight"),value:"right",disabled:m}]},on:{input:function(e){t.fixed=e},change:function(){d.changePopupFixedOption(t)}}}):null])])))}),u("vxe-modal",{key:"popup",props:{value:t.visible,title:_conf.default.i18n("vxe.custom.cstmTitle"),className:"vxe-table-custom-popup-wrapper vxe-table--ignore-clear",width:"40vw",minWidth:500,height:"50vh",minHeight:300,mask:!0,lockView:!0,showFooter:!0,resize:!0,escClosable:!0,destroyOnClose:!0},on:{input:function(e){t.visible=e}},scopedSlots:{default:function(){return u("div",{ref:"bodyElemRef",class:"vxe-table-custom-popup--body"},[u("div",{class:"vxe-table-custom-popup--table-wrapper"},[u("table",{},[u("colgroup",{},[u("col",{style:{width:"60px"}}),u("col"),u("col",{style:{width:"80px"}}),u("col",{style:{width:"200px"}})]),u("thead",{},[u("tr",{},[u("th",{},_conf.default.i18n("vxe.custom.setting.colSort")),u("th",{},_conf.default.i18n("vxe.custom.setting.colTitle")),u("th",{},_conf.default.i18n("vxe.custom.setting.colVisible")),u("th",{},_conf.default.i18n("vxe.custom.setting.colFixed"))])]),u("transition-group",{class:"vxe-table-custom--body",props:{tag:"tbody",name:"vxe-table-custom--flip"}},x)])]),u("div",{ref:"dragHintElemRef",class:"vxe-table-custom-popup--drag-hint"},_conf.default.i18n("vxe.custom.cstmDragTarget",[d.dragColumn?d.dragColumn.getTitle():""]))])},footer:function(){return u("div",{class:"vxe-table-custom-popup--footer"},[u("vxe-button",{props:{content:f.resetButtonText||_conf.default.i18n("vxe.custom.cstmRestore")},on:{click:d.resetPopupCustomEvent}}),u("vxe-button",{props:{content:f.resetButtonText||_conf.default.i18n("vxe.custom.cstmCancel")},on:{click:d.cancelCustomEvent}}),u("vxe-button",{props:{status:"primary",content:f.confirmButtonText||_conf.default.i18n("vxe.custom.cstmConfirm")},on:{click:d.confirmCustomEvent}})])}}})}var _default2=exports.default={name:"VxeTableCustomPanel",props:{customStore:{type:Object,default:function(){return{}}}},inject:{$xetable:{default:null}},data:function(){return{dragColumn:null}},computed:{},render:function(e){return("popup"===this.$xetable.customOpts.mode?renderPopupPanel:renderSimplePanel)(e,this)},methods:{handleWrapperMouseenterEvent:function(e){var t=this.$xetable;this.customStore.activeWrapper=!0,t.customOpenEvent(e)},handleWrapperMouseleaveEvent:function(e){var t=this.$xetable,o=this.customStore;o.activeWrapper=!1,setTimeout(function(){o.activeBtn||o.activeWrapper||t.customColseEvent(e)},300)},confirmCustomEvent:function(e){var t=this.$xetable;t.closeCustom(),t.emitCustomEvent("confirm",e)},cancelCustomEvent:function(e){var t=this.$xetable;t.closeCustom(),t.emitCustomEvent("cancel",e)},resetCustomEvent:function(e){var t=this.$xetable;t.resetColumn(!0),t.closeCustom(),t.emitCustomEvent("reset",e)},resetPopupCustomEvent:function(e){this.resetCustomEvent(e)},handleOptionCheck:function(t){var e=this.$xetable.customColumnList,e=_xeUtils.default.findTree(e,function(e){return e===t});e&&e.parent&&(e=e.parent).children&&e.children.length&&(e.visible=e.children.every(function(e){return e.visible}),e.halfVisible=!e.visible&&e.children.some(function(e){return e.visible||e.halfVisible}),this.handleOptionCheck(e))},changeCheckboxOption:function(e){var t=this.$xetable,o=t.customOpts,i=!e.visible;_xeUtils.default.eachTree([e],function(e){e.visible=i,e.halfVisible=!1}),this.handleOptionCheck(e),o.immediate&&t.handleCustom(),t.checkCustomStatus()},changeFixedOption:function(e,t){var o=this.$xetable,i=o.isMaxFixedColumn;e.fixed===t?o.clearColumnFixed(e):i&&!e.fixed||o.setColumnFixed(e,t)},changePopupFixedOption:function(e){var t=this.$xetable;t.isMaxFixedColumn||t.setColumnFixed(e,e.fixed)},allCustomEvent:function(){var e=this.$xetable,t=this.customStore,o=e.customOpts,i=e.customColumnList,n=o.checkMethod,l=!t.isAll;_xeUtils.default.eachTree(i,function(e){n&&!n({column:e})||(e.visible=l,e.halfVisible=!1)}),t.isAll=l,e.checkCustomStatus()},sortMousedownEvent:function(e){var t=this.$xetable,e=e.currentTarget.parentNode.parentNode,o=e.getAttribute("colid"),t=t.getColumnById(o);e.draggable=!0,this.dragColumn=t,addClass(e,"active--drag-origin")},sortMouseupEvent:function(e){var e=e.currentTarget.parentNode.parentNode,t=this.$refs.dragHintElemRef;e.draggable=!1,this.dragColumn=null,removeClass(e,"active--drag-origin"),t&&(t.style.display="")},sortDragstartEvent:function(e){var t=new Image;e.dataTransfer&&e.dataTransfer.setDragImage(t,0,0)},sortDragendEvent:function(e){var t=this.$xetable,o=this.prevDropTrEl,i=t.customColumnList,e=e.currentTarget,n=this.$refs.dragHintElemRef;if(o){if(o!==e){var l=o.getAttribute("drag-pos"),s=e.getAttribute("colid"),a=t.getColumnById(s);if(!a)return;var s=_xeUtils.default.findIndexOf(i,function(e){return e.id===a.id}),c=o.getAttribute("colid"),r=t.getColumnById(c);if(!r)return;i.splice(s,1);t=_xeUtils.default.findIndexOf(i,function(e){return e.id===r.id});i.splice(t+("bottom"===l?1:0),0,a)}o.draggable=!1,o.removeAttribute("drag-pos"),removeClass(o,"active--drag-target")}this.dragColumn=null,e.draggable=!1,e.removeAttribute("drag-pos"),n&&(n.style.display=""),removeClass(e,"active--drag-target"),removeClass(e,"active--drag-origin"),i.forEach(function(e,t){e.renderSortNumber=t})},sortDragoverEvent:function(e){var t=this.$xetable,o=this.prevDropTrEl,i=e.currentTarget,o=(o!==i&&removeClass(o,"active--drag-target"),i.getAttribute("colid")),t=t.getColumnById(o);t&&1===t.level&&(e.preventDefault(),o=e.clientY-i.getBoundingClientRect().y<i.clientHeight/2?"top":"bottom",addClass(i,"active--drag-target"),i.setAttribute("drag-pos",o),this.prevDropTrEl=i),updateDropHint(this,e)}}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _utils=_interopRequireDefault(require("../../tools/utils")),_dom=_interopRequireDefault(require("../../tools/dom")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var formatText=_utils.default.formatText,addClass=_dom.default.addClass,removeClass=_dom.default.removeClass;function updateDropHint(e,t){var o,e=e.$refs,i=e.dragHintElemRef,e=e.bodyElemRef;e&&i&&(o=(e=e.parentNode).getBoundingClientRect(),i.style.display="block",i.style.top="".concat(Math.min(e.clientHeight-e.scrollTop-i.clientHeight,t.clientY-o.y),"px"),i.style.left="".concat(Math.min(e.clientWidth-e.scrollLeft-i.clientWidth-16,t.clientX-o.x),"px"))}function renderSimplePanel(u,d){var e=d.$xetable,t=d.customStore,f=e.customOpts,o=e.customColumnList,p=e.isMaxFixedColumn,e=t.maxHeight,m=f.checkMethod,v=f.visibleMethod,i=f.trigger,x=[],n={},i=("hover"===i&&(n.mouseenter=d.handleWrapperMouseenterEvent,n.mouseleave=d.handleWrapperMouseleaveEvent),_xeUtils.default.eachTree(o,function(e,t,o,i,n){var l,s,a,c,r;v&&!v({column:e})||(l=e.visible,s=e.halfVisible,a=e.children&&e.children.length,c=formatText(e.getTitle(),1),r=!!m&&!m({column:e}),x.push(u("li",{key:e.id,class:["vxe-table-custom--option","level--".concat(e.level),{"is--group":a}]},[u("div",{title:c,class:["vxe-table-custom--checkbox-option",{"is--checked":l,"is--indeterminate":s,"is--disabled":r}],on:{click:function(){r||d.changeCheckboxOption(e)}}},[u("span",{class:["vxe-checkbox--icon",s?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:l?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]}),u("span",{class:"vxe-checkbox--label"},c)]),!n&&f.allowFixed?u("div",{class:"vxe-table-custom--fixed-option"},[u("span",{class:["vxe-table-custom--fixed-left-option","left"===e.fixed?_conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED:_conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT,{"is--checked":"left"===e.fixed,"is--disabled":p&&!e.fixed}],attrs:{title:_conf.default.i18n("left"===e.fixed?"vxe.toolbar.cancelfixed":"vxe.toolbar.fixedLeft")},on:{click:function(){d.changeFixedOption(e,"left")}}}),u("span",{class:["vxe-table-custom--fixed-right-option","right"===e.fixed?_conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED:_conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT,{"is--checked":"right"===e.fixed,"is--disabled":p&&!e.fixed}],attrs:{title:_conf.default.i18n("right"===e.fixed?"vxe.toolbar.cancelfixed":"vxe.toolbar.fixedRight")},on:{click:function(){d.changeFixedOption(e,"right")}}})]):null])))}),t.isAll),o=t.isIndeterminate;return u("div",{key:"simple",class:["vxe-table-custom-wrapper",{"is--active":t.visible}]},[u("ul",{class:"vxe-table-custom--header"},[u("li",{class:"vxe-table-custom--option"},[u("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":i,"is--indeterminate":o}],attrs:{title:_conf.default.i18n("vxe.table.allTitle")},on:{click:d.allCustomEvent}},[u("span",{class:["vxe-checkbox--icon",o?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:i?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]}),u("span",{class:"vxe-checkbox--label"},_conf.default.i18n("vxe.toolbar.customAll"))])])]),u("ul",{class:"vxe-table-custom--body",style:e?{maxHeight:"".concat(e,"px")}:{},on:n},x),f.showFooter?u("div",{class:"vxe-table-custom--footer"},[u("button",{class:"btn--reset",on:{click:d.resetCustomEvent}},f.resetButtonText||_conf.default.i18n("vxe.toolbar.customRestore")),u("button",{class:"btn--confirm",on:{click:d.confirmCustomEvent}},f.confirmButtonText||_conf.default.i18n("vxe.toolbar.customConfirm"))]):null])}function renderPopupPanel(u,d){var e=d.$xetable,t=d.customStore,f=e.customOpts,o=e.customColumnList,i=e.columnOpts,p=e.isMaxFixedColumn,m=f.checkMethod,v=f.visibleMethod,x=[];return _xeUtils.default.eachTree(o,function(t,e,o,i,n){var l,s,a,c,r;v&&!v({column:t})||(l=t.visible,s=t.halfVisible,a=formatText(t.getTitle(),1),c=t.children&&t.children.length,r=!!m&&!m({column:t}),x.push(u("tr",{key:t.id,class:["vxe-table-custom-popup--row level--".concat(t.level),{"is--group":c}],attrs:{colid:t.id},on:{dragstart:d.sortDragstartEvent,dragend:d.sortDragendEvent,dragover:d.sortDragoverEvent}},[u("td",{class:"vxe-table-custom-popup--column-item col--sort"},[1===t.level?u("span",{class:"vxe-table-custom-popup--column-sort-btn",on:{mousedown:d.sortMousedownEvent,mouseup:d.sortMouseupEvent}},[u("i",{class:"vxe-icon-sort"})]):null]),u("td",{class:"vxe-table-custom-popup--column-item col--name"},[u("div",{class:"vxe-table-custom-popup--name",attrs:{title:a}},a)]),u("td",{class:"vxe-table-custom-popup--column-item col--visible"},[u("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":l,"is--indeterminate":s,"is--disabled":r}],on:{click:function(){r||d.changeCheckboxOption(t)}}},[u("span",{class:["vxe-checkbox--icon",s?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:l?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]})])]),u("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[!n&&f.allowFixed?u("vxe-radio-group",{props:{value:t.fixed||"",type:"button",size:"mini",options:[{label:_conf.default.i18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:p},{label:_conf.default.i18n("vxe.custom.setting.fixedUnset"),value:""},{label:_conf.default.i18n("vxe.custom.setting.fixedRight"),value:"right",disabled:p}]},on:{input:function(e){t.fixed=e},change:function(){d.changePopupFixedOption(t)}}}):null])])))}),u("vxe-modal",{key:"popup",props:{value:t.visible,title:_conf.default.i18n("vxe.custom.cstmTitle"),className:"vxe-table-custom-popup-wrapper vxe-table--ignore-clear",width:"40vw",minWidth:520,height:"50vh",minHeight:300,mask:!0,lockView:!0,showFooter:!0,resize:!0,escClosable:!0,destroyOnClose:!0},on:{input:function(e){t.visible=e}},scopedSlots:{default:function(){return u("div",{ref:"bodyElemRef",class:"vxe-table-custom-popup--body"},[u("div",{class:"vxe-table-custom-popup--table-wrapper"},[u("table",{},[u("colgroup",{},[u("col",{style:{width:"80px"}}),u("col"),u("col",{style:{width:"80px"}}),u("col",{style:{width:"200px"}})]),u("thead",{},[u("tr",{},[u("th",{},[u("span",{class:"vxe-table-custom-popup--table-sort-help-title"},_conf.default.i18n("vxe.custom.setting.colSort")),u("vxe-tooltip",{props:{enterable:!0,content:"点击并拖动图标可以调整列的排序"},scopedSlots:{default:function(){return u("i",{class:"vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill"})}}})]),u("th",{},_conf.default.i18n("vxe.custom.setting.colTitle")),u("th",{},_conf.default.i18n("vxe.custom.setting.colVisible")),u("th",{},_conf.default.i18n("vxe.custom.setting.colFixed",[i.maxFixedSize||0]))])]),u("transition-group",{class:"vxe-table-custom--body",props:{tag:"tbody",name:"vxe-table-custom--flip"}},x)])]),u("div",{ref:"dragHintElemRef",class:"vxe-table-custom-popup--drag-hint"},_conf.default.i18n("vxe.custom.cstmDragTarget",[d.dragColumn?d.dragColumn.getTitle():""]))])},footer:function(){return u("div",{class:"vxe-table-custom-popup--footer"},[u("vxe-button",{props:{content:f.resetButtonText||_conf.default.i18n("vxe.custom.cstmRestore")},on:{click:d.resetPopupCustomEvent}}),u("vxe-button",{props:{content:f.resetButtonText||_conf.default.i18n("vxe.custom.cstmCancel")},on:{click:d.cancelCustomEvent}}),u("vxe-button",{props:{status:"primary",content:f.confirmButtonText||_conf.default.i18n("vxe.custom.cstmConfirm")},on:{click:d.confirmCustomEvent}})])}}})}var _default2=exports.default={name:"VxeTableCustomPanel",props:{customStore:{type:Object,default:function(){return{}}}},inject:{$xetable:{default:null}},data:function(){return{dragColumn:null}},computed:{},render:function(e){return("popup"===this.$xetable.customOpts.mode?renderPopupPanel:renderSimplePanel)(e,this)},methods:{handleWrapperMouseenterEvent:function(e){var t=this.$xetable;this.customStore.activeWrapper=!0,t.customOpenEvent(e)},handleWrapperMouseleaveEvent:function(e){var t=this.$xetable,o=this.customStore;o.activeWrapper=!1,setTimeout(function(){o.activeBtn||o.activeWrapper||t.customColseEvent(e)},300)},confirmCustomEvent:function(e){var t=this.$xetable;t.closeCustom(),t.emitCustomEvent("confirm",e)},cancelCustomEvent:function(e){var t=this.$xetable;t.closeCustom(),t.emitCustomEvent("cancel",e)},resetCustomEvent:function(e){var t=this.$xetable;t.resetColumn(!0),t.closeCustom(),t.emitCustomEvent("reset",e)},resetPopupCustomEvent:function(e){this.resetCustomEvent(e)},handleOptionCheck:function(t){var e=this.$xetable.customColumnList,e=_xeUtils.default.findTree(e,function(e){return e===t});e&&e.parent&&(e=e.parent).children&&e.children.length&&(e.visible=e.children.every(function(e){return e.visible}),e.halfVisible=!e.visible&&e.children.some(function(e){return e.visible||e.halfVisible}),this.handleOptionCheck(e))},changeCheckboxOption:function(e){var t=this.$xetable,o=t.customOpts,i=!e.visible;_xeUtils.default.eachTree([e],function(e){e.visible=i,e.halfVisible=!1}),this.handleOptionCheck(e),o.immediate&&t.handleCustom(),t.checkCustomStatus()},changeFixedOption:function(e,t){var o=this.$xetable,i=o.isMaxFixedColumn;e.fixed===t?o.clearColumnFixed(e):i&&!e.fixed||o.setColumnFixed(e,t)},changePopupFixedOption:function(e){var t=this.$xetable;t.isMaxFixedColumn||t.setColumnFixed(e,e.fixed)},allCustomEvent:function(){var e=this.$xetable,t=this.customStore,o=e.customOpts,i=e.customColumnList,n=o.checkMethod,l=!t.isAll;_xeUtils.default.eachTree(i,function(e){n&&!n({column:e})||(e.visible=l,e.halfVisible=!1)}),t.isAll=l,e.checkCustomStatus()},sortMousedownEvent:function(e){var t=this.$xetable,e=e.currentTarget.parentNode.parentNode,o=e.getAttribute("colid"),t=t.getColumnById(o);e.draggable=!0,this.dragColumn=t,addClass(e,"active--drag-origin")},sortMouseupEvent:function(e){var e=e.currentTarget.parentNode.parentNode,t=this.$refs.dragHintElemRef;e.draggable=!1,this.dragColumn=null,removeClass(e,"active--drag-origin"),t&&(t.style.display="")},sortDragstartEvent:function(e){var t=new Image;e.dataTransfer&&e.dataTransfer.setDragImage(t,0,0)},sortDragendEvent:function(e){var t=this.$xetable,o=this.prevDropTrEl,i=t.customColumnList,e=e.currentTarget,n=this.$refs.dragHintElemRef;if(o){if(o!==e){var l=o.getAttribute("drag-pos"),s=e.getAttribute("colid"),a=t.getColumnById(s);if(!a)return;var s=_xeUtils.default.findIndexOf(i,function(e){return e.id===a.id}),c=o.getAttribute("colid"),r=t.getColumnById(c);if(!r)return;i.splice(s,1);t=_xeUtils.default.findIndexOf(i,function(e){return e.id===r.id});i.splice(t+("bottom"===l?1:0),0,a)}o.draggable=!1,o.removeAttribute("drag-pos"),removeClass(o,"active--drag-target")}this.dragColumn=null,e.draggable=!1,e.removeAttribute("drag-pos"),n&&(n.style.display=""),removeClass(e,"active--drag-target"),removeClass(e,"active--drag-origin"),i.forEach(function(e,t){e.renderSortNumber=t})},sortDragoverEvent:function(e){var t=this.$xetable,o=this.prevDropTrEl,i=e.currentTarget,o=(o!==i&&removeClass(o,"active--drag-target"),i.getAttribute("colid")),t=t.getColumnById(o);t&&1===t.level&&(e.preventDefault(),o=e.clientY-i.getBoundingClientRect().y<i.clientHeight/2?"top":"bottom",addClass(i,"active--drag-target"),i.setAttribute("drag-pos",o),this.prevDropTrEl=i),updateDropHint(this,e)}}};

package/lib/custom/style/style.css

@@ -396,6 +396,8 @@
 .vxe-table-custom-popup--table-wrapper table {
   width: 100%;
   border: 0;
+  table-layout: fixed;
+  word-break: break-all;
   border-spacing: 0;
   border-collapse: separate;
 }
@@ -416,6 +418,9 @@
 .vxe-table-custom-popup--table-wrapper table tr:first-child td {
   border-top: 0;
 }
+.vxe-table-custom-popup--table-wrapper table tr:hover {
+  background-color: #f5f7fa;
+}
 .vxe-table-custom-popup--table-wrapper table th,
 .vxe-table-custom-popup--table-wrapper table td {
   height: 44px;
@@ -445,7 +450,6 @@
 }
 
 .vxe-table-custom-popup--name {
-  max-width: 360px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -453,42 +457,34 @@
 
 .vxe-table-custom-popup--row.level--2 .vxe-table-custom-popup--name {
   padding-left: 24px;
-  max-width: 236px;
 }
 
 .vxe-table-custom-popup--row.level--3 .vxe-table-custom-popup--name {
   padding-left: 48px;
-  max-width: 212px;
 }
 
 .vxe-table-custom-popup--row.level--4 .vxe-table-custom-popup--name {
   padding-left: 72px;
-  max-width: 188px;
 }
 
 .vxe-table-custom-popup--row.level--5 .vxe-table-custom-popup--name {
   padding-left: 96px;
-  max-width: 164px;
 }
 
 .vxe-table-custom-popup--row.level--6 .vxe-table-custom-popup--name {
   padding-left: 120px;
-  max-width: 140px;
 }
 
 .vxe-table-custom-popup--row.level--7 .vxe-table-custom-popup--name {
   padding-left: 144px;
-  max-width: 116px;
 }
 
 .vxe-table-custom-popup--row.level--8 .vxe-table-custom-popup--name {
   padding-left: 168px;
-  max-width: 92px;
 }
 
 .vxe-table-custom-popup--row.level--9 .vxe-table-custom-popup--name {
   padding-left: 192px;
-  max-width: 68px;
 }
 
 .vxe-table-custom-popup--column-item {
@@ -538,4 +534,14 @@
 }
 .vxe-table-custom-popup--column-sort-btn:active {
   cursor: grabbing;
+}
+
+.vxe-table-custom-popup--table-sort-help-title,
+.vxe-table-custom-popup--table-sort-help-icon {
+  vertical-align: middle;
+}
+
+.vxe-table-custom-popup--table-sort-help-icon {
+  margin-left: 5px;
+  cursor: help;
 }

package/lib/custom/style/style.min.css

@@ -1 +1 @@
-[class*=vxe-],[class*=vxe-] :after,[class*=vxe-] :before,[class*=vxe-]:after,[class*=vxe-]:before{box-sizing:border-box}.vxe-table-custom-popup--drag-hint{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}[class*=vxe-]{font-variant:tabular-nums;font-feature-settings:"tnum"}.vxe-primary-color{color:#409eff}.vxe-success-color{color:#67c23a}.vxe-info-color{color:#909399}.vxe-warning-color{color:#e6a23c}.vxe-danger-color{color:#f56c6c}.vxe-perfect-color{color:#f8f8f9}.vxe-row:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-row>.vxe-col--1{float:left;width:4.16667%}.vxe-row>.vxe-col--2{float:left;width:8.33333%}.vxe-row>.vxe-col--3{float:left;width:12.5%}.vxe-row>.vxe-col--4{float:left;width:16.66667%}.vxe-row>.vxe-col--5{float:left;width:20.83333%}.vxe-row>.vxe-col--6{float:left;width:25%}.vxe-row>.vxe-col--7{float:left;width:29.16667%}.vxe-row>.vxe-col--8{float:left;width:33.33333%}.vxe-row>.vxe-col--9{float:left;width:37.5%}.vxe-row>.vxe-col--10{float:left;width:41.66667%}.vxe-row>.vxe-col--11{float:left;width:45.83333%}.vxe-row>.vxe-col--12{float:left;width:50%}.vxe-row>.vxe-col--13{float:left;width:54.16667%}.vxe-row>.vxe-col--14{float:left;width:58.33333%}.vxe-row>.vxe-col--15{float:left;width:62.5%}.vxe-row>.vxe-col--16{float:left;width:66.66667%}.vxe-row>.vxe-col--17{float:left;width:70.83333%}.vxe-row>.vxe-col--18{float:left;width:75%}.vxe-row>.vxe-col--19{float:left;width:79.16667%}.vxe-row>.vxe-col--20{float:left;width:83.33333%}.vxe-row>.vxe-col--21{float:left;width:87.5%}.vxe-row>.vxe-col--22{float:left;width:91.66667%}.vxe-row>.vxe-col--23{float:left;width:95.83333%}.vxe-row>.vxe-col--24{float:left;width:100%}.is--animat .vxe-filter--btn:after,.is--animat .vxe-filter--btn:before,.is--animat .vxe-sort--asc-btn:after,.is--animat .vxe-sort--asc-btn:before,.is--animat .vxe-sort--desc-btn:after,.is--animat .vxe-sort--desc-btn:before{transition:border .1s ease-in-out}.is--animat .vxe-input--wrapper .vxe-input{transition:border .1s ease-in-out}.is--animat .vxe-table--expand-btn,.is--animat .vxe-tree--node-btn{transition:transform .1s ease-in-out}.is--animat .vxe-checkbox>input:checked+span,.is--animat .vxe-radio>input:checked+span{transition:background-color .1s ease-in-out}.vxe-table-custom--option{display:flex;flex-direction:row}.vxe-table-custom-wrapper{display:none;position:absolute;top:-4px;right:2px;text-align:left;background-color:#fff;z-index:19;border:1px solid #e8eaec;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2)}.vxe-table-custom-wrapper.is--active{display:block}.vxe-table-custom--body,.vxe-table-custom--header{list-style-type:none;overflow-x:hidden;overflow-y:auto;margin:0;padding:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-table-custom--body>li,.vxe-table-custom--header>li{max-width:18em;min-width:14em;padding:.2em 1em .2em 1em}.vxe-table-custom--body>li.level--2,.vxe-table-custom--header>li.level--2{padding-left:3.5em}.vxe-table-custom--body>li.level--2 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--2 .vxe-checkbox--icon{left:1.8em}.vxe-table-custom--body>li.level--3,.vxe-table-custom--header>li.level--3{padding-left:4.5em}.vxe-table-custom--body>li.level--3 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--3 .vxe-checkbox--icon{left:2.8em}.vxe-table-custom--body>li.level--4,.vxe-table-custom--header>li.level--4{padding-left:5.5em}.vxe-table-custom--body>li.level--4 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--4 .vxe-checkbox--icon{left:3.8em}.vxe-table-custom--body>li.level--5,.vxe-table-custom--header>li.level--5{padding-left:6.5em}.vxe-table-custom--body>li.level--5 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--5 .vxe-checkbox--icon{left:4.8em}.vxe-table-custom--body>li.level--6,.vxe-table-custom--header>li.level--6{padding-left:7.5em}.vxe-table-custom--body>li.level--6 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--6 .vxe-checkbox--icon{left:5.8em}.vxe-table-custom--body>li.level--7,.vxe-table-custom--header>li.level--7{padding-left:8.5em}.vxe-table-custom--body>li.level--7 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--7 .vxe-checkbox--icon{left:6.8em}.vxe-table-custom--body>li.level--8,.vxe-table-custom--header>li.level--8{padding-left:9.5em}.vxe-table-custom--body>li.level--8 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--8 .vxe-checkbox--icon{left:7.8em}.vxe-table-custom--header{padding:.28em 0;font-weight:700;border-bottom:1px solid #dadce0}.vxe-table-custom--body{padding:.2em 0;max-height:20em}.vxe-table-custom--body .vxe-table-custom--checkbox-option:hover{background-color:#f5f7fa}.vxe-table-custom--footer{border-top:1px solid #dadce0;text-align:right}.vxe-table-custom--footer button{background-color:transparent;width:50%;height:2.5em;border:0;color:#606266;text-align:center;cursor:pointer}.vxe-table-custom--footer button:focus{outline:0}.vxe-table-custom--footer button:hover{color:#409eff}.vxe-table-custom--checkbox-option{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;flex-grow:1}.vxe-table-custom--checkbox-option .vxe-checkbox--icon{font-size:1.34em}.vxe-table-custom--checkbox-option .vxe-checkbox--icon{color:#dcdfe6;vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-table-custom--checkbox-option.is--checked,.vxe-table-custom--checkbox-option.is--indeterminate{color:#409eff}.vxe-table-custom--checkbox-option.is--checked .vxe-checkbox--icon,.vxe-table-custom--checkbox-option.is--indeterminate .vxe-checkbox--icon{color:#409eff}.vxe-table-custom--checkbox-option:not(.is--disabled){cursor:pointer}.vxe-table-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon{color:#409eff}.vxe-table-custom--checkbox-option.is--disabled{color:#bfbfbf;cursor:not-allowed}.vxe-table-custom--checkbox-option.is--disabled .vxe-checkbox--icon{color:#dcdfe6}.vxe-table-custom--checkbox-option .vxe-checkbox--label{padding-left:.5em;vertical-align:middle}.vxe-table-custom--fixed-option{flex-shrink:0;padding-left:.5em;display:flex;flex-direction:row;align-items:center}.vxe-table-custom--fixed-left-option,.vxe-table-custom--fixed-right-option{line-height:1.34em;font-size:1.1em;padding:0 .2em;cursor:pointer}.vxe-table-custom--fixed-left-option.is--checked,.vxe-table-custom--fixed-left-option:hover,.vxe-table-custom--fixed-right-option.is--checked,.vxe-table-custom--fixed-right-option:hover{color:#409eff}.vxe-table-custom--fixed-left-option.is--disabled,.vxe-table-custom--fixed-right-option.is--disabled{cursor:no-drop;color:#dcdfe6}.vxe-table-custom-popup--body{overflow:auto;height:100%}.vxe-table-custom-popup--table-wrapper{border-bottom:1px solid #e8eaec}.vxe-table-custom-popup--table-wrapper table{width:100%;border:0;border-spacing:0;border-collapse:separate}.vxe-table-custom-popup--table-wrapper table th{position:sticky;top:0;text-align:left;border-top:1px solid #e8eaec;border-bottom:1px solid #e8eaec;border-left:1px solid #e8eaec;background-color:#f8f8f9;z-index:7}.vxe-table-custom-popup--table-wrapper table td{border-top:1px solid #e8eaec;border-left:1px solid #e8eaec}.vxe-table-custom-popup--table-wrapper table tr:first-child td{border-top:0}.vxe-table-custom-popup--table-wrapper table td,.vxe-table-custom-popup--table-wrapper table th{height:44px;padding:0 .6em}.vxe-table-custom-popup--table-wrapper table td:last-child,.vxe-table-custom-popup--table-wrapper table th:last-child{border-right:1px solid #e8eaec}.vxe-table-custom-popup--drag-hint{display:none;position:absolute;top:0;left:0;padding:.6em 1em .6em 1.8em;max-width:300px;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;pointer-events:none;background-color:#fff;box-shadow:0 0 10px 0 rgba(0,0,0,.2);z-index:33}.vxe-table-custom-popup--name{max-width:360px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-table-custom-popup--row.level--2 .vxe-table-custom-popup--name{padding-left:24px;max-width:236px}.vxe-table-custom-popup--row.level--3 .vxe-table-custom-popup--name{padding-left:48px;max-width:212px}.vxe-table-custom-popup--row.level--4 .vxe-table-custom-popup--name{padding-left:72px;max-width:188px}.vxe-table-custom-popup--row.level--5 .vxe-table-custom-popup--name{padding-left:96px;max-width:164px}.vxe-table-custom-popup--row.level--6 .vxe-table-custom-popup--name{padding-left:120px;max-width:140px}.vxe-table-custom-popup--row.level--7 .vxe-table-custom-popup--name{padding-left:144px;max-width:116px}.vxe-table-custom-popup--row.level--8 .vxe-table-custom-popup--name{padding-left:168px;max-width:92px}.vxe-table-custom-popup--row.level--9 .vxe-table-custom-popup--name{padding-left:192px;max-width:68px}.vxe-table-custom-popup--column-item{position:relative}.vxe-table-custom-popup--column-item.col--fixed,.vxe-table-custom-popup--column-item.col--sort,.vxe-table-custom-popup--column-item.col--visible{text-align:center}.vxe-table-custom-popup--row.active--drag-target[drag-pos=top] .vxe-table-custom-popup--column-item::after{display:block;top:-2px}.vxe-table-custom-popup--row.active--drag-target[drag-pos=bottom] .vxe-table-custom-popup--column-item::after{display:block;bottom:-2px}.vxe-table-custom-popup--row:first-child[drag-pos=top] .vxe-table-custom-popup--column-item::after{top:0}.vxe-table-custom-popup--row:last-child[drag-pos=bottom] .vxe-table-custom-popup--column-item::after{bottom:0}.vxe-table-custom-popup--column-item::after{display:none;content:"";position:absolute;left:-1px;width:calc(100% + 1px);height:3px;background-color:#409eff;z-index:12}.vxe-table-custom-popup--column-item:last-child::after{width:100%}.vxe-table-custom--flip-move{transition:transform .35s}.vxe-table-custom-popup--column-sort-btn{font-size:1.2em;padding:.2em .5em;cursor:grab}.vxe-table-custom-popup--column-sort-btn:active{cursor:grabbing}
+[class*=vxe-],[class*=vxe-] :after,[class*=vxe-] :before,[class*=vxe-]:after,[class*=vxe-]:before{box-sizing:border-box}.vxe-table-custom-popup--drag-hint{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}[class*=vxe-]{font-variant:tabular-nums;font-feature-settings:"tnum"}.vxe-primary-color{color:#409eff}.vxe-success-color{color:#67c23a}.vxe-info-color{color:#909399}.vxe-warning-color{color:#e6a23c}.vxe-danger-color{color:#f56c6c}.vxe-perfect-color{color:#f8f8f9}.vxe-row:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-row>.vxe-col--1{float:left;width:4.16667%}.vxe-row>.vxe-col--2{float:left;width:8.33333%}.vxe-row>.vxe-col--3{float:left;width:12.5%}.vxe-row>.vxe-col--4{float:left;width:16.66667%}.vxe-row>.vxe-col--5{float:left;width:20.83333%}.vxe-row>.vxe-col--6{float:left;width:25%}.vxe-row>.vxe-col--7{float:left;width:29.16667%}.vxe-row>.vxe-col--8{float:left;width:33.33333%}.vxe-row>.vxe-col--9{float:left;width:37.5%}.vxe-row>.vxe-col--10{float:left;width:41.66667%}.vxe-row>.vxe-col--11{float:left;width:45.83333%}.vxe-row>.vxe-col--12{float:left;width:50%}.vxe-row>.vxe-col--13{float:left;width:54.16667%}.vxe-row>.vxe-col--14{float:left;width:58.33333%}.vxe-row>.vxe-col--15{float:left;width:62.5%}.vxe-row>.vxe-col--16{float:left;width:66.66667%}.vxe-row>.vxe-col--17{float:left;width:70.83333%}.vxe-row>.vxe-col--18{float:left;width:75%}.vxe-row>.vxe-col--19{float:left;width:79.16667%}.vxe-row>.vxe-col--20{float:left;width:83.33333%}.vxe-row>.vxe-col--21{float:left;width:87.5%}.vxe-row>.vxe-col--22{float:left;width:91.66667%}.vxe-row>.vxe-col--23{float:left;width:95.83333%}.vxe-row>.vxe-col--24{float:left;width:100%}.is--animat .vxe-filter--btn:after,.is--animat .vxe-filter--btn:before,.is--animat .vxe-sort--asc-btn:after,.is--animat .vxe-sort--asc-btn:before,.is--animat .vxe-sort--desc-btn:after,.is--animat .vxe-sort--desc-btn:before{transition:border .1s ease-in-out}.is--animat .vxe-input--wrapper .vxe-input{transition:border .1s ease-in-out}.is--animat .vxe-table--expand-btn,.is--animat .vxe-tree--node-btn{transition:transform .1s ease-in-out}.is--animat .vxe-checkbox>input:checked+span,.is--animat .vxe-radio>input:checked+span{transition:background-color .1s ease-in-out}.vxe-table-custom--option{display:flex;flex-direction:row}.vxe-table-custom-wrapper{display:none;position:absolute;top:-4px;right:2px;text-align:left;background-color:#fff;z-index:19;border:1px solid #e8eaec;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2)}.vxe-table-custom-wrapper.is--active{display:block}.vxe-table-custom--body,.vxe-table-custom--header{list-style-type:none;overflow-x:hidden;overflow-y:auto;margin:0;padding:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-table-custom--body>li,.vxe-table-custom--header>li{max-width:18em;min-width:14em;padding:.2em 1em .2em 1em}.vxe-table-custom--body>li.level--2,.vxe-table-custom--header>li.level--2{padding-left:3.5em}.vxe-table-custom--body>li.level--2 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--2 .vxe-checkbox--icon{left:1.8em}.vxe-table-custom--body>li.level--3,.vxe-table-custom--header>li.level--3{padding-left:4.5em}.vxe-table-custom--body>li.level--3 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--3 .vxe-checkbox--icon{left:2.8em}.vxe-table-custom--body>li.level--4,.vxe-table-custom--header>li.level--4{padding-left:5.5em}.vxe-table-custom--body>li.level--4 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--4 .vxe-checkbox--icon{left:3.8em}.vxe-table-custom--body>li.level--5,.vxe-table-custom--header>li.level--5{padding-left:6.5em}.vxe-table-custom--body>li.level--5 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--5 .vxe-checkbox--icon{left:4.8em}.vxe-table-custom--body>li.level--6,.vxe-table-custom--header>li.level--6{padding-left:7.5em}.vxe-table-custom--body>li.level--6 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--6 .vxe-checkbox--icon{left:5.8em}.vxe-table-custom--body>li.level--7,.vxe-table-custom--header>li.level--7{padding-left:8.5em}.vxe-table-custom--body>li.level--7 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--7 .vxe-checkbox--icon{left:6.8em}.vxe-table-custom--body>li.level--8,.vxe-table-custom--header>li.level--8{padding-left:9.5em}.vxe-table-custom--body>li.level--8 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--8 .vxe-checkbox--icon{left:7.8em}.vxe-table-custom--header{padding:.28em 0;font-weight:700;border-bottom:1px solid #dadce0}.vxe-table-custom--body{padding:.2em 0;max-height:20em}.vxe-table-custom--body .vxe-table-custom--checkbox-option:hover{background-color:#f5f7fa}.vxe-table-custom--footer{border-top:1px solid #dadce0;text-align:right}.vxe-table-custom--footer button{background-color:transparent;width:50%;height:2.5em;border:0;color:#606266;text-align:center;cursor:pointer}.vxe-table-custom--footer button:focus{outline:0}.vxe-table-custom--footer button:hover{color:#409eff}.vxe-table-custom--checkbox-option{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;flex-grow:1}.vxe-table-custom--checkbox-option .vxe-checkbox--icon{font-size:1.34em}.vxe-table-custom--checkbox-option .vxe-checkbox--icon{color:#dcdfe6;vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-table-custom--checkbox-option.is--checked,.vxe-table-custom--checkbox-option.is--indeterminate{color:#409eff}.vxe-table-custom--checkbox-option.is--checked .vxe-checkbox--icon,.vxe-table-custom--checkbox-option.is--indeterminate .vxe-checkbox--icon{color:#409eff}.vxe-table-custom--checkbox-option:not(.is--disabled){cursor:pointer}.vxe-table-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon{color:#409eff}.vxe-table-custom--checkbox-option.is--disabled{color:#bfbfbf;cursor:not-allowed}.vxe-table-custom--checkbox-option.is--disabled .vxe-checkbox--icon{color:#dcdfe6}.vxe-table-custom--checkbox-option .vxe-checkbox--label{padding-left:.5em;vertical-align:middle}.vxe-table-custom--fixed-option{flex-shrink:0;padding-left:.5em;display:flex;flex-direction:row;align-items:center}.vxe-table-custom--fixed-left-option,.vxe-table-custom--fixed-right-option{line-height:1.34em;font-size:1.1em;padding:0 .2em;cursor:pointer}.vxe-table-custom--fixed-left-option.is--checked,.vxe-table-custom--fixed-left-option:hover,.vxe-table-custom--fixed-right-option.is--checked,.vxe-table-custom--fixed-right-option:hover{color:#409eff}.vxe-table-custom--fixed-left-option.is--disabled,.vxe-table-custom--fixed-right-option.is--disabled{cursor:no-drop;color:#dcdfe6}.vxe-table-custom-popup--body{overflow:auto;height:100%}.vxe-table-custom-popup--table-wrapper{border-bottom:1px solid #e8eaec}.vxe-table-custom-popup--table-wrapper table{width:100%;border:0;table-layout:fixed;word-break:break-all;border-spacing:0;border-collapse:separate}.vxe-table-custom-popup--table-wrapper table th{position:sticky;top:0;text-align:left;border-top:1px solid #e8eaec;border-bottom:1px solid #e8eaec;border-left:1px solid #e8eaec;background-color:#f8f8f9;z-index:7}.vxe-table-custom-popup--table-wrapper table td{border-top:1px solid #e8eaec;border-left:1px solid #e8eaec}.vxe-table-custom-popup--table-wrapper table tr:first-child td{border-top:0}.vxe-table-custom-popup--table-wrapper table tr:hover{background-color:#f5f7fa}.vxe-table-custom-popup--table-wrapper table td,.vxe-table-custom-popup--table-wrapper table th{height:44px;padding:0 .6em}.vxe-table-custom-popup--table-wrapper table td:last-child,.vxe-table-custom-popup--table-wrapper table th:last-child{border-right:1px solid #e8eaec}.vxe-table-custom-popup--drag-hint{display:none;position:absolute;top:0;left:0;padding:.6em 1em .6em 1.8em;max-width:300px;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;pointer-events:none;background-color:#fff;box-shadow:0 0 10px 0 rgba(0,0,0,.2);z-index:33}.vxe-table-custom-popup--name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-table-custom-popup--row.level--2 .vxe-table-custom-popup--name{padding-left:24px}.vxe-table-custom-popup--row.level--3 .vxe-table-custom-popup--name{padding-left:48px}.vxe-table-custom-popup--row.level--4 .vxe-table-custom-popup--name{padding-left:72px}.vxe-table-custom-popup--row.level--5 .vxe-table-custom-popup--name{padding-left:96px}.vxe-table-custom-popup--row.level--6 .vxe-table-custom-popup--name{padding-left:120px}.vxe-table-custom-popup--row.level--7 .vxe-table-custom-popup--name{padding-left:144px}.vxe-table-custom-popup--row.level--8 .vxe-table-custom-popup--name{padding-left:168px}.vxe-table-custom-popup--row.level--9 .vxe-table-custom-popup--name{padding-left:192px}.vxe-table-custom-popup--column-item{position:relative}.vxe-table-custom-popup--column-item.col--fixed,.vxe-table-custom-popup--column-item.col--sort,.vxe-table-custom-popup--column-item.col--visible{text-align:center}.vxe-table-custom-popup--row.active--drag-target[drag-pos=top] .vxe-table-custom-popup--column-item::after{display:block;top:-2px}.vxe-table-custom-popup--row.active--drag-target[drag-pos=bottom] .vxe-table-custom-popup--column-item::after{display:block;bottom:-2px}.vxe-table-custom-popup--row:first-child[drag-pos=top] .vxe-table-custom-popup--column-item::after{top:0}.vxe-table-custom-popup--row:last-child[drag-pos=bottom] .vxe-table-custom-popup--column-item::after{bottom:0}.vxe-table-custom-popup--column-item::after{display:none;content:"";position:absolute;left:-1px;width:calc(100% + 1px);height:3px;background-color:#409eff;z-index:12}.vxe-table-custom-popup--column-item:last-child::after{width:100%}.vxe-table-custom--flip-move{transition:transform .35s}.vxe-table-custom-popup--column-sort-btn{font-size:1.2em;padding:.2em .5em;cursor:grab}.vxe-table-custom-popup--column-sort-btn:active{cursor:grabbing}.vxe-table-custom-popup--table-sort-help-icon,.vxe-table-custom-popup--table-sort-help-title{vertical-align:middle}.vxe-table-custom-popup--table-sort-help-icon{margin-left:5px;cursor:help}

package/lib/edit/src/mixin.js

@@ -411,7 +411,7 @@ var _default = exports.default = {
       }
       // 如果当前行被激活编辑，则清除激活状态
       if (actived.row && this.findRowIndexOf(rows, actived.row) > -1) {
-        this.clearActived();
+        this.clearEdit();
       }
       // 从新增中移除已删除的数据
       rows.forEach(function (row) {
@@ -569,7 +569,7 @@ var _default = exports.default = {
             }
             this.closeTooltip();
             if (actived.column) {
-              this.clearActived(evnt);
+              this.clearEdit(evnt);
             }
             type = 'edit-activated';
             column.renderHeight = cell.offsetHeight;
@@ -675,9 +675,9 @@ var _default = exports.default = {
       }
     },
     _clearActived: function _clearActived(evnt) {
-      // if (process.env.NODE_ENV === 'development') {
-      //   warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit'])
-      // }
+      if (process.env.NODE_ENV === 'development') {
+        (0, _log.warnLog)('vxe.error.delFunc', ['clearActived', 'clearEdit']);
+      }
       // 即将废弃
       return this.clearEdit(evnt);
     },
@@ -686,7 +686,8 @@ var _default = exports.default = {
      */
     _clearEdit: function _clearEdit(evnt) {
       var editStore = this.editStore;
-      var actived = editStore.actived;
+      var actived = editStore.actived,
+        focused = editStore.focused;
       var row = actived.row,
         column = actived.column;
       if (row || column) {
@@ -704,6 +705,8 @@ var _default = exports.default = {
           $columnIndex: this.getVMColumnIndex(column)
         }, evnt);
       }
+      focused.row = null;
+      focused.column = null;
       if (_conf.default.cellVaildMode === 'obsolete') {
         if (this.clearValidate) {
           return this.clearValidate();
@@ -881,7 +884,7 @@ var _default = exports.default = {
       var selectMethod = function selectMethod() {
         if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
           if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
-            _this9.clearActived(evnt);
+            _this9.clearEdit(evnt);
             _this9.clearSelected(evnt);
             _this9.clearCellAreas(evnt);
             _this9.clearCopyCellArea(evnt);

package/lib/edit/src/mixin.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_utils=_interopRequireWildcard(require("../../tools/utils")),_util=require("../../table/src/util"),_dom=_interopRequireWildcard(require("../../tools/dom")),_log=require("../../tools/log");function _getRequireWildcardCache(e){var t,r;return"function"!=typeof WeakMap?null:(t=new WeakMap,r=new WeakMap,(_getRequireWildcardCache=function(e){return e?r:t})(e))}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!=_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var r,i,n={__proto__:null},o=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(r in e)"default"!==r&&{}.hasOwnProperty.call(e,r)&&((i=o?Object.getOwnPropertyDescriptor(e,r):null)&&(i.get||i.set)?Object.defineProperty(n,r,i):n[r]=e[r]);return n.default=e,t&&t.set(e,n),n}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function ownKeys(t,e){var r,i=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),i.push.apply(i,r)),i}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){var r;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(r="Object"===(r=Object.prototype.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,i=new Array(t);r<t;r++)i[r]=e[r];return i}function _defineProperty(e,t,r){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var r=e[Symbol.toPrimitive];if(void 0===r)return("string"===t?String:Number)(e);r=r.call(e,t||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}function insertTreeRow(a,e,t){var s=a.tableFullTreeData,u=a.afterFullData,c=a.fullDataRowIdData,d=a.fullAllDataRowIdData,r=a.treeOpts,f=r.rowField,h=r.parentField,p=r.mapChildrenField,_=r.children||r.childrenField,m=t?"push":"unshift";e.forEach(function(e){var t,r,i,n=e[h],o=(0,_util.getRowid)(a,e),l=n?_xeUtils.default.findTree(s,function(e){return n===e[f]},{children:p}):null;l?(l=l.item,t=(t=d[(0,_util.getRowid)(a,l)])?t.level:0,i=l[_],r=l[p],_xeUtils.default.isArray(i)||(i=l[_]=[]),_xeUtils.default.isArray(r)||(r=l[_]=[]),i[m](e),r[m](e),c[o]=r={row:e,rowid:o,seq:-1,index:-1,_index:-1,$index:-1,items:i,parent:l,level:t+1},d[o]=r):("development"===process.env.NODE_ENV&&n&&(0,_log.warnLog)("vxe.error.unableInsert"),u[m](e),s[m](e),i={row:e,rowid:o,seq:-1,index:-1,_index:-1,$index:-1,items:s,parent:null,level:0},c[o]=i,d[o]=i)})}function handleInsertRowAt(i,e,t,n){var r=i.tableFullTreeData,o=i.mergeList,l=i.afterFullData,a=i.editStore,s=i.tableFullData,u=i.treeConfig,c=i.fullDataRowIdData,d=i.fullAllDataRowIdData,f=i.treeOpts,h=f.transform,p=f.rowField,_=f.mapChildrenField,m=f.children||f.childrenField,w=(_xeUtils.default.isArray(e)||(e=[e]),i.defineField(e.map(function(e){return Object.assign(u&&h?_defineProperty(_defineProperty({},_,[]),m,[]):{},e)})));if(_xeUtils.default.eqNull(t))u&&h?insertTreeRow(i,w,!1):(l.unshift.apply(l,_toConsumableArray(w)),s.unshift.apply(s,_toConsumableArray(w)),o.forEach(function(e){var t=e.row;0<t&&(e.row=t+w.length)}));else if(-1===t)u&&h?insertTreeRow(i,w,!0):(l.push.apply(l,_toConsumableArray(w)),s.push.apply(s,_toConsumableArray(w)),o.forEach(function(e){var t=e.row,r=e.rowspan;t+r>l.length&&(e.rowspan=r+w.length)}));else if(u&&h){var g,v,y,b=_xeUtils.default.findTree(r,function(e){return t[p]===e[p]},{children:_});b?(g=b.parent,v=g?g[_]:r,e=d[(0,_util.getRowid)(i,g)],y=e?e.level:0,w.forEach(function(e,t){var r=(0,_util.getRowid)(i,e),t=("development"===process.env.NODE_ENV&&e[f.parentField]&&g&&e[f.parentField]!==g[p]&&(0,_log.errLog)("vxe.error.errProp",["".concat(f.parentField,"=").concat(e[f.parentField]),"".concat(f.parentField,"=").concat(g[p])]),g&&(e[f.parentField]=g[p]),b.index+t),t=(n&&(t+=1),v.splice(t,0,e),{row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:v,parent:g,level:y+1});c[r]=t,d[r]=t}),g&&(e=_xeUtils.default.findTree(r,function(e){return t[p]===e[p]},{children:m}))&&(r=e.items,e=e.index,n&&(e+=1),r.splice.apply(r,[e,0].concat(_toConsumableArray(w))))):("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.unableInsert"),insertTreeRow(i,w,!0))}else{if(u)throw new Error((0,_log.getLog)("vxe.error.noTree",["insert"]));var x=-1;if(_xeUtils.default.isNumber(t)?t<l.length&&(x=t):x=i.findRowIndexOf(l,t),-1===(x=n?Math.min(l.length,x+1):x))throw new Error((0,_log.errLog)("vxe.error.unableInsert"));l.splice.apply(l,[x,0].concat(_toConsumableArray(w))),s.splice.apply(s,[i.findRowIndexOf(s,t),0].concat(_toConsumableArray(w))),o.forEach(function(e){var t=e.row,r=e.rowspan;x<t?e.row=t+w.length:x<t+r&&(e.rowspan=r+w.length)})}var r=a.insertList,C=a.insertMaps;return w.forEach(function(e){var t=(0,_util.getRowid)(i,e);C[t]=e}),r.unshift.apply(r,_toConsumableArray(w)),i.cacheRowMap(),i.updateScrollYStatus(),i.handleTableData(u&&h),u&&h||i.updateAfterDataIndex(),i.updateFooter(),i.checkSelectionStatus(),i.scrollYLoad&&i.updateScrollYSpace(),i.$nextTick().then(function(){return i.updateCellAreas(),i.recalculate()}).then(function(){return{row:w.length?w[w.length-1]:null,rows:w}})}var _default=exports.default={methods:{_insert:function(e){return handleInsertRowAt(this,e,null)},_insertAt:function(e,t){return handleInsertRowAt(this,e,t)},_insertNextAt:function(e,t){return handleInsertRowAt(this,e,t,!0)},_remove:function(e){var t,n=this,o=this.afterFullData,r=this.tableFullData,i=this.tableFullTreeData,l=this.treeConfig,a=this.mergeList,s=this.editStore,u=this.checkboxOpts,c=this.selectCheckboxMaps,d=this.isInsertByRow,f=this.treeOpts,h=f.transform,p=f.mapChildrenField,_=f.children||f.childrenField,f=s.actived,m=s.removeList,w=s.insertList,g=s.insertMaps,s=u.checkField,v=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=r,e.forEach(function(e){d(e)||m.push(e)}),s||(t=_objectSpread({},c),e.forEach(function(e){e=(0,_util.getRowid)(n,e);t[e]&&delete t[e]}),this.selectCheckboxMaps=t),r===e?(e=v=r.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):l&&h?e.forEach(function(e){var t=(0,_util.getRowid)(n,e),r=_xeUtils.default.findTree(i,function(e){return t===(0,_util.getRowid)(n,e)},{children:p}),r=(r&&(r=r.items.splice(r.index,1),v.push(r[0])),_xeUtils.default.findTree(i,function(e){return t===(0,_util.getRowid)(n,e)},{children:_})),r=(r&&r.items.splice(r.index,1),n.findRowIndexOf(o,e));-1<r&&o.splice(r,1)}):e.forEach(function(e){var t=n.findRowIndexOf(r,e),i=(-1<t&&(t=r.splice(t,1),v.push(t[0])),n.findRowIndexOf(o,e));-1<i&&(a.forEach(function(e){var t=e.row,r=e.rowspan;i<t?e.row=t-1:i<t+r&&(e.rowspan=r-1)}),o.splice(i,1))}),f.row&&-1<this.findRowIndexOf(e,f.row)&&this.clearActived(),e.forEach(function(e){var t=(0,_util.getRowid)(n,e),e=n.findRowIndexOf(w,e);-1<e&&w.splice(e,1),delete g[t]}),this.handleTableData(l&&h),l&&h||this.updateAfterDataIndex(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),this.scrollYLoad&&this.updateScrollYSpace(),this.$nextTick().then(function(){return n.updateCellAreas(),n.recalculate()}).then(function(){return{row:v.length?v[v.length-1]:null,rows:v}})},_removeCheckboxRow:function(){var t=this;return this.remove(this.getCheckboxRecords()).then(function(e){return t.clearCheckboxRow(),e})},_removeRadioRow:function(){var t=this,e=this.getRadioRecord();return this.remove(e||[]).then(function(e){return t.clearRadioRow(),e})},_removeCurrentRow:function(){var t=this,e=this.getCurrentRecord();return this.remove(e||[]).then(function(e){return t.clearCurrentRow(),e})},_getRecordset:function(){return{insertRecords:this.getInsertRecords(),removeRecords:this.getRemoveRecords(),updateRecords:this.getUpdateRecords(),pendingRecords:this.getPendingRecords()}},_getInsertRecords:function(){var r=this,i=this.fullAllDataRowIdData,e=this.editStore.insertList,n=[];return e.forEach(function(e){var t=(0,_util.getRowid)(r,e);i[t]&&n.push(e)}),n},_getRemoveRecords:function(){return this.editStore.removeList},_getUpdateRecords:function(){var e=this.keepSource,t=this.tableFullData,r=this.isUpdateByRow,i=this.treeConfig,n=this.treeOpts,o=this.editStore;return e?(o=(e=o.actived).row,e=e.column,(o||e)&&this._syncActivedCell(),i?_xeUtils.default.filterTree(t,function(e){return r(e)},n):t.filter(function(e){return r(e)})):[]},handleActived:function(e,t){var r,i=this,n=this.editStore,o=this.editOpts,l=this.tableColumn,a=this.editConfig,s=this.mouseConfig,u=o.mode,n=n.actived,c=e.row,d=e.column,f=d.editRender,h=e.cell=e.cell||this.getCell(c,d),p=o.beforeEditMethod||o.activeMethod;return(0,_utils.isEnableConf)(a)&&(0,_utils.isEnableConf)(f)&&!this.hasPendingByRow(c)&&h&&(n.row!==c||"cell"===u&&n.column!==d?(a="edit-disabled",p&&!p(_objectSpread(_objectSpread({},e),{},{$table:this,$grid:this.$xegrid}))||(s&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),this.closeTooltip(),n.column&&this.clearActived(t),a="edit-activated",d.renderHeight=h.offsetHeight,n.args=e,n.row=c,n.column=d,"row"===u?l.forEach(function(e){return i._getColumnModel(c,e)}):this._getColumnModel(c,d),r=o.afterEditMethod,this.$nextTick(function(){i.handleFocus(e,t),r&&r(_objectSpread(_objectSpread({},e),{},{$table:i,$grid:i.$xegrid}))})),this.emitEvent(a,{row:c,rowIndex:this.getRowIndex(c),$rowIndex:this.getVMRowIndex(c),column:d,columnIndex:this.getColumnIndex(d),$columnIndex:this.getVMColumnIndex(d)},t),"edit-activated"===a&&this.emitEvent("edit-actived",{row:c,rowIndex:this.getRowIndex(c),$rowIndex:this.getVMRowIndex(c),column:d,columnIndex:this.getColumnIndex(d),$columnIndex:this.getVMColumnIndex(d)},t)):(f=n.column,s&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),f!==d&&((p=f.model).update&&_utils.default.setCellValue(c,f,p.value),this.clearValidate()),d.renderHeight=h.offsetHeight,n.args=e,n.column=d,setTimeout(function(){i.handleFocus(e,t)})),this.focus()),this.$nextTick()},_getColumnModel:function(e,t){var r=t.model;t.editRender&&(r.value=_utils.default.getCellValue(e,t),r.update=!1)},_setColumnModel:function(e,t){var r=t.model;t.editRender&&r.update&&(_utils.default.setCellValue(e,t,r.value),r.update=!1,r.value=null)},_syncActivedCell:function(){var t=this,e=this.tableColumn,r=this.editStore,i=this.editOpts,r=r.actived,n=r.row,r=r.column;(n||r)&&("row"===i.mode?e.forEach(function(e){return t._setColumnModel(n,e)}):this._setColumnModel(n,r))},_clearActived:function(e){return this.clearEdit(e)},_clearEdit:function(e){var t=this.editStore.actived,r=t.row,i=t.column;return(r||i)&&(this._syncActivedCell(),t.args=null,t.row=null,t.column=null,this.updateFooter(),this.emitEvent("edit-closed",{row:r,rowIndex:this.getRowIndex(r),$rowIndex:this.getVMRowIndex(r),column:i,columnIndex:this.getColumnIndex(i),$columnIndex:this.getVMColumnIndex(i)},e)),"obsolete"===_conf.default.cellVaildMode&&this.clearValidate?this.clearValidate():this.$nextTick()},_getActiveRecord:function(){return this.getEditRecord()},_getEditRecord:function(){var e=this.$el,t=this.editStore,r=this.afterFullData,t=t.actived,i=t.args,t=t.row;return i&&-1<this.findRowIndexOf(r,t)&&e.querySelectorAll(".vxe-body--column.col--active").length?Object.assign({},i):null},_isActiveByRow:function(e){return this.isEditByRow(e)},_isEditByRow:function(e){return this.editStore.actived.row===e},handleFocus:function(e){var t,r,i,n=e.row,o=e.column,l=e.cell,a=o.editRender;(0,_utils.isEnableConf)(a)&&(i=_vXETable.default.renderer.get(a.name),t=a.autofocus,a=a.autoselect,!t&&i&&(t=i.autofocus),!a&&i&&(a=i.autoselect),_xeUtils.default.isFunction(t)?r=t.call(this,e):t&&(r=l.querySelector(t))&&r.focus(),r?a?r.select():_dom.browse.msie&&((i=r.createTextRange()).collapse(!1),i.select()):this.scrollToRow(n,o))},_setActiveRow:function(e){return this.setEditRow(e)},_setEditRow:function(e,t){var r=_xeUtils.default.find(this.visibleColumn,function(e){return(0,_utils.isEnableConf)(e.editRender)});return t&&(r=_xeUtils.default.isString(t)?this.getColumnByField(t):t),this.setEditCell(e,r)},_setActiveCell:function(e){return this.setEditCell(e)},_setEditCell:function(t,e){var r=this,i=this.editConfig,n=_xeUtils.default.isString(e)?this.getColumnByField(e):e;return t&&n&&(0,_utils.isEnableConf)(i)&&(0,_utils.isEnableConf)(n.editRender)?this.scrollToRow(t,!0).then(function(){var e=r.getCell(t,n);e&&(r.handleActived({row:t,rowIndex:r.getRowIndex(t),column:n,columnIndex:r.getColumnIndex(n),cell:e,$table:r}),r.lastCallTime=Date.now())}):this.$nextTick()},_setSelectCell:function(e,t){var r=this.tableData,i=this.editOpts,n=this.visibleColumn,t=_xeUtils.default.isString(t)?this.getColumnByField(t):t;return e&&t&&"manual"!==i.trigger&&-1<(i=this.findRowIndexOf(r,e))&&(r=this.getCell(e,t),e={row:e,rowIndex:i,column:t,columnIndex:n.indexOf(t),cell:r},this.handleSelected(e,{})),this.$nextTick()},handleSelected:function(e,t){var r=this,i=this.mouseConfig,n=this.mouseOpts,o=this.editOpts,l=this.editStore,a=l.actived,l=l.selected,s=e.row,u=e.column,i=i&&n.selected;return!i||l.row===s&&l.column===u||(a.row!==s||"cell"===o.mode&&a.column!==u)&&(r.clearActived(t),r.clearSelected(t),r.clearCellAreas(t),r.clearCopyCellArea(t),l.args=e,l.row=s,l.column=u,i&&r.addColSdCls(),r.focus(),t)&&r.emitEvent("cell-selected",e,t),r.$nextTick()},_getSelectedCell:function(){var e=this.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},_clearSelected:function(){var e=this.editStore.selected;return e.row=null,e.column=null,this.reColTitleSdCls(),this.reColSdCls(),this.$nextTick()},reColTitleSdCls:function(){var e=this.elemStore["main-header-list"];e&&_xeUtils.default.arrayEach(e.querySelectorAll(".col--title-selected"),function(e){return _dom.default.removeClass(e,"col--title-selected")})},reColSdCls:function(){var e=this.$el.querySelector(".col--selected");e&&_dom.default.removeClass(e,"col--selected")},addColSdCls:function(){var e=this.editStore.selected,t=e.row,e=e.column;this.reColSdCls(),t&&e&&(t=this.getCell(t,e))&&_dom.default.addClass(t,"col--selected")}}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_utils=_interopRequireWildcard(require("../../tools/utils")),_util=require("../../table/src/util"),_dom=_interopRequireWildcard(require("../../tools/dom")),_log=require("../../tools/log");function _getRequireWildcardCache(e){var t,r;return"function"!=typeof WeakMap?null:(t=new WeakMap,r=new WeakMap,(_getRequireWildcardCache=function(e){return e?r:t})(e))}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!=_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var r,n,i={__proto__:null},o=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(r in e)"default"!==r&&{}.hasOwnProperty.call(e,r)&&((n=o?Object.getOwnPropertyDescriptor(e,r):null)&&(n.get||n.set)?Object.defineProperty(i,r,n):i[r]=e[r]);return i.default=e,t&&t.set(e,i),i}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function ownKeys(t,e){var r,n=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,r)),n}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){var r;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(r="Object"===(r=Object.prototype.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=new Array(t);r<t;r++)n[r]=e[r];return n}function _defineProperty(e,t,r){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var r=e[Symbol.toPrimitive];if(void 0===r)return("string"===t?String:Number)(e);r=r.call(e,t||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}function insertTreeRow(a,e,t){var s=a.tableFullTreeData,u=a.afterFullData,c=a.fullDataRowIdData,d=a.fullAllDataRowIdData,r=a.treeOpts,f=r.rowField,h=r.parentField,p=r.mapChildrenField,_=r.children||r.childrenField,m=t?"push":"unshift";e.forEach(function(e){var t,r,n,i=e[h],o=(0,_util.getRowid)(a,e),l=i?_xeUtils.default.findTree(s,function(e){return i===e[f]},{children:p}):null;l?(l=l.item,t=(t=d[(0,_util.getRowid)(a,l)])?t.level:0,n=l[_],r=l[p],_xeUtils.default.isArray(n)||(n=l[_]=[]),_xeUtils.default.isArray(r)||(r=l[_]=[]),n[m](e),r[m](e),c[o]=r={row:e,rowid:o,seq:-1,index:-1,_index:-1,$index:-1,items:n,parent:l,level:t+1},d[o]=r):("development"===process.env.NODE_ENV&&i&&(0,_log.warnLog)("vxe.error.unableInsert"),u[m](e),s[m](e),n={row:e,rowid:o,seq:-1,index:-1,_index:-1,$index:-1,items:s,parent:null,level:0},c[o]=n,d[o]=n)})}function handleInsertRowAt(n,e,t,i){var r=n.tableFullTreeData,o=n.mergeList,l=n.afterFullData,a=n.editStore,s=n.tableFullData,u=n.treeConfig,c=n.fullDataRowIdData,d=n.fullAllDataRowIdData,f=n.treeOpts,h=f.transform,p=f.rowField,_=f.mapChildrenField,m=f.children||f.childrenField,w=(_xeUtils.default.isArray(e)||(e=[e]),n.defineField(e.map(function(e){return Object.assign(u&&h?_defineProperty(_defineProperty({},_,[]),m,[]):{},e)})));if(_xeUtils.default.eqNull(t))u&&h?insertTreeRow(n,w,!1):(l.unshift.apply(l,_toConsumableArray(w)),s.unshift.apply(s,_toConsumableArray(w)),o.forEach(function(e){var t=e.row;0<t&&(e.row=t+w.length)}));else if(-1===t)u&&h?insertTreeRow(n,w,!0):(l.push.apply(l,_toConsumableArray(w)),s.push.apply(s,_toConsumableArray(w)),o.forEach(function(e){var t=e.row,r=e.rowspan;t+r>l.length&&(e.rowspan=r+w.length)}));else if(u&&h){var g,v,y,b=_xeUtils.default.findTree(r,function(e){return t[p]===e[p]},{children:_});b?(g=b.parent,v=g?g[_]:r,e=d[(0,_util.getRowid)(n,g)],y=e?e.level:0,w.forEach(function(e,t){var r=(0,_util.getRowid)(n,e),t=("development"===process.env.NODE_ENV&&e[f.parentField]&&g&&e[f.parentField]!==g[p]&&(0,_log.errLog)("vxe.error.errProp",["".concat(f.parentField,"=").concat(e[f.parentField]),"".concat(f.parentField,"=").concat(g[p])]),g&&(e[f.parentField]=g[p]),b.index+t),t=(i&&(t+=1),v.splice(t,0,e),{row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:v,parent:g,level:y+1});c[r]=t,d[r]=t}),g&&(e=_xeUtils.default.findTree(r,function(e){return t[p]===e[p]},{children:m}))&&(r=e.items,e=e.index,i&&(e+=1),r.splice.apply(r,[e,0].concat(_toConsumableArray(w))))):("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.unableInsert"),insertTreeRow(n,w,!0))}else{if(u)throw new Error((0,_log.getLog)("vxe.error.noTree",["insert"]));var x=-1;if(_xeUtils.default.isNumber(t)?t<l.length&&(x=t):x=n.findRowIndexOf(l,t),-1===(x=i?Math.min(l.length,x+1):x))throw new Error((0,_log.errLog)("vxe.error.unableInsert"));l.splice.apply(l,[x,0].concat(_toConsumableArray(w))),s.splice.apply(s,[n.findRowIndexOf(s,t),0].concat(_toConsumableArray(w))),o.forEach(function(e){var t=e.row,r=e.rowspan;x<t?e.row=t+w.length:x<t+r&&(e.rowspan=r+w.length)})}var r=a.insertList,C=a.insertMaps;return w.forEach(function(e){var t=(0,_util.getRowid)(n,e);C[t]=e}),r.unshift.apply(r,_toConsumableArray(w)),n.cacheRowMap(),n.updateScrollYStatus(),n.handleTableData(u&&h),u&&h||n.updateAfterDataIndex(),n.updateFooter(),n.checkSelectionStatus(),n.scrollYLoad&&n.updateScrollYSpace(),n.$nextTick().then(function(){return n.updateCellAreas(),n.recalculate()}).then(function(){return{row:w.length?w[w.length-1]:null,rows:w}})}var _default=exports.default={methods:{_insert:function(e){return handleInsertRowAt(this,e,null)},_insertAt:function(e,t){return handleInsertRowAt(this,e,t)},_insertNextAt:function(e,t){return handleInsertRowAt(this,e,t,!0)},_remove:function(e){var t,i=this,o=this.afterFullData,r=this.tableFullData,n=this.tableFullTreeData,l=this.treeConfig,a=this.mergeList,s=this.editStore,u=this.checkboxOpts,c=this.selectCheckboxMaps,d=this.isInsertByRow,f=this.treeOpts,h=f.transform,p=f.mapChildrenField,_=f.children||f.childrenField,f=s.actived,m=s.removeList,w=s.insertList,g=s.insertMaps,s=u.checkField,v=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=r,e.forEach(function(e){d(e)||m.push(e)}),s||(t=_objectSpread({},c),e.forEach(function(e){e=(0,_util.getRowid)(i,e);t[e]&&delete t[e]}),this.selectCheckboxMaps=t),r===e?(e=v=r.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):l&&h?e.forEach(function(e){var t=(0,_util.getRowid)(i,e),r=_xeUtils.default.findTree(n,function(e){return t===(0,_util.getRowid)(i,e)},{children:p}),r=(r&&(r=r.items.splice(r.index,1),v.push(r[0])),_xeUtils.default.findTree(n,function(e){return t===(0,_util.getRowid)(i,e)},{children:_})),r=(r&&r.items.splice(r.index,1),i.findRowIndexOf(o,e));-1<r&&o.splice(r,1)}):e.forEach(function(e){var t=i.findRowIndexOf(r,e),n=(-1<t&&(t=r.splice(t,1),v.push(t[0])),i.findRowIndexOf(o,e));-1<n&&(a.forEach(function(e){var t=e.row,r=e.rowspan;n<t?e.row=t-1:n<t+r&&(e.rowspan=r-1)}),o.splice(n,1))}),f.row&&-1<this.findRowIndexOf(e,f.row)&&this.clearEdit(),e.forEach(function(e){var t=(0,_util.getRowid)(i,e),e=i.findRowIndexOf(w,e);-1<e&&w.splice(e,1),delete g[t]}),this.handleTableData(l&&h),l&&h||this.updateAfterDataIndex(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),this.scrollYLoad&&this.updateScrollYSpace(),this.$nextTick().then(function(){return i.updateCellAreas(),i.recalculate()}).then(function(){return{row:v.length?v[v.length-1]:null,rows:v}})},_removeCheckboxRow:function(){var t=this;return this.remove(this.getCheckboxRecords()).then(function(e){return t.clearCheckboxRow(),e})},_removeRadioRow:function(){var t=this,e=this.getRadioRecord();return this.remove(e||[]).then(function(e){return t.clearRadioRow(),e})},_removeCurrentRow:function(){var t=this,e=this.getCurrentRecord();return this.remove(e||[]).then(function(e){return t.clearCurrentRow(),e})},_getRecordset:function(){return{insertRecords:this.getInsertRecords(),removeRecords:this.getRemoveRecords(),updateRecords:this.getUpdateRecords(),pendingRecords:this.getPendingRecords()}},_getInsertRecords:function(){var r=this,n=this.fullAllDataRowIdData,e=this.editStore.insertList,i=[];return e.forEach(function(e){var t=(0,_util.getRowid)(r,e);n[t]&&i.push(e)}),i},_getRemoveRecords:function(){return this.editStore.removeList},_getUpdateRecords:function(){var e=this.keepSource,t=this.tableFullData,r=this.isUpdateByRow,n=this.treeConfig,i=this.treeOpts,o=this.editStore;return e?(o=(e=o.actived).row,e=e.column,(o||e)&&this._syncActivedCell(),n?_xeUtils.default.filterTree(t,function(e){return r(e)},i):t.filter(function(e){return r(e)})):[]},handleActived:function(e,t){var r,n=this,i=this.editStore,o=this.editOpts,l=this.tableColumn,a=this.editConfig,s=this.mouseConfig,u=o.mode,i=i.actived,c=e.row,d=e.column,f=d.editRender,h=e.cell=e.cell||this.getCell(c,d),p=o.beforeEditMethod||o.activeMethod;return(0,_utils.isEnableConf)(a)&&(0,_utils.isEnableConf)(f)&&!this.hasPendingByRow(c)&&h&&(i.row!==c||"cell"===u&&i.column!==d?(a="edit-disabled",p&&!p(_objectSpread(_objectSpread({},e),{},{$table:this,$grid:this.$xegrid}))||(s&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),this.closeTooltip(),i.column&&this.clearEdit(t),a="edit-activated",d.renderHeight=h.offsetHeight,i.args=e,i.row=c,i.column=d,"row"===u?l.forEach(function(e){return n._getColumnModel(c,e)}):this._getColumnModel(c,d),r=o.afterEditMethod,this.$nextTick(function(){n.handleFocus(e,t),r&&r(_objectSpread(_objectSpread({},e),{},{$table:n,$grid:n.$xegrid}))})),this.emitEvent(a,{row:c,rowIndex:this.getRowIndex(c),$rowIndex:this.getVMRowIndex(c),column:d,columnIndex:this.getColumnIndex(d),$columnIndex:this.getVMColumnIndex(d)},t),"edit-activated"===a&&this.emitEvent("edit-actived",{row:c,rowIndex:this.getRowIndex(c),$rowIndex:this.getVMRowIndex(c),column:d,columnIndex:this.getColumnIndex(d),$columnIndex:this.getVMColumnIndex(d)},t)):(f=i.column,s&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),f!==d&&((p=f.model).update&&_utils.default.setCellValue(c,f,p.value),this.clearValidate()),d.renderHeight=h.offsetHeight,i.args=e,i.column=d,setTimeout(function(){n.handleFocus(e,t)})),this.focus()),this.$nextTick()},_getColumnModel:function(e,t){var r=t.model;t.editRender&&(r.value=_utils.default.getCellValue(e,t),r.update=!1)},_setColumnModel:function(e,t){var r=t.model;t.editRender&&r.update&&(_utils.default.setCellValue(e,t,r.value),r.update=!1,r.value=null)},_syncActivedCell:function(){var t=this,e=this.tableColumn,r=this.editStore,n=this.editOpts,r=r.actived,i=r.row,r=r.column;(i||r)&&("row"===n.mode?e.forEach(function(e){return t._setColumnModel(i,e)}):this._setColumnModel(i,r))},_clearActived:function(e){return"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["clearActived","clearEdit"]),this.clearEdit(e)},_clearEdit:function(e){var t=this.editStore,r=t.actived,t=t.focused,n=r.row,i=r.column;return(n||i)&&(this._syncActivedCell(),r.args=null,r.row=null,r.column=null,this.updateFooter(),this.emitEvent("edit-closed",{row:n,rowIndex:this.getRowIndex(n),$rowIndex:this.getVMRowIndex(n),column:i,columnIndex:this.getColumnIndex(i),$columnIndex:this.getVMColumnIndex(i)},e)),t.row=null,t.column=null,"obsolete"===_conf.default.cellVaildMode&&this.clearValidate?this.clearValidate():this.$nextTick()},_getActiveRecord:function(){return this.getEditRecord()},_getEditRecord:function(){var e=this.$el,t=this.editStore,r=this.afterFullData,t=t.actived,n=t.args,t=t.row;return n&&-1<this.findRowIndexOf(r,t)&&e.querySelectorAll(".vxe-body--column.col--active").length?Object.assign({},n):null},_isActiveByRow:function(e){return this.isEditByRow(e)},_isEditByRow:function(e){return this.editStore.actived.row===e},handleFocus:function(e){var t,r,n,i=e.row,o=e.column,l=e.cell,a=o.editRender;(0,_utils.isEnableConf)(a)&&(n=_vXETable.default.renderer.get(a.name),t=a.autofocus,a=a.autoselect,!t&&n&&(t=n.autofocus),!a&&n&&(a=n.autoselect),_xeUtils.default.isFunction(t)?r=t.call(this,e):t&&(r=l.querySelector(t))&&r.focus(),r?a?r.select():_dom.browse.msie&&((n=r.createTextRange()).collapse(!1),n.select()):this.scrollToRow(i,o))},_setActiveRow:function(e){return this.setEditRow(e)},_setEditRow:function(e,t){var r=_xeUtils.default.find(this.visibleColumn,function(e){return(0,_utils.isEnableConf)(e.editRender)});return t&&(r=_xeUtils.default.isString(t)?this.getColumnByField(t):t),this.setEditCell(e,r)},_setActiveCell:function(e){return this.setEditCell(e)},_setEditCell:function(t,e){var r=this,n=this.editConfig,i=_xeUtils.default.isString(e)?this.getColumnByField(e):e;return t&&i&&(0,_utils.isEnableConf)(n)&&(0,_utils.isEnableConf)(i.editRender)?this.scrollToRow(t,!0).then(function(){var e=r.getCell(t,i);e&&(r.handleActived({row:t,rowIndex:r.getRowIndex(t),column:i,columnIndex:r.getColumnIndex(i),cell:e,$table:r}),r.lastCallTime=Date.now())}):this.$nextTick()},_setSelectCell:function(e,t){var r=this.tableData,n=this.editOpts,i=this.visibleColumn,t=_xeUtils.default.isString(t)?this.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&-1<(n=this.findRowIndexOf(r,e))&&(r=this.getCell(e,t),e={row:e,rowIndex:n,column:t,columnIndex:i.indexOf(t),cell:r},this.handleSelected(e,{})),this.$nextTick()},handleSelected:function(e,t){var r=this,n=this.mouseConfig,i=this.mouseOpts,o=this.editOpts,l=this.editStore,a=l.actived,l=l.selected,s=e.row,u=e.column,n=n&&i.selected;return!n||l.row===s&&l.column===u||(a.row!==s||"cell"===o.mode&&a.column!==u)&&(r.clearEdit(t),r.clearSelected(t),r.clearCellAreas(t),r.clearCopyCellArea(t),l.args=e,l.row=s,l.column=u,n&&r.addColSdCls(),r.focus(),t)&&r.emitEvent("cell-selected",e,t),r.$nextTick()},_getSelectedCell:function(){var e=this.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},_clearSelected:function(){var e=this.editStore.selected;return e.row=null,e.column=null,this.reColTitleSdCls(),this.reColSdCls(),this.$nextTick()},reColTitleSdCls:function(){var e=this.elemStore["main-header-list"];e&&_xeUtils.default.arrayEach(e.querySelectorAll(".col--title-selected"),function(e){return _dom.default.removeClass(e,"col--title-selected")})},reColSdCls:function(){var e=this.$el.querySelector(".col--selected");e&&_dom.default.removeClass(e,"col--selected")},addColSdCls:function(){var e=this.editStore.selected,t=e.row,e=e.column;this.reColSdCls(),t&&e&&(t=this.getCell(t,e))&&_dom.default.addClass(t,"col--selected")}}};

package/lib/grid/src/grid.js

@@ -610,7 +610,8 @@ var _default2 = exports.default = {
         pagerConfig = this.pagerConfig,
         editRules = this.editRules,
         formData = this.formData,
-        isMsg = this.isMsg;
+        isMsg = this.isMsg,
+        validConfig = this.validConfig;
       var beforeQuery = proxyOpts.beforeQuery,
         afterQuery = proxyOpts.afterQuery,
         beforeDelete = proxyOpts.beforeDelete,
@@ -899,7 +900,7 @@ var _default2 = exports.default = {
               var restPromise = Promise.resolve();
               if (editRules) {
                 // 只校验新增和修改的数据
-                restPromise = this.validate(_body.insertRecords.concat(updateRecords));
+                restPromise = this[validConfig && validConfig.msgMode === 'full' ? 'fullValidate' : 'validate'](_body.insertRecords.concat(updateRecords));
               }
               return restPromise.then(function (errMap) {
                 if (errMap) {