vxe-table 3.8.22 → 3.8.24

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},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 ownKeys(t,e){var n,i=Object.keys(t);return Object.getOwnPropertySymbols&&(n=Object.getOwnPropertySymbols(t),e&&(n=n.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),i.push.apply(i,n)),i}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(n),!0).forEach(function(e){_defineProperty(t,e,n[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):ownKeys(Object(n)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))})}return t}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,trigger:{type:String,default:function(){return _conf.default.button.trigger}},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,visiblePanel:!1,animatVisible:!1,isActivated:!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),_event.GlobalEvent.on(this,"mousedown",this.handleGlobalMousedownEvent)},beforeDestroy:function(){var e=this.$refs.btnPanel;e&&e.parentNode&&e.parentNode.removeChild(e)},destroyed:function(){_event.GlobalEvent.off(this,"mousewheel"),_event.GlobalEvent.off(this,"mousedown")},render:function(e){var t=this.$scopedSlots,n=this.className,i=this.popupClassName,o=this.trigger,r=this.title,s=this.inited,a=this.type,l=this.destroyOnClose,u=this.isFormBtn,c=this.btnMode,d=this.btnStatus,f=this.btnRound,p=this.btnCircle,h=this.vSize,v=this.name,b=this.disabled,m=this.loading,g=this.visiblePanel,y=this.animatVisible,_=this.panelPlacement,t=t.dropdowns,P={},x={};return t&&"hover"===o&&(P.mouseenter=this.mouseenterTargetEvent,P.mouseleave=this.mouseleaveTargetEvent,x.mouseenter=this.mouseenterDropdownEvent,x.mouseleave=this.mouseleaveDropdownEvent),t?e("div",{class:["vxe-button--dropdown",n?_xeUtils.default.isFunction(n)?n({$button:this}):n:"",_defineProperty(_defineProperty({},"size--".concat(h),h),"is--active",g)]},[e("button",{ref:"xBtn",class:["vxe-button","type--".concat(c),_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(h),h),"theme--".concat(d),d),"is--round",f),"is--circle",p),"is--disabled",b||m),"is--loading",m)],attrs:{name:v,title:r,type:u?a:"button",disabled:b||m},on:_objectSpread({click:this.clickTargetEvent},P)},this.renderContent(e).concat([e("i",{class:"vxe-button--dropdown-arrow ".concat(_conf.default.icon.BUTTON_DROPDOWN)})])),e("div",{ref:"btnPanel",class:["vxe-button--dropdown-panel",i?_xeUtils.default.isFunction(i)?i({$button:this}):i:"",_defineProperty(_defineProperty(_defineProperty({},"size--".concat(h),h),"animat--leave",y),"animat--enter",g)],attrs:{placement:_},style:this.panelStyle,on:x},s?[e("div",{class:"vxe-button--dropdown-wrapper",on:{mousedown:this.mousedownDropdownEvent,click:this.clickDropdownEvent}},l&&!g?[]: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(h),h),"theme--".concat(d),d),"is--round",f),"is--circle",p),"is--disabled",b||m),"is--loading",m)],attrs:{name:v,title:r,type:u?a:"button",disabled:b||m},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.visiblePanel&&!_dom.default.getEventTargetNode(e,this.$refs.btnPanel).flag&&this.closePanel()},handleGlobalMousedownEvent:function(e){var t,n=this.disabled,i=this.visiblePanel;n||(n=this.$refs.$el,t=this.$refs.btnPanel,this.isActivated=_dom.default.getEventTargetNode(e,n).flag||_dom.default.getEventTargetNode(e,t).flag,i&&!this.isActivated&&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.btnPanel,n=_dom.default.getEventTargetNode(e,n,"vxe-button"),o=n.flag,n=n.targetElem;o&&(i&&(i.dataset.active="N"),this.visiblePanel=!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){this.openPanel(),this.$emit("mouseenter",{$event:e})},mouseenterDropdownEvent:function(){var e=this,t=this.$refs.btnPanel;t&&(t.dataset.active="Y",this.animatVisible=!0,setTimeout(function(){"Y"===t.dataset.active&&(e.visiblePanel=!0,e.updateZindex(),e.updatePlacement(),setTimeout(function(){e.visiblePanel&&e.updatePlacement()},50))},20))},mouseleaveDropdownEvent:function(){this.closePanel()},clickTargetEvent:function(e){"click"===this.trigger&&(this.visiblePanel?this.closePanel():this.openPanel()),this.clickEvent(e)},openPanel:function(){var e=this,t=this.trigger,n=this.$refs.btnPanel;return n&&(n.dataset.active="Y",this.inited||(this.inited=!0,this.transfer&&document.body.appendChild(n)),this.showTime=setTimeout(function(){"Y"===n.dataset.active?e.mouseenterDropdownEvent():e.animatVisible=!1},"click"===t?50:250)),this.$nextTick()},closePanel:function(){var e=this,t=this.$refs.btnPanel;return clearTimeout(this.showTime),t?(t.dataset.active="N",setTimeout(function(){"Y"!==t.dataset.active&&(e.visiblePanel=!1,setTimeout(function(){"Y"!==t.dataset.active&&(e.animatVisible=!1)},350))},100)):(this.animatVisible=!1,this.visiblePanel=!1),this.$nextTick()},updatePlacement:function(){var p=this;return this.$nextTick().then(function(){var e,t,n,i,o,r,s,a,l=p.$refs,u=p.transfer,c=p.placement,d=p.panelIndex,f=l.xBtn,l=l.btnPanel;if(l&&f)return e=f.offsetHeight,t=f.offsetWidth,n=l.offsetHeight,l=l.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",u?(u=a+e,"top"===c?(s="top",u=a-n):c||(r<o+e+n+5&&(s="top",u=a-n),u<5&&(s="bottom",u=a+e)),f<(a=i+t-l)+l+5&&(a-=a+l+5-f),a<5&&(a=5),Object.assign(d,{left:"".concat(a,"px"),right:"auto",top:"".concat(u,"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()}}};
+"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 ownKeys(t,e){var n,i=Object.keys(t);return Object.getOwnPropertySymbols&&(n=Object.getOwnPropertySymbols(t),e&&(n=n.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),i.push.apply(i,n)),i}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(n),!0).forEach(function(e){_defineProperty(t,e,n[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):ownKeys(Object(n)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))})}return t}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,trigger:{type:String,default:function(){return _conf.default.button.trigger}},align:String,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,visiblePanel:!1,animatVisible:!1,isActivated:!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),_event.GlobalEvent.on(this,"mousedown",this.handleGlobalMousedownEvent)},beforeDestroy:function(){var e=this.$refs.btnPanel;e&&e.parentNode&&e.parentNode.removeChild(e)},destroyed:function(){_event.GlobalEvent.off(this,"mousewheel"),_event.GlobalEvent.off(this,"mousedown")},render:function(e){var t=this.$scopedSlots,n=this.className,i=this.popupClassName,o=this.trigger,r=this.align,s=this.title,a=this.inited,l=this.type,u=this.destroyOnClose,c=this.isFormBtn,d=this.btnMode,f=this.btnStatus,p=this.btnRound,h=this.btnCircle,v=this.vSize,b=this.name,m=this.disabled,g=this.loading,y=this.visiblePanel,_=this.animatVisible,P=this.panelPlacement,t=t.dropdowns,x={},w={};return t&&"hover"===o&&(x.mouseenter=this.mouseenterTargetEvent,x.mouseleave=this.mouseleaveTargetEvent,w.mouseenter=this.mouseenterDropdownEvent,w.mouseleave=this.mouseleaveDropdownEvent),t?e("div",{class:["vxe-button--dropdown",n?_xeUtils.default.isFunction(n)?n({$button:this}):n:"",_defineProperty(_defineProperty({},"size--".concat(v),v),"is--active",y)]},[e("button",{ref:"xBtn",class:["vxe-button","type--".concat(d),r?"align--".concat(r):"",_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(v),v),"theme--".concat(f),f),"is--round",p),"is--circle",h),"is--disabled",m||g),"is--loading",g)],attrs:{name:b,title:s,type:c?l:"button",disabled:m||g},on:_objectSpread({click:this.clickTargetEvent},x)},this.renderContent(e).concat([e("i",{class:"vxe-button--dropdown-arrow ".concat(_conf.default.icon.BUTTON_DROPDOWN)})])),e("div",{ref:"btnPanel",class:["vxe-button--dropdown-panel",i?_xeUtils.default.isFunction(i)?i({$button:this}):i:"",_defineProperty(_defineProperty(_defineProperty({},"size--".concat(v),v),"animat--leave",_),"animat--enter",y)],attrs:{placement:P},style:this.panelStyle,on:w},a?[e("div",{class:"vxe-button--dropdown-wrapper",on:{mousedown:this.mousedownDropdownEvent,click:this.clickDropdownEvent}},u&&!y?[]:t.call(this,{},e))]:null)]):e("button",{ref:"xBtn",class:["vxe-button","type--".concat(d),r?"align--".concat(r):"",n?_xeUtils.default.isFunction(n)?n({$button:this}):n:"",_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(v),v),"theme--".concat(f),f),"is--round",p),"is--circle",h),"is--disabled",m||g),"is--loading",g)],attrs:{name:b,title:s,type:c?l:"button",disabled:m||g},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.visiblePanel&&!_dom.default.getEventTargetNode(e,this.$refs.btnPanel).flag&&this.closePanel()},handleGlobalMousedownEvent:function(e){var t,n=this.disabled,i=this.visiblePanel;n||(n=this.$refs.$el,t=this.$refs.btnPanel,this.isActivated=_dom.default.getEventTargetNode(e,n).flag||_dom.default.getEventTargetNode(e,t).flag,i&&!this.isActivated&&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.btnPanel,n=_dom.default.getEventTargetNode(e,n,"vxe-button"),o=n.flag,n=n.targetElem;o&&(i&&(i.dataset.active="N"),this.visiblePanel=!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){this.openPanel(),this.$emit("mouseenter",{$event:e})},mouseenterDropdownEvent:function(){var e=this,t=this.$refs.btnPanel;t&&(t.dataset.active="Y",this.animatVisible=!0,setTimeout(function(){"Y"===t.dataset.active&&(e.visiblePanel=!0,e.updateZindex(),e.updatePlacement(),setTimeout(function(){e.visiblePanel&&e.updatePlacement()},50))},20))},mouseleaveDropdownEvent:function(){this.closePanel()},clickTargetEvent:function(e){"click"===this.trigger&&(this.visiblePanel?this.closePanel():this.openPanel()),this.clickEvent(e)},openPanel:function(){var e=this,t=this.trigger,n=this.$refs.btnPanel;return n&&(n.dataset.active="Y",this.inited||(this.inited=!0,this.transfer&&document.body.appendChild(n)),this.showTime=setTimeout(function(){"Y"===n.dataset.active?e.mouseenterDropdownEvent():e.animatVisible=!1},"click"===t?50:250)),this.$nextTick()},closePanel:function(){var e=this,t=this.$refs.btnPanel;return clearTimeout(this.showTime),t?(t.dataset.active="N",setTimeout(function(){"Y"!==t.dataset.active&&(e.visiblePanel=!1,setTimeout(function(){"Y"!==t.dataset.active&&(e.animatVisible=!1)},350))},100)):(this.animatVisible=!1,this.visiblePanel=!1),this.$nextTick()},updatePlacement:function(){var p=this;return this.$nextTick().then(function(){var e,t,n,i,o,r,s,a,l=p.$refs,u=p.transfer,c=p.placement,d=p.panelIndex,f=l.xBtn,l=l.btnPanel;if(l&&f)return e=f.offsetHeight,t=f.offsetWidth,n=l.offsetHeight,l=l.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",u?(u=a+e,"top"===c?(s="top",u=a-n):c||(r<o+e+n+5&&(s="top",u=a-n),u<5&&(s="bottom",u=a+e)),f<(a=i+t-l)+l+5&&(a-=a+l+5-f),a<5&&(a=5),Object.assign(d,{left:"".concat(a,"px"),right:"auto",top:"".concat(u,"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/style/style.css

@@ -45,6 +45,15 @@
           appearance: none;
   transition: border 0.2s ease-in-out;
 }
+.vxe-button.align--left {
+  text-align: left;
+}
+.vxe-button.align--center {
+  text-align: center;
+}
+.vxe-button.align--right {
+  text-align: right;
+}
 .vxe-button:not(.is--disabled) {
   color: #606266;
   cursor: pointer;

package/lib/button/style/style.min.css

@@ -1 +1 @@
-.vxe-button{position:relative;text-align:center;background-color:#fff;outline:0;font-size:14px;max-width:500px;line-height:1.5;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-appearance:none;-moz-appearance:none;appearance:none;transition:border .2s ease-in-out}.vxe-button:not(.is--disabled){color:#606266;cursor:pointer}.vxe-button.is--loading{cursor:progress}.vxe-button.is--loading:before{content:"";position:absolute;left:-1px;top:-1px;right:-1px;bottom:-1px;border-radius:inherit;background-color:hsla(0,0%,100%,.35);pointer-events:none}.vxe-button.is--disabled{color:#bfbfbf}.vxe-button.is--disabled:not(.is--loading){cursor:no-drop}.vxe-button.type--text{text-decoration:none;border:0;padding:.1em .5em;background-color:transparent}.vxe-button.type--text:not(.is--disabled):focus{color:#47494c}.vxe-button.type--text:not(.is--disabled):hover{color:#73b8ff}.vxe-button.type--text:not(.is--disabled):active{color:#0d84ff}.vxe-button.type--text.theme--primary{color:#409eff}.vxe-button.type--text.theme--primary:not(.is--disabled):focus{color:#0d84ff}.vxe-button.type--text.theme--primary:not(.is--disabled):hover{color:#73b8ff}.vxe-button.type--text.theme--primary:not(.is--disabled):active{color:#0d84ff}.vxe-button.type--text.theme--primary.is--disabled{color:#a6d2ff}.vxe-button.type--text.theme--success{color:#67c23a}.vxe-button.type--text.theme--success:not(.is--disabled):focus{color:#529b2e}.vxe-button.type--text.theme--success:not(.is--disabled):hover{color:#85cf60}.vxe-button.type--text.theme--success:not(.is--disabled):active{color:#529b2e}.vxe-button.type--text.theme--success.is--disabled{color:#a3db87}.vxe-button.type--text.theme--info{color:#909399}.vxe-button.type--text.theme--info:not(.is--disabled):focus{color:#767980}.vxe-button.type--text.theme--info:not(.is--disabled):hover{color:#abadb1}.vxe-button.type--text.theme--info:not(.is--disabled):active{color:#767980}.vxe-button.type--text.theme--info.is--disabled{color:#c5c7ca}.vxe-button.type--text.theme--warning{color:#e6a23c}.vxe-button.type--text.theme--warning:not(.is--disabled):focus{color:#d48a1b}.vxe-button.type--text.theme--warning:not(.is--disabled):hover{color:#ecb869}.vxe-button.type--text.theme--warning:not(.is--disabled):active{color:#d48a1b}.vxe-button.type--text.theme--warning.is--disabled{color:#f2cd96}.vxe-button.type--text.theme--danger{color:#f56c6c}.vxe-button.type--text.theme--danger:not(.is--disabled):focus{color:#f23c3c}.vxe-button.type--text.theme--danger:not(.is--disabled):hover{color:#f89c9c}.vxe-button.type--text.theme--danger:not(.is--disabled):active{color:#f23c3c}.vxe-button.type--text.theme--danger.is--disabled{color:#fbcccc}.vxe-button.type--text.theme--perfect{color:#f8f8f9}.vxe-button.type--text.theme--perfect:not(.is--disabled):focus{color:#f8f8f9}.vxe-button.type--text.theme--perfect:not(.is--disabled):hover{color:#f8f8f9}.vxe-button.type--text.theme--perfect:not(.is--disabled):active{color:#f8f8f9}.vxe-button.type--text.theme--perfect.is--disabled{color:#f8f8f9}.vxe-button.type--button{font-family:inherit;height:34px;line-height:1;border:1px solid #dcdfe6}.vxe-button.type--button.is--round{border-radius:17px}.vxe-button.type--button:not(.is--round){border-radius:4px}.vxe-button.type--button.is--circle{padding:0 .5em;min-width:34px;border-radius:50%}.vxe-button.type--button:not(.is--circle){padding:0 1em}.vxe-button.type--button:not(.is--disabled):hover{color:#73b8ff}.vxe-button.type--button:not(.is--disabled):focus{border-color:#409eff}.vxe-button.type--button:not(.is--disabled):active{color:#0d84ff;border-color:#0d84ff;background-color:#fff}.vxe-button.type--button.theme--primary{color:#fff}.vxe-button.type--button.theme--primary:not(.is--disabled){border-color:#409eff;background-color:#409eff}.vxe-button.type--button.theme--primary:not(.is--disabled):hover{color:#fff;background-color:#73b8ff;border-color:#73b8ff}.vxe-button.type--button.theme--primary:not(.is--disabled):active{color:#fff;background-color:#0d84ff;border-color:#0d84ff}.vxe-button.type--button.theme--primary.is--disabled{border-color:#a6d2ff;background-color:#a6d2ff}.vxe-button.type--button.theme--primary.is--loading{border-color:#409eff;background-color:#409eff}.vxe-button.type--button.theme--success{color:#fff}.vxe-button.type--button.theme--success:not(.is--disabled){border-color:#67c23a;background-color:#67c23a}.vxe-button.type--button.theme--success:not(.is--disabled):hover{color:#fff;background-color:#85cf60;border-color:#85cf60}.vxe-button.type--button.theme--success:not(.is--disabled):active{color:#fff;background-color:#529b2e;border-color:#529b2e}.vxe-button.type--button.theme--success.is--disabled{border-color:#a3db87;background-color:#a3db87}.vxe-button.type--button.theme--success.is--loading{border-color:#67c23a;background-color:#67c23a}.vxe-button.type--button.theme--info{color:#fff}.vxe-button.type--button.theme--info:not(.is--disabled){border-color:#909399;background-color:#909399}.vxe-button.type--button.theme--info:not(.is--disabled):hover{color:#fff;background-color:#abadb1;border-color:#abadb1}.vxe-button.type--button.theme--info:not(.is--disabled):active{color:#fff;background-color:#767980;border-color:#767980}.vxe-button.type--button.theme--info.is--disabled{border-color:#c5c7ca;background-color:#c5c7ca}.vxe-button.type--button.theme--info.is--loading{border-color:#909399;background-color:#909399}.vxe-button.type--button.theme--warning{color:#fff}.vxe-button.type--button.theme--warning:not(.is--disabled){border-color:#e6a23c;background-color:#e6a23c}.vxe-button.type--button.theme--warning:not(.is--disabled):hover{color:#fff;background-color:#ecb869;border-color:#ecb869}.vxe-button.type--button.theme--warning:not(.is--disabled):active{color:#fff;background-color:#d48a1b;border-color:#d48a1b}.vxe-button.type--button.theme--warning.is--disabled{border-color:#f2cd96;background-color:#f2cd96}.vxe-button.type--button.theme--warning.is--loading{border-color:#e6a23c;background-color:#e6a23c}.vxe-button.type--button.theme--danger{color:#fff}.vxe-button.type--button.theme--danger:not(.is--disabled){border-color:#f56c6c;background-color:#f56c6c}.vxe-button.type--button.theme--danger:not(.is--disabled):hover{color:#fff;background-color:#f89c9c;border-color:#f89c9c}.vxe-button.type--button.theme--danger:not(.is--disabled):active{color:#fff;background-color:#f23c3c;border-color:#f23c3c}.vxe-button.type--button.theme--danger.is--disabled{border-color:#fbcccc;background-color:#fbcccc}.vxe-button.type--button.theme--danger.is--loading{border-color:#f56c6c;background-color:#f56c6c}.vxe-button.type--button.theme--perfect{color:#606266}.vxe-button.type--button.theme--perfect:not(.is--disabled){border-color:#f8f8f9;background-color:#f8f8f9}.vxe-button.type--button.theme--perfect:not(.is--disabled):hover{color:#606266;background-color:#f8f8f9;border-color:#f8f8f9}.vxe-button.type--button.theme--perfect:not(.is--disabled):active{color:#606266;background-color:#f8f8f9;border-color:#f8f8f9}.vxe-button.type--button.theme--perfect.is--disabled{border-color:#f8f8f9;background-color:#f8f8f9}.vxe-button.type--button.theme--perfect.is--loading{border-color:#f8f8f9;background-color:#f8f8f9}.vxe-button.size--medium{font-size:14px}.vxe-button.size--medium.type--button{height:32px}.vxe-button.size--medium.type--button.is--circle{min-width:32px}.vxe-button.size--medium.type--button.is--round{border-radius:16px}.vxe-button.size--medium .vxe-button--icon,.vxe-button.size--medium .vxe-button--loading-icon{min-width:14px}.vxe-button.size--small{font-size:13px}.vxe-button.size--small.type--button{height:30px}.vxe-button.size--small.type--button.is--circle{min-width:30px}.vxe-button.size--small.type--button.is--round{border-radius:15px}.vxe-button.size--small .vxe-button--icon,.vxe-button.size--small .vxe-button--loading-icon{min-width:13px}.vxe-button.size--mini{font-size:12px}.vxe-button.size--mini.type--button{height:28px}.vxe-button.size--mini.type--button.is--circle{min-width:28px}.vxe-button.size--mini.type--button.is--round{border-radius:14px}.vxe-button.size--mini .vxe-button--icon,.vxe-button.size--mini .vxe-button--loading-icon{min-width:12px}.vxe-button+.vxe-button--dropdown,.vxe-button+.vxe-button-wrapper,.vxe-button+.vxe-button.type--button,.vxe-button-wrapper+.vxe-button--dropdown,.vxe-button-wrapper+.vxe-button-wrapper,.vxe-button-wrapper+.vxe-button.type--button,.vxe-input+.vxe-button--dropdown,.vxe-input+.vxe-button-wrapper,.vxe-input+.vxe-button.type--button{margin-left:12px}.vxe-button--icon,.vxe-button--loading-icon{min-width:14px}.vxe-button--icon+.vxe-button--content,.vxe-button--loading-icon+.vxe-button--content{margin-left:4px}.vxe-button--dropdown,.vxe-button--wrapper{display:inline-block}.vxe-button--dropdown{position:relative;outline:0}.vxe-button--dropdown+.vxe-button--dropdown,.vxe-button--dropdown+.vxe-button-wrapper,.vxe-button--dropdown+.vxe-button.type--button{margin-left:12px}.vxe-button--dropdown>.vxe-button.type--button.theme--primary{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--success{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--info{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--warning{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--danger{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--perfect{color:#606266}.vxe-button--dropdown.is--active>.vxe-button:not(.is--disabled){color:#73b8ff}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--primary{color:#73b8ff}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--success{color:#85cf60}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--info{color:#abadb1}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--warning{color:#ecb869}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--danger{color:#f89c9c}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--perfect{color:#f8f8f9}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--primary{color:#fff;background-color:#73b8ff;border-color:#73b8ff}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--success{color:#fff;background-color:#85cf60;border-color:#85cf60}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--info{color:#fff;background-color:#abadb1;border-color:#abadb1}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--warning{color:#fff;background-color:#ecb869;border-color:#ecb869}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--danger{color:#fff;background-color:#f89c9c;border-color:#f89c9c}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--perfect{color:#606266;background-color:#f8f8f9;border-color:#f8f8f9}.vxe-button--dropdown.is--active .vxe-button--dropdown-arrow{transform:rotate(180deg)}.vxe-button--dropdown-arrow{display:inline-block;font-size:12px;margin-left:4px;transition:transform .2s ease-in-out}.vxe-button--dropdown-panel{display:none;position:absolute;right:0;padding:4px 0}.vxe-button--dropdown-panel.animat--leave{display:block;opacity:0;transform:scaleY(.5);transition:transform .3s cubic-bezier(.23,1,.32,1),opacity .3s cubic-bezier(.23,1,.32,1);transform-origin:center top;backface-visibility:hidden;transform-style:preserve-3d}.vxe-button--dropdown-panel.animat--leave[placement=top]{transform-origin:center bottom}.vxe-button--dropdown-panel.animat--enter{opacity:1;transform:scaleY(1)}.vxe-button--dropdown-wrapper{padding:5px;background-color:#fff;border-radius:4px;border:1px solid #dcdfe6;box-shadow:0 1px 6px rgba(0,0,0,.2)}.vxe-button--dropdown-wrapper>.vxe-button.type--button,.vxe-button--dropdown-wrapper>.vxe-button.type--text{display:block;width:100%;border:0;margin:.4em 0 0 0}.vxe-button--dropdown-wrapper>.vxe-button.type--text{padding:2px 8px}.vxe-button--dropdown-wrapper>.vxe-button:first-child{margin-top:0}.vxe-button--dropdown-wrapper>.vxe-button:last-child{margin-bottom:0}
+.vxe-button{position:relative;text-align:center;background-color:#fff;outline:0;font-size:14px;max-width:500px;line-height:1.5;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-appearance:none;-moz-appearance:none;appearance:none;transition:border .2s ease-in-out}.vxe-button.align--left{text-align:left}.vxe-button.align--center{text-align:center}.vxe-button.align--right{text-align:right}.vxe-button:not(.is--disabled){color:#606266;cursor:pointer}.vxe-button.is--loading{cursor:progress}.vxe-button.is--loading:before{content:"";position:absolute;left:-1px;top:-1px;right:-1px;bottom:-1px;border-radius:inherit;background-color:hsla(0,0%,100%,.35);pointer-events:none}.vxe-button.is--disabled{color:#bfbfbf}.vxe-button.is--disabled:not(.is--loading){cursor:no-drop}.vxe-button.type--text{text-decoration:none;border:0;padding:.1em .5em;background-color:transparent}.vxe-button.type--text:not(.is--disabled):focus{color:#47494c}.vxe-button.type--text:not(.is--disabled):hover{color:#73b8ff}.vxe-button.type--text:not(.is--disabled):active{color:#0d84ff}.vxe-button.type--text.theme--primary{color:#409eff}.vxe-button.type--text.theme--primary:not(.is--disabled):focus{color:#0d84ff}.vxe-button.type--text.theme--primary:not(.is--disabled):hover{color:#73b8ff}.vxe-button.type--text.theme--primary:not(.is--disabled):active{color:#0d84ff}.vxe-button.type--text.theme--primary.is--disabled{color:#a6d2ff}.vxe-button.type--text.theme--success{color:#67c23a}.vxe-button.type--text.theme--success:not(.is--disabled):focus{color:#529b2e}.vxe-button.type--text.theme--success:not(.is--disabled):hover{color:#85cf60}.vxe-button.type--text.theme--success:not(.is--disabled):active{color:#529b2e}.vxe-button.type--text.theme--success.is--disabled{color:#a3db87}.vxe-button.type--text.theme--info{color:#909399}.vxe-button.type--text.theme--info:not(.is--disabled):focus{color:#767980}.vxe-button.type--text.theme--info:not(.is--disabled):hover{color:#abadb1}.vxe-button.type--text.theme--info:not(.is--disabled):active{color:#767980}.vxe-button.type--text.theme--info.is--disabled{color:#c5c7ca}.vxe-button.type--text.theme--warning{color:#e6a23c}.vxe-button.type--text.theme--warning:not(.is--disabled):focus{color:#d48a1b}.vxe-button.type--text.theme--warning:not(.is--disabled):hover{color:#ecb869}.vxe-button.type--text.theme--warning:not(.is--disabled):active{color:#d48a1b}.vxe-button.type--text.theme--warning.is--disabled{color:#f2cd96}.vxe-button.type--text.theme--danger{color:#f56c6c}.vxe-button.type--text.theme--danger:not(.is--disabled):focus{color:#f23c3c}.vxe-button.type--text.theme--danger:not(.is--disabled):hover{color:#f89c9c}.vxe-button.type--text.theme--danger:not(.is--disabled):active{color:#f23c3c}.vxe-button.type--text.theme--danger.is--disabled{color:#fbcccc}.vxe-button.type--text.theme--perfect{color:#f8f8f9}.vxe-button.type--text.theme--perfect:not(.is--disabled):focus{color:#f8f8f9}.vxe-button.type--text.theme--perfect:not(.is--disabled):hover{color:#f8f8f9}.vxe-button.type--text.theme--perfect:not(.is--disabled):active{color:#f8f8f9}.vxe-button.type--text.theme--perfect.is--disabled{color:#f8f8f9}.vxe-button.type--button{font-family:inherit;height:34px;line-height:1;border:1px solid #dcdfe6}.vxe-button.type--button.is--round{border-radius:17px}.vxe-button.type--button:not(.is--round){border-radius:4px}.vxe-button.type--button.is--circle{padding:0 .5em;min-width:34px;border-radius:50%}.vxe-button.type--button:not(.is--circle){padding:0 1em}.vxe-button.type--button:not(.is--disabled):hover{color:#73b8ff}.vxe-button.type--button:not(.is--disabled):focus{border-color:#409eff}.vxe-button.type--button:not(.is--disabled):active{color:#0d84ff;border-color:#0d84ff;background-color:#fff}.vxe-button.type--button.theme--primary{color:#fff}.vxe-button.type--button.theme--primary:not(.is--disabled){border-color:#409eff;background-color:#409eff}.vxe-button.type--button.theme--primary:not(.is--disabled):hover{color:#fff;background-color:#73b8ff;border-color:#73b8ff}.vxe-button.type--button.theme--primary:not(.is--disabled):active{color:#fff;background-color:#0d84ff;border-color:#0d84ff}.vxe-button.type--button.theme--primary.is--disabled{border-color:#a6d2ff;background-color:#a6d2ff}.vxe-button.type--button.theme--primary.is--loading{border-color:#409eff;background-color:#409eff}.vxe-button.type--button.theme--success{color:#fff}.vxe-button.type--button.theme--success:not(.is--disabled){border-color:#67c23a;background-color:#67c23a}.vxe-button.type--button.theme--success:not(.is--disabled):hover{color:#fff;background-color:#85cf60;border-color:#85cf60}.vxe-button.type--button.theme--success:not(.is--disabled):active{color:#fff;background-color:#529b2e;border-color:#529b2e}.vxe-button.type--button.theme--success.is--disabled{border-color:#a3db87;background-color:#a3db87}.vxe-button.type--button.theme--success.is--loading{border-color:#67c23a;background-color:#67c23a}.vxe-button.type--button.theme--info{color:#fff}.vxe-button.type--button.theme--info:not(.is--disabled){border-color:#909399;background-color:#909399}.vxe-button.type--button.theme--info:not(.is--disabled):hover{color:#fff;background-color:#abadb1;border-color:#abadb1}.vxe-button.type--button.theme--info:not(.is--disabled):active{color:#fff;background-color:#767980;border-color:#767980}.vxe-button.type--button.theme--info.is--disabled{border-color:#c5c7ca;background-color:#c5c7ca}.vxe-button.type--button.theme--info.is--loading{border-color:#909399;background-color:#909399}.vxe-button.type--button.theme--warning{color:#fff}.vxe-button.type--button.theme--warning:not(.is--disabled){border-color:#e6a23c;background-color:#e6a23c}.vxe-button.type--button.theme--warning:not(.is--disabled):hover{color:#fff;background-color:#ecb869;border-color:#ecb869}.vxe-button.type--button.theme--warning:not(.is--disabled):active{color:#fff;background-color:#d48a1b;border-color:#d48a1b}.vxe-button.type--button.theme--warning.is--disabled{border-color:#f2cd96;background-color:#f2cd96}.vxe-button.type--button.theme--warning.is--loading{border-color:#e6a23c;background-color:#e6a23c}.vxe-button.type--button.theme--danger{color:#fff}.vxe-button.type--button.theme--danger:not(.is--disabled){border-color:#f56c6c;background-color:#f56c6c}.vxe-button.type--button.theme--danger:not(.is--disabled):hover{color:#fff;background-color:#f89c9c;border-color:#f89c9c}.vxe-button.type--button.theme--danger:not(.is--disabled):active{color:#fff;background-color:#f23c3c;border-color:#f23c3c}.vxe-button.type--button.theme--danger.is--disabled{border-color:#fbcccc;background-color:#fbcccc}.vxe-button.type--button.theme--danger.is--loading{border-color:#f56c6c;background-color:#f56c6c}.vxe-button.type--button.theme--perfect{color:#606266}.vxe-button.type--button.theme--perfect:not(.is--disabled){border-color:#f8f8f9;background-color:#f8f8f9}.vxe-button.type--button.theme--perfect:not(.is--disabled):hover{color:#606266;background-color:#f8f8f9;border-color:#f8f8f9}.vxe-button.type--button.theme--perfect:not(.is--disabled):active{color:#606266;background-color:#f8f8f9;border-color:#f8f8f9}.vxe-button.type--button.theme--perfect.is--disabled{border-color:#f8f8f9;background-color:#f8f8f9}.vxe-button.type--button.theme--perfect.is--loading{border-color:#f8f8f9;background-color:#f8f8f9}.vxe-button.size--medium{font-size:14px}.vxe-button.size--medium.type--button{height:32px}.vxe-button.size--medium.type--button.is--circle{min-width:32px}.vxe-button.size--medium.type--button.is--round{border-radius:16px}.vxe-button.size--medium .vxe-button--icon,.vxe-button.size--medium .vxe-button--loading-icon{min-width:14px}.vxe-button.size--small{font-size:13px}.vxe-button.size--small.type--button{height:30px}.vxe-button.size--small.type--button.is--circle{min-width:30px}.vxe-button.size--small.type--button.is--round{border-radius:15px}.vxe-button.size--small .vxe-button--icon,.vxe-button.size--small .vxe-button--loading-icon{min-width:13px}.vxe-button.size--mini{font-size:12px}.vxe-button.size--mini.type--button{height:28px}.vxe-button.size--mini.type--button.is--circle{min-width:28px}.vxe-button.size--mini.type--button.is--round{border-radius:14px}.vxe-button.size--mini .vxe-button--icon,.vxe-button.size--mini .vxe-button--loading-icon{min-width:12px}.vxe-button+.vxe-button--dropdown,.vxe-button+.vxe-button-wrapper,.vxe-button+.vxe-button.type--button,.vxe-button-wrapper+.vxe-button--dropdown,.vxe-button-wrapper+.vxe-button-wrapper,.vxe-button-wrapper+.vxe-button.type--button,.vxe-input+.vxe-button--dropdown,.vxe-input+.vxe-button-wrapper,.vxe-input+.vxe-button.type--button{margin-left:12px}.vxe-button--icon,.vxe-button--loading-icon{min-width:14px}.vxe-button--icon+.vxe-button--content,.vxe-button--loading-icon+.vxe-button--content{margin-left:4px}.vxe-button--dropdown,.vxe-button--wrapper{display:inline-block}.vxe-button--dropdown{position:relative;outline:0}.vxe-button--dropdown+.vxe-button--dropdown,.vxe-button--dropdown+.vxe-button-wrapper,.vxe-button--dropdown+.vxe-button.type--button{margin-left:12px}.vxe-button--dropdown>.vxe-button.type--button.theme--primary{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--success{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--info{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--warning{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--danger{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--perfect{color:#606266}.vxe-button--dropdown.is--active>.vxe-button:not(.is--disabled){color:#73b8ff}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--primary{color:#73b8ff}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--success{color:#85cf60}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--info{color:#abadb1}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--warning{color:#ecb869}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--danger{color:#f89c9c}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--perfect{color:#f8f8f9}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--primary{color:#fff;background-color:#73b8ff;border-color:#73b8ff}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--success{color:#fff;background-color:#85cf60;border-color:#85cf60}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--info{color:#fff;background-color:#abadb1;border-color:#abadb1}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--warning{color:#fff;background-color:#ecb869;border-color:#ecb869}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--danger{color:#fff;background-color:#f89c9c;border-color:#f89c9c}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--perfect{color:#606266;background-color:#f8f8f9;border-color:#f8f8f9}.vxe-button--dropdown.is--active .vxe-button--dropdown-arrow{transform:rotate(180deg)}.vxe-button--dropdown-arrow{display:inline-block;font-size:12px;margin-left:4px;transition:transform .2s ease-in-out}.vxe-button--dropdown-panel{display:none;position:absolute;right:0;padding:4px 0}.vxe-button--dropdown-panel.animat--leave{display:block;opacity:0;transform:scaleY(.5);transition:transform .3s cubic-bezier(.23,1,.32,1),opacity .3s cubic-bezier(.23,1,.32,1);transform-origin:center top;backface-visibility:hidden;transform-style:preserve-3d}.vxe-button--dropdown-panel.animat--leave[placement=top]{transform-origin:center bottom}.vxe-button--dropdown-panel.animat--enter{opacity:1;transform:scaleY(1)}.vxe-button--dropdown-wrapper{padding:5px;background-color:#fff;border-radius:4px;border:1px solid #dcdfe6;box-shadow:0 1px 6px rgba(0,0,0,.2)}.vxe-button--dropdown-wrapper>.vxe-button.type--button,.vxe-button--dropdown-wrapper>.vxe-button.type--text{display:block;width:100%;border:0;margin:.4em 0 0 0}.vxe-button--dropdown-wrapper>.vxe-button.type--text{padding:2px 8px}.vxe-button--dropdown-wrapper>.vxe-button:first-child{margin-top:0}.vxe-button--dropdown-wrapper>.vxe-button:last-child{margin-bottom:0}

package/lib/custom/src/mixin.js

@@ -56,7 +56,7 @@ var _default = exports.default = {
       // 判断面板不能大于表格高度
       var tableHeight = 0;
       if ($el) {
-        tableHeight = $el.clientHeight - 30;
+        tableHeight = $el.clientHeight - 28;
       }
       customStore.maxHeight = Math.max(4, tableHeight);
     },

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}var _default=exports.default={methods:{_openCustom:function(){var t=this,e=this.initStore,i=this.customStore,s=this.collectColumn,o={},n={},r={};return _xeUtils.default.eachTree(s,function(t){var e=t.getKey();t.renderFixed=t.fixed,t.renderVisible=t.visible,t.renderResizeWidth=t.renderWidth,o[e]=t.renderSortNumber,n[e]=t.fixed,r[e]=t.visible},{children:"children"}),i.oldSortMaps=o,i.oldFixedMaps=n,i.oldVisibleMaps=r,this.customColumnList=s.slice(0),i.visible=!0,e.custom=!0,this.checkCustomStatus(),this.calcMaxHeight(),this.$nextTick().then(function(){return t.calcMaxHeight()})},_closeCustom:function(){var t=this.customStore,e=this.customOpts;return t.visible&&(t.visible=!1,e.immediate||this.handleCustom()),this.$nextTick()},calcMaxHeight:function(){var t=this.$el,e=this.customStore,i=0;t&&(i=t.clientHeight-30),e.maxHeight=Math.max(4,i)},checkCustomStatus:function(){var t=this.customStore,e=this.collectColumn,i=this.customOpts.checkMethod;t.isAll=e.every(function(t){return!!i&&!i({column:t})||t.renderVisible}),t.isIndeterminate=!t.isAll&&e.some(function(t){return(!i||i({column:t}))&&(t.renderVisible||t.halfVisible)})},emitCustomEvent:function(t,e){(this.$xegrid||this).$emit("custom",{type:t,$table:this,$grid:this.$xegrid,$event:e})},triggerCustomEvent:function(t){var e=this.customStore;e.visible?(this.closeCustom(),this.emitCustomEvent("close",t)):(e.btnEl=t.target,this.openCustom(),this.emitCustomEvent("open",t))},customOpenEvent:function(t){var e=this.customStore;e.visible||(e.activeBtn=!0,e.btnEl=t.target,this.openCustom(),this.emitCustomEvent("open",t))},customColseEvent:function(t){var e=this.customStore;e.visible&&(e.activeBtn=!1,this.closeCustom(),this.emitCustomEvent("close",t))}}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}var _default=exports.default={methods:{_openCustom:function(){var t=this,e=this.initStore,i=this.customStore,s=this.collectColumn,o={},n={},r={};return _xeUtils.default.eachTree(s,function(t){var e=t.getKey();t.renderFixed=t.fixed,t.renderVisible=t.visible,t.renderResizeWidth=t.renderWidth,o[e]=t.renderSortNumber,n[e]=t.fixed,r[e]=t.visible},{children:"children"}),i.oldSortMaps=o,i.oldFixedMaps=n,i.oldVisibleMaps=r,this.customColumnList=s.slice(0),i.visible=!0,e.custom=!0,this.checkCustomStatus(),this.calcMaxHeight(),this.$nextTick().then(function(){return t.calcMaxHeight()})},_closeCustom:function(){var t=this.customStore,e=this.customOpts;return t.visible&&(t.visible=!1,e.immediate||this.handleCustom()),this.$nextTick()},calcMaxHeight:function(){var t=this.$el,e=this.customStore,i=0;t&&(i=t.clientHeight-28),e.maxHeight=Math.max(4,i)},checkCustomStatus:function(){var t=this.customStore,e=this.collectColumn,i=this.customOpts.checkMethod;t.isAll=e.every(function(t){return!!i&&!i({column:t})||t.renderVisible}),t.isIndeterminate=!t.isAll&&e.some(function(t){return(!i||i({column:t}))&&(t.renderVisible||t.halfVisible)})},emitCustomEvent:function(t,e){(this.$xegrid||this).$emit("custom",{type:t,$table:this,$grid:this.$xegrid,$event:e})},triggerCustomEvent:function(t){var e=this.customStore;e.visible?(this.closeCustom(),this.emitCustomEvent("close",t)):(e.btnEl=t.target,this.openCustom(),this.emitCustomEvent("open",t))},customOpenEvent:function(t){var e=this.customStore;e.visible||(e.activeBtn=!0,e.btnEl=t.target,this.openCustom(),this.emitCustomEvent("open",t))},customColseEvent:function(t){var e=this.customStore;e.visible&&(e.activeBtn=!1,this.closeCustom(),this.emitCustomEvent("close",t))}}};

package/lib/custom/src/panel.js

@@ -9,6 +9,7 @@ var _utils = _interopRequireDefault(require("../../tools/utils"));
 var _dom = _interopRequireDefault(require("../../tools/dom"));
 var _conf = _interopRequireDefault(require("../../v-x-e-table/src/conf"));
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
+var _button = _interopRequireDefault(require("../../button/src/button"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var formatText = _utils.default.formatText;
 var addClass = _dom.default.addClass,
@@ -31,7 +32,8 @@ function updateDropHint(_vm, evnt) {
 var renderSimplePanel = function renderSimplePanel(h, _vm) {
   var _e = _vm._e,
     $xetable = _vm.$xetable,
-    customStore = _vm.customStore;
+    customStore = _vm.customStore,
+    dragColumn = _vm.dragColumn;
   var customColumnList = $xetable.customColumnList,
     customOpts = $xetable.customOpts,
     isMaxFixedColumn = $xetable.isMaxFixedColumn;
@@ -62,12 +64,14 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
       var isDisabled = checkMethod ? !checkMethod({
         column: column
       }) : false;
+      var isHidden = !isChecked;
       colVNs.push(h('li', {
         key: column.id,
         attrs: {
           colid: column.id
         },
         class: ['vxe-table-custom--option', "level--".concat(column.level), {
+          'is--hidden': isHidden,
           'is--group': isColGroup
         }],
         on: {
@@ -96,29 +100,38 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
       })]) : _e(), allowSort && column.level === 1 ? h('div', {
         class: 'vxe-table-custom--sort-option'
       }, [h('span', {
-        class: 'vxe-table-custom--sort-btn',
+        class: ['vxe-table-custom--sort-btn', {
+          'is--disabled': isHidden
+        }],
         attrs: {
           title: _conf.default.i18n('vxe.custom.setting.sortHelpTip')
         },
-        on: {
+        on: isHidden ? {} : {
           mousedown: _vm.sortMousedownEvent,
           mouseup: _vm.sortMouseupEvent
         }
       }, [h('i', {
         class: _conf.default.icon.TABLE_CUSTOM_SORT
-      })])]) : _e(), h('div', {
+      })])]) : _e(), column.type === 'html' ? h('div', {
+        key: '1',
+        class: 'vxe-table-custom--checkbox-label',
+        domProps: {
+          innerHTML: colTitle
+        }
+      }) : h('div', {
+        key: '0',
         class: 'vxe-table-custom--checkbox-label',
         attrs: {
           title: colTitle
         }
       }, colTitle), !parent && allowFixed ? h('div', {
         class: 'vxe-table-custom--fixed-option'
-      }, [h('span', {
-        class: ['vxe-table-custom--fixed-left-option', column.renderFixed === 'left' ? _conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : _conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT, {
-          'is--checked': column.renderFixed === 'left',
-          'is--disabled': isMaxFixedColumn && !column.renderFixed
-        }],
-        attrs: {
+      }, [h(_button.default, {
+        props: {
+          mode: 'text',
+          icon: column.renderFixed === 'left' ? _conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : _conf.default.icon.TOOLBAR_TOOLS_FIXED_LEFT,
+          status: column.renderFixed === 'left' ? 'primary' : '',
+          disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
           title: _conf.default.i18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
         },
         on: {
@@ -126,12 +139,12 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
             _vm.changeFixedOption(column, 'left');
           }
         }
-      }), h('span', {
-        class: ['vxe-table-custom--fixed-right-option', column.renderFixed === 'right' ? _conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : _conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT, {
-          'is--checked': column.renderFixed === 'right',
-          'is--disabled': isMaxFixedColumn && !column.renderFixed
-        }],
-        attrs: {
+      }), h(_button.default, {
+        props: {
+          mode: 'text',
+          icon: column.renderFixed === 'right' ? _conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : _conf.default.icon.TOOLBAR_TOOLS_FIXED_RIGHT,
+          status: column.renderFixed === 'right' ? 'primary' : '',
+          disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
           title: _conf.default.i18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
         },
         on: {
@@ -165,7 +178,7 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
       title: _conf.default.i18n('vxe.table.allTitle')
     },
     on: {
-      click: _vm.allCustomEvent
+      click: _vm.allOptionEvent
     }
   }, [h('span', {
     class: ['vxe-checkbox--icon', isAllIndeterminate ? _conf.default.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? _conf.default.icon.TABLE_CHECKBOX_CHECKED : _conf.default.icon.TABLE_CHECKBOX_UNCHECKED]
@@ -186,24 +199,42 @@ var renderSimplePanel = function renderSimplePanel(h, _vm) {
   }, colVNs), h('div', {
     ref: 'dragHintElemRef',
     class: 'vxe-table-custom-popup--drag-hint'
-  }, _conf.default.i18n('vxe.custom.cstmDragTarget', [_vm.dragColumn ? _vm.dragColumn.getTitle() : '']))]), customOpts.showFooter ? h('div', {
+  }, _conf.default.i18n('vxe.custom.cstmDragTarget', [dragColumn && dragColumn.type !== 'html' ? dragColumn.getTitle() : '']))]), customOpts.showFooter ? h('div', {
     class: 'vxe-table-custom--footer'
-  }, [h('button', {
-    class: 'btn--reset',
+  }, [h(_button.default, {
+    props: {
+      mode: 'text',
+      content: customOpts.resetButtonText || _conf.default.i18n('vxe.table.customRestore')
+    },
     on: {
       click: _vm.resetCustomEvent
     }
-  }, customOpts.resetButtonText || _conf.default.i18n('vxe.table.customRestore')), customOpts.immediate ? _e() : h('button', {
-    class: 'btn--cancel',
+  }), customOpts.immediate ? h(_button.default, {
+    props: {
+      mode: 'text',
+      content: customOpts.closeButtonText || _conf.default.i18n('vxe.table.customClose')
+    },
+    on: {
+      click: _vm.cancelCloseEvent
+    }
+  }) : h(_button.default, {
+    props: {
+      mode: 'text',
+      content: customOpts.resetButtonText || _conf.default.i18n('vxe.table.customCancel')
+    },
     on: {
       click: _vm.cancelCustomEvent
     }
-  }, customOpts.resetButtonText || _conf.default.i18n('vxe.table.customCancel')), h('button', {
-    class: 'btn--confirm',
+  }), customOpts.immediate ? _e() : h(_button.default, {
+    props: {
+      mode: 'text',
+      status: 'primary',
+      content: customOpts.confirmButtonText || _conf.default.i18n('vxe.table.customConfirm')
+    },
     on: {
       click: _vm.confirmCustomEvent
     }
-  }, customOpts.confirmButtonText || _conf.default.i18n('vxe.table.customConfirm'))]) : null] : []);
+  })]) : null] : []);
 };
 var renderPopupPanel = function renderPopupPanel(h, _vm) {
   var _e = _vm._e,
@@ -235,6 +266,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
       var isDisabled = checkMethod ? !checkMethod({
         column: column
       }) : false;
+      var isHidden = !isChecked;
       trVNs.push(h('tr', {
         key: column.id,
         attrs: {
@@ -271,11 +303,13 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
       })])]) : _e(), allowSort ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--sort'
       }, [column.level === 1 ? h('span', {
-        class: 'vxe-table-custom-popup--column-sort-btn',
+        class: ['vxe-table-custom-popup--column-sort-btn', {
+          'is--disabled': isHidden
+        }],
         attrs: {
           title: _conf.default.i18n('vxe.custom.setting.sortHelpTip')
         },
-        on: {
+        on: isHidden ? {} : {
           mousedown: _vm.sortMousedownEvent,
           mouseup: _vm.sortMouseupEvent
         }
@@ -283,16 +317,24 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
         class: _conf.default.icon.TABLE_CUSTOM_SORT
       })]) : h('span', '-')]) : _e(), h('td', {
         class: 'vxe-table-custom-popup--column-item col--name'
-      }, [h('div', {
+      }, [column.type === 'html' ? h('div', {
+        key: '1',
+        class: 'vxe-table-custom-popup--name',
+        domProps: {
+          innerHTML: colTitle
+        }
+      }) : h('div', {
+        key: '0',
         class: 'vxe-table-custom-popup--name',
         attrs: {
           title: colTitle
         }
       }, colTitle)]), allowResizable ? h('td', {
         class: 'vxe-table-custom-popup--column-item col--resizable'
-      }, [!isChecked || column.children && column.children.length ? h('span', '-') : h('vxe-input', {
+      }, [column.children && column.children.length ? h('span', '-') : h('vxe-input', {
         props: {
           type: 'integer',
+          disabled: isHidden,
           value: column.renderResizeWidth
         },
         on: {
@@ -307,25 +349,25 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
           value: column.renderFixed || '',
           type: 'button',
           size: 'mini',
+          disabled: isHidden,
           options: [{
             label: _conf.default.i18n('vxe.custom.setting.fixedLeft'),
             value: 'left',
-            disabled: isMaxFixedColumn
+            disabled: isHidden || isMaxFixedColumn
           }, {
             label: _conf.default.i18n('vxe.custom.setting.fixedUnset'),
-            value: ''
+            value: '',
+            disabled: isHidden
           }, {
             label: _conf.default.i18n('vxe.custom.setting.fixedRight'),
             value: 'right',
-            disabled: isMaxFixedColumn
+            disabled: isHidden || isMaxFixedColumn
           }]
         },
         on: {
           input: function input(value) {
             column.renderFixed = value;
-          } // onChange () {
-          //   changePopupFixedOption(column)
-          // }
+          }
         }
       })]) : _e()]));
     }
@@ -391,7 +433,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
             title: _conf.default.i18n('vxe.table.allTitle')
           },
           on: {
-            click: _vm.allCustomEvent
+            click: _vm.allOptionEvent
           }
         }, [h('span', {
           class: ['vxe-checkbox--icon', isAllIndeterminate ? _conf.default.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? _conf.default.icon.TABLE_CHECKBOX_CHECKED : _conf.default.icon.TABLE_CHECKBOX_UNCHECKED]
@@ -426,21 +468,21 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
       footer: function footer() {
         return h('div', {
           class: 'vxe-table-custom-popup--footer'
-        }, [h('vxe-button', {
+        }, [h(_button.default, {
           props: {
             content: customOpts.resetButtonText || _conf.default.i18n('vxe.custom.cstmRestore')
           },
           on: {
             click: _vm.resetCustomEvent
           }
-        }), h('vxe-button', {
+        }), h(_button.default, {
           props: {
             content: customOpts.resetButtonText || _conf.default.i18n('vxe.custom.cstmCancel')
           },
           on: {
             click: _vm.cancelCustomEvent
           }
-        }), h('vxe-button', {
+        }), h(_button.default, {
           props: {
             status: 'primary',
             content: customOpts.confirmButtonText || _conf.default.i18n('vxe.custom.cstmConfirm')
@@ -511,7 +553,10 @@ var _default2 = exports.default = {
         allowFixed = customOpts.allowFixed,
         allowResizable = customOpts.allowResizable;
       _xeUtils.default.eachTree(customColumnList, function (column, index, items, path, parent) {
-        if (!parent) {
+        if (parent) {
+          // 更新子列信息
+          column.fixed = parent.fixed;
+        } else {
           if (allowSort) {
             var sortIndex = index + 1;
             column.renderSortNumber = sortIndex;
@@ -536,6 +581,12 @@ var _default2 = exports.default = {
       $xetable.emitCustomEvent('confirm', evnt);
       $xetable.saveCustomStore('confirm');
     },
+    cancelCloseEvent: function cancelCloseEvent(_ref) {
+      var $event = _ref.$event;
+      var $xetable = this.$xetable;
+      $xetable.closeCustom();
+      $xetable.emitCustomEvent('cancel', $event);
+    },
     cancelCustomEvent: function cancelCustomEvent(evnt) {
       var $xetable = this.$xetable;
       var customStore = $xetable.customStore,
@@ -633,53 +684,88 @@ var _default2 = exports.default = {
       var $xetable = this.$xetable;
       var customOpts = $xetable.customOpts;
       var isChecked = !column.renderVisible;
-      _xeUtils.default.eachTree([column], function (item) {
-        item.renderVisible = isChecked;
-        item.halfVisible = false;
-      });
-      this.handleOptionCheck(column);
       if (customOpts.immediate) {
+        _xeUtils.default.eachTree([column], function (item) {
+          item.visible = isChecked;
+          item.renderVisible = isChecked;
+          item.halfVisible = false;
+        });
         $xetable.handleCustom();
         $xetable.saveCustomStore('update:visible');
+      } else {
+        _xeUtils.default.eachTree([column], function (item) {
+          item.renderVisible = isChecked;
+          item.halfVisible = false;
+        });
       }
+      this.handleOptionCheck(column);
       $xetable.checkCustomStatus();
     },
     changeFixedOption: function changeFixedOption(column, colFixed) {
       var $xetable = this.$xetable;
-      var isMaxFixedColumn = $xetable.isMaxFixedColumn;
-      if (column.renderFixed === colFixed) {
-        column.renderFixed = '';
-        // $xeTable.clearColumnFixed(column)
+      var isMaxFixedColumn = $xetable.isMaxFixedColumn,
+        customOpts = $xetable.customOpts;
+      if (customOpts.immediate) {
+        if (column.renderFixed === colFixed) {
+          _xeUtils.default.eachTree([column], function (col) {
+            col.fixed = '';
+            col.renderFixed = '';
+          });
+        } else {
+          if (!isMaxFixedColumn || column.renderFixed) {
+            _xeUtils.default.eachTree([column], function (col) {
+              col.fixed = colFixed;
+              col.renderFixed = colFixed;
+            });
+          }
+        }
+        $xetable.handleCustom();
+        $xetable.saveCustomStore('update:fixed');
       } else {
-        if (!isMaxFixedColumn || column.renderFixed) {
-          column.renderFixed = colFixed;
-          // $xeTable.setColumnFixed(column, colFixed)
+        if (column.renderFixed === colFixed) {
+          _xeUtils.default.eachTree([column], function (col) {
+            col.renderFixed = '';
+          });
+        } else {
+          if (!isMaxFixedColumn || column.renderFixed) {
+            _xeUtils.default.eachTree([column], function (col) {
+              col.renderFixed = colFixed;
+            });
+          }
         }
       }
     },
-    // changePopupFixedOption  (column) {
-    //   const { $xetable } = this
-    //   const { isMaxFixedColumn } = $xetable
-    //   if (!isMaxFixedColumn) {
-    //     $xetable.setColumnFixed(column, column.fixed)
-    //   }
-    // },
-    allCustomEvent: function allCustomEvent() {
+    allOptionEvent: function allOptionEvent() {
       var $xetable = this.$xetable,
         customStore = this.customStore;
-      var customOpts = $xetable.customOpts,
-        customColumnList = $xetable.customColumnList;
+      var customColumnList = $xetable.customColumnList,
+        customOpts = $xetable.customOpts;
       var checkMethod = customOpts.checkMethod;
       var isAll = !customStore.isAll;
-      _xeUtils.default.eachTree(customColumnList, function (column) {
-        if (!checkMethod || checkMethod({
-          column: column
-        })) {
-          column.renderVisible = isAll;
-          column.halfVisible = false;
-        }
-      });
-      customStore.isAll = isAll;
+      if (customOpts.immediate) {
+        _xeUtils.default.eachTree(customColumnList, function (column) {
+          if (!checkMethod || checkMethod({
+            column: column
+          })) {
+            column.visible = isAll;
+            column.renderVisible = isAll;
+            column.halfVisible = false;
+          }
+        });
+        customStore.isAll = isAll;
+        $xetable.handleCustom();
+        $xetable.saveCustomStore('update:visible');
+      } else {
+        _xeUtils.default.eachTree(customColumnList, function (column) {
+          if (!checkMethod || checkMethod({
+            column: column
+          })) {
+            column.renderVisible = isAll;
+            column.halfVisible = false;
+          }
+        });
+        customStore.isAll = isAll;
+      }
       $xetable.checkCustomStatus();
     },
     sortMousedownEvent: function sortMousedownEvent(evnt) {
@@ -714,7 +800,8 @@ var _default2 = exports.default = {
     sortDragendEvent: function sortDragendEvent(evnt) {
       var $xetable = this.$xetable,
         prevDropTrEl = this.prevDropTrEl;
-      var customColumnList = $xetable.customColumnList;
+      var customColumnList = $xetable.customColumnList,
+        customOpts = $xetable.customOpts;
       var trEl = evnt.currentTarget;
       var dragHintEl = this.$refs.dragHintElemRef;
       if (prevDropTrEl) {
@@ -754,6 +841,16 @@ var _default2 = exports.default = {
       }
       removeClass(trEl, 'active--drag-target');
       removeClass(trEl, 'active--drag-origin');
+      if (customOpts.immediate) {
+        _xeUtils.default.eachTree(customColumnList, function (column, index, items, path, parent) {
+          if (!parent) {
+            var sortIndex = index + 1;
+            column.renderSortNumber = sortIndex;
+          }
+        });
+        $xetable.handleCustom();
+        $xetable.saveCustomStore('update:sort');
+      }
     },
     sortDragoverEvent: function sortDragoverEvent(evnt) {
       var $xetable = this.$xetable,