vxe-table 3.6.1 → 3.6.5

package/lib/toolbar/src/toolbar.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")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_size=_interopRequireDefault(require("../../mixins/size")),_utils=_interopRequireDefault(require("../../tools/utils")),_dom=_interopRequireDefault(require("../../tools/dom")),_event=require("../../tools/event"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,o){return t in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o,e}var renderDropdowns=function(e,o,t,n){var i=o._e,t=t.dropdowns;return t?t.map(function(t){return!1===t.visible?i():e("vxe-button",{on:{click:function(e){return n?o.btnEvent(e,t):o.tolEvent(e,t)}},props:{disabled:t.disabled,loading:t.loading,type:t.type,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name}})}):[]};function renderBtns(i,s){var r=s._e,e=s.$scopedSlots,l=s.$xegrid,c=s.$xetable,t=s.buttons,t=void 0===t?[]:t,e=e.buttons;return e?e.call(s,{$grid:l,$table:c},i):t.map(function(t){var e=t.dropdowns,o=t.buttonRender,n=o?_vXETable.default.renderer.get(o.name):null;if(!1===t.visible)return r();if(n){n=n.renderToolbarButton||n.renderButton;if(n)return i("span",{class:"vxe-button--item"},n.call(s,i,o,{$grid:l,$table:c,button:t}))}return i("vxe-button",{on:{click:function(e){return s.btnEvent(e,t)}},props:{disabled:t.disabled,loading:t.loading,type:t.type,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,destroyOnClose:t.destroyOnClose,placement:t.placement,transfer:t.transfer},scopedSlots:e&&e.length?{dropdowns:function(){return renderDropdowns(i,s,t,!0)}}:null})})}function renderRightTools(i,s){var r=s._e,e=s.$scopedSlots,l=s.$xegrid,c=s.$xetable,t=s.tools,t=void 0===t?[]:t,e=e.tools;return e?e.call(s,{$grid:l,$table:c},i):t.map(function(t){var e=t.dropdowns,o=t.toolRender,n=o?_vXETable.default.renderer.get(o.name):null;if(!1===t.visible)return r();if(n){n=n.renderToolbarTool;if(n)return i("span",{class:"vxe-tool--item"},n.call(s,i,o,{$grid:l,$table:c,tool:t}))}return i("vxe-button",{on:{click:function(e){return s.tolEvent(e,t)}},props:{disabled:t.disabled,loading:t.loading,type:t.type,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,destroyOnClose:t.destroyOnClose,placement:t.placement,transfer:t.transfer},scopedSlots:e&&e.length?{dropdowns:function(){return renderDropdowns(i,s,t,!1)}}:null})})}function renderCustoms(r,l){var e=l.$xetable,t=l.customStore,o=l.customOpts,n=l.columns,c=[],i={},s={},u=e?e.customOpts.checkMethod:null;"manual"===o.trigger||("hover"===o.trigger?(i.mouseenter=l.handleMouseenterSettingEvent,i.mouseleave=l.handleMouseleaveSettingEvent,s.mouseenter=l.handleWrapperMouseenterEvent,s.mouseleave=l.handleWrapperMouseleaveEvent):i.click=l.handleClickSettingEvent),_xeUtils.default.eachTree(n,function(e){var t,o=_utils.default.formatText(e.getTitle(),1),n=e.getKey(),i=e.children&&e.children.length,s=!!u&&!u({column:e});(i||n)&&(t=e.visible,n=e.halfVisible,c.push(r("li",{class:["vxe-custom--option","level--".concat(e.level),{"is--group":i,"is--checked":t,"is--indeterminate":n,"is--disabled":s}],attrs:{title:o},on:{click:function(){s||l.changeCustomOption(e)}}},[r("span",{class:["vxe-checkbox--icon",n?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:t?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]}),r("span",{class:"vxe-checkbox--label"},o)])))});e=t.isAll,n=t.isIndeterminate;return r("div",{class:["vxe-custom--wrapper",{"is--active":t.visible}],ref:"customWrapper"},[r("vxe-button",{props:{circle:!0,icon:o.icon||_conf.default.icon.TOOLBAR_TOOLS_CUSTOM},attrs:{title:_conf.default.i18n("vxe.toolbar.custom")},on:i}),r("div",{class:"vxe-custom--option-wrapper"},[r("ul",{class:"vxe-custom--header"},[r("li",{class:["vxe-custom--option",{"is--checked":e,"is--indeterminate":n}],attrs:{title:_conf.default.i18n("vxe.table.allTitle")},on:{click:l.allCustomEvent}},[r("span",{class:["vxe-checkbox--icon",n?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:e?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]}),r("span",{class:"vxe-checkbox--label"},_conf.default.i18n("vxe.toolbar.customAll"))])]),r("ul",{class:"vxe-custom--body",on:s},c),!1===o.isFooter?null:r("div",{class:"vxe-custom--footer"},[r("button",{class:"btn--confirm",on:{click:l.confirmCustomEvent}},_conf.default.i18n("vxe.toolbar.customConfirm")),r("button",{class:"btn--reset",on:{click:l.resetCustomEvent}},_conf.default.i18n("vxe.toolbar.customRestore"))])])])}var _default2={name:"VxeToolbar",mixins:[_size.default],props:{loading:Boolean,refresh:[Boolean,Object],import:[Boolean,Object],export:[Boolean,Object],print:[Boolean,Object],zoom:[Boolean,Object],custom:[Boolean,Object],buttons:{type:Array,default:function(){return _conf.default.toolbar.buttons}},tools:{type:Array,default:function(){return _conf.default.toolbar.tools}},perfect:{type:Boolean,default:function(){return _conf.default.toolbar.perfect}},size:{type:String,default:function(){return _conf.default.toolbar.size||_conf.default.size}},className:[String,Function]},inject:{$xegrid:{default:null}},data:function(){return{$xetable:null,isRefresh:!1,columns:[],customStore:{isAll:!1,isIndeterminate:!1,visible:!1}}},computed:{refreshOpts:function(){return Object.assign({},_conf.default.toolbar.refresh,this.refresh)},importOpts:function(){return Object.assign({},_conf.default.toolbar.import,this.import)},exportOpts:function(){return Object.assign({},_conf.default.toolbar.export,this.export)},printOpts:function(){return Object.assign({},_conf.default.toolbar.print,this.print)},zoomOpts:function(){return Object.assign({},_conf.default.toolbar.zoom,this.zoom)},customOpts:function(){return Object.assign({},_conf.default.toolbar.custom,this.custom)}},created:function(){var o=this,n=this.refresh,i=this.refreshOpts;this.$nextTick(function(){var e=o.fintTable(),t=i.queryMethod||i.query;!n||o.$xegrid||t||(0,_log.warnLog)("vxe.error.notFunc",["queryMethod"]),e&&e.connect(o),"development"===process.env.NODE_ENV&&o.buttons&&o.buttons.forEach(function(e){e=e.buttonRender,e=e?_vXETable.default.renderer.get(e.name):null;e&&e.renderButton&&(0,_log.warnLog)("vxe.error.delFunc",["renderButton","renderToolbarButton"])})}),_event.GlobalEvent.on(this,"mousedown",this.handleGlobalMousedownEvent),_event.GlobalEvent.on(this,"blur",this.handleGlobalBlurEvent)},destroyed:function(){_event.GlobalEvent.off(this,"mousedown"),_event.GlobalEvent.off(this,"blur")},render:function(e){var t=this._e,o=this.$xegrid,n=this.perfect,i=this.loading,s=this.importOpts,r=this.exportOpts,l=this.refresh,c=this.refreshOpts,u=this.zoom,a=this.zoomOpts,f=this.custom,d=this.vSize,h=this.className;return e("div",{class:["vxe-toolbar",h?_xeUtils.default.isFunction(h)?h({$toolbar:this}):h:"",(_defineProperty(h={},"size--".concat(d),d),_defineProperty(h,"is--perfect",n),_defineProperty(h,"is--loading",i),h)]},[e("div",{class:"vxe-buttons--wrapper"},renderBtns(e,this)),e("div",{class:"vxe-tools--wrapper"},renderRightTools(e,this)),e("div",{class:"vxe-tools--operate"},[this.import?e("vxe-button",{props:{circle:!0,icon:s.icon||_conf.default.icon.TOOLBAR_TOOLS_IMPORT},attrs:{title:_conf.default.i18n("vxe.toolbar.import")},on:{click:this.importEvent}}):t(),this.export?e("vxe-button",{props:{circle:!0,icon:r.icon||_conf.default.icon.TOOLBAR_TOOLS_EXPORT},attrs:{title:_conf.default.i18n("vxe.toolbar.export")},on:{click:this.exportEvent}}):t(),this.print?e("vxe-button",{props:{circle:!0,icon:this.printOpts.icon||_conf.default.icon.TOOLBAR_TOOLS_PRINT},attrs:{title:_conf.default.i18n("vxe.toolbar.print")},on:{click:this.printEvent}}):t(),l?e("vxe-button",{props:{circle:!0,icon:this.isRefresh?c.iconLoading||_conf.default.icon.TOOLBAR_TOOLS_REFRESH_LOADING:c.icon||_conf.default.icon.TOOLBAR_TOOLS_REFRESH},attrs:{title:_conf.default.i18n("vxe.toolbar.refresh")},on:{click:this.refreshEvent}}):t(),u&&o?e("vxe-button",{props:{circle:!0,icon:o.isMaximized()?a.iconOut||_conf.default.icon.TOOLBAR_TOOLS_MINIMIZE:a.iconIn||_conf.default.icon.TOOLBAR_TOOLS_FULLSCREEN},attrs:{title:_conf.default.i18n("vxe.toolbar.zoom".concat(o.isMaximized()?"Out":"In"))},on:{click:o.triggerZoomEvent}}):t(),f?renderCustoms(e,this):t()])])},methods:{syncUpdate:function(e){var t=e.collectColumn,e=e.$table;this.$xetable=e,this.columns=t},fintTable:function(){var e=this.$parent.$children,o=e.indexOf(this);return _xeUtils.default.find(e,function(e,t){return e&&e.loadData&&o<t&&"vxe-table"===e.$vnode.componentOptions.tag})},checkTable:function(){if(this.$xetable)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},showCustom:function(){this.customStore.visible=!0,this.checkCustomStatus()},closeCustom:function(){var e=this.custom,t=this.customStore;t.visible&&(t.visible=!1,e&&!t.immediate&&this.handleTableCustom())},confirmCustomEvent:function(e){this.closeCustom(),this.emitCustomEvent("confirm",e)},customOpenEvent:function(e){var t=this.customStore;this.checkTable()&&(t.visible||(this.showCustom(),this.emitCustomEvent("open",e)))},customColseEvent:function(e){this.customStore.visible&&(this.closeCustom(),this.emitCustomEvent("close",e))},resetCustomEvent:function(e){var t=this.$xetable,o=this.columns,n=t.customOpts.checkMethod;_xeUtils.default.eachTree(o,function(e){n&&!n({column:e})||(e.visible=e.defaultVisible,e.halfVisible=!1),e.resizeWidth=0}),t.saveCustomResizable(!0),this.closeCustom(),this.emitCustomEvent("reset",e)},emitCustomEvent:function(e,t){var o=this.$xetable,n=this.$xegrid;(n||o).$emit("custom",{type:e,$table:o,$grid:n,$event:t})},changeCustomOption:function(e){var t=!e.visible;_xeUtils.default.eachTree([e],function(e){e.visible=t,e.halfVisible=!1}),this.handleOptionCheck(e),this.custom&&this.customOpts.immediate&&this.handleTableCustom(),this.checkCustomStatus()},handleOptionCheck:function(t){var e=_xeUtils.default.findTree(this.columns,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)))},handleTableCustom:function(){this.$xetable.handleCustom()},checkCustomStatus:function(){var e=this.$xetable,t=this.columns,o=e.customOpts.checkMethod;this.customStore.isAll=t.every(function(e){return!!o&&!o({column:e})||e.visible}),this.customStore.isIndeterminate=!this.customStore.isAll&&t.some(function(e){return(!o||o({column:e}))&&(e.visible||e.halfVisible)})},allCustomEvent:function(){var e=this.$xetable,t=this.columns,o=this.customStore,n=e.customOpts.checkMethod,i=!o.isAll;_xeUtils.default.eachTree(t,function(e){n&&!n({column:e})||(e.visible=i,e.halfVisible=!1)}),o.isAll=i,this.checkCustomStatus()},handleGlobalMousedownEvent:function(e){_dom.default.getEventTargetNode(e,this.$refs.customWrapper).flag||this.customColseEvent(e)},handleGlobalBlurEvent:function(e){this.customColseEvent(e)},handleClickSettingEvent:function(e){this.customStore.visible?this.customColseEvent(e):this.customOpenEvent(e)},handleMouseenterSettingEvent:function(e){this.customStore.activeBtn=!0,this.customOpenEvent(e)},handleMouseleaveSettingEvent:function(e){var t=this,o=this.customStore;o.activeBtn=!1,setTimeout(function(){o.activeBtn||o.activeWrapper||t.customColseEvent(e)},300)},handleWrapperMouseenterEvent:function(e){this.customStore.activeWrapper=!0,this.customOpenEvent(e)},handleWrapperMouseleaveEvent:function(e){var t=this,o=this.customStore;o.activeWrapper=!1,setTimeout(function(){o.activeBtn||o.activeWrapper||t.customColseEvent(e)},300)},refreshEvent:function(){var e=this,t=this.$xegrid,o=this.refreshOpts;if(!this.isRefresh){var n=o.queryMethod||o.query;if(n){this.isRefresh=!0;try{Promise.resolve(n({})).catch(function(e){return e}).then(function(){e.isRefresh=!1})}catch(e){this.isRefresh=!1}}else t&&(this.isRefresh=!0,t.commitProxy(o.code||"reload").catch(function(e){return e}).then(function(){e.isRefresh=!1}))}},btnEvent:function(e,t){var o=this.$xegrid,n=this.$xetable,i=t.code;i&&(o?o.triggerToolbarBtnEvent(t,e):(n={code:i,button:t,$xegrid:o,$table:n,$event:e},(i=_vXETable.default.commands.get(i))&&i.call(this,n,e),this.$emit("button-click",n)))},tolEvent:function(e,t){var o=this.$xegrid,n=this.$xetable,i=t.code;i&&(o?o.triggerToolbarTolEvent(t,e):(n={code:i,tool:t,$xegrid:o,$table:n,$event:e},(i=_vXETable.default.commands.get(i))&&i.call(this,n,e),this.$emit("tool-click",n)))},importEvent:function(){this.checkTable()&&this.$xetable.openImport(this.importOpts)},exportEvent:function(){this.checkTable()&&this.$xetable.openExport(this.exportOpts)},printEvent:function(){this.checkTable()&&this.$xetable.openPrint(this.printOpts)}}};exports.default=_default2;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_size=_interopRequireDefault(require("../../mixins/size")),_utils=_interopRequireDefault(require("../../tools/utils")),_dom=_interopRequireDefault(require("../../tools/dom")),_vn=require("../../tools/vn"),_event=require("../../tools/event"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,o){return t in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o,e}var renderDropdowns=function(e,o,t,n){var i=o._e,t=t.dropdowns;return t?t.map(function(t){return!1===t.visible?i():e("vxe-button",{on:{click:function(e){return n?o.btnEvent(e,t):o.tolEvent(e,t)}},props:{disabled:t.disabled,loading:t.loading,type:t.type,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name}})}):[]};function renderBtns(i,s){var r=s._e,e=s.$scopedSlots,l=s.$xegrid,c=s.$xetable,t=s.buttons,t=void 0===t?[]:t,e=e.buttons;return e?e.call(s,{$grid:l,$table:c},i):t.map(function(t){var e=t.dropdowns,o=t.buttonRender,n=o?_vXETable.default.renderer.get(o.name):null;if(!1===t.visible)return r();if(n){n=n.renderToolbarButton||n.renderButton;if(n)return i("span",{class:"vxe-button--item"},(0,_vn.getSlotVNs)(n.call(s,i,o,{$grid:l,$table:c,button:t})))}return i("vxe-button",{on:{click:function(e){return s.btnEvent(e,t)}},props:{disabled:t.disabled,loading:t.loading,type:t.type,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,destroyOnClose:t.destroyOnClose,placement:t.placement,transfer:t.transfer},scopedSlots:e&&e.length?{dropdowns:function(){return renderDropdowns(i,s,t,!0)}}:null})})}function renderRightTools(i,s){var r=s._e,e=s.$scopedSlots,l=s.$xegrid,c=s.$xetable,t=s.tools,t=void 0===t?[]:t,e=e.tools;return e?e.call(s,{$grid:l,$table:c},i):t.map(function(t){var e=t.dropdowns,o=t.toolRender,n=o?_vXETable.default.renderer.get(o.name):null;if(!1===t.visible)return r();if(n){n=n.renderToolbarTool;if(n)return i("span",{class:"vxe-tool--item"},(0,_vn.getSlotVNs)(n.call(s,i,o,{$grid:l,$table:c,tool:t})))}return i("vxe-button",{on:{click:function(e){return s.tolEvent(e,t)}},props:{disabled:t.disabled,loading:t.loading,type:t.type,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,destroyOnClose:t.destroyOnClose,placement:t.placement,transfer:t.transfer},scopedSlots:e&&e.length?{dropdowns:function(){return renderDropdowns(i,s,t,!1)}}:null})})}function renderCustoms(r,l){var e=l.$xetable,t=l.customStore,o=l.customOpts,n=l.columns,c=[],i={},s={},u=e?e.customOpts.checkMethod:null;"manual"===o.trigger||("hover"===o.trigger?(i.mouseenter=l.handleMouseenterSettingEvent,i.mouseleave=l.handleMouseleaveSettingEvent,s.mouseenter=l.handleWrapperMouseenterEvent,s.mouseleave=l.handleWrapperMouseleaveEvent):i.click=l.handleClickSettingEvent),_xeUtils.default.eachTree(n,function(e){var t,o=_utils.default.formatText(e.getTitle(),1),n=e.getKey(),i=e.children&&e.children.length,s=!!u&&!u({column:e});(i||n)&&(t=e.visible,n=e.halfVisible,c.push(r("li",{class:["vxe-custom--option","level--".concat(e.level),{"is--group":i,"is--checked":t,"is--indeterminate":n,"is--disabled":s}],attrs:{title:o},on:{click:function(){s||l.changeCustomOption(e)}}},[r("span",{class:["vxe-checkbox--icon",n?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:t?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]}),r("span",{class:"vxe-checkbox--label"},o)])))});e=t.isAll,n=t.isIndeterminate;return r("div",{class:["vxe-custom--wrapper",{"is--active":t.visible}],ref:"customWrapper"},[r("vxe-button",{props:{circle:!0,icon:o.icon||_conf.default.icon.TOOLBAR_TOOLS_CUSTOM},attrs:{title:_conf.default.i18n("vxe.toolbar.custom")},on:i}),r("div",{class:"vxe-custom--option-wrapper"},[r("ul",{class:"vxe-custom--header"},[r("li",{class:["vxe-custom--option",{"is--checked":e,"is--indeterminate":n}],attrs:{title:_conf.default.i18n("vxe.table.allTitle")},on:{click:l.allCustomEvent}},[r("span",{class:["vxe-checkbox--icon",n?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:e?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]}),r("span",{class:"vxe-checkbox--label"},_conf.default.i18n("vxe.toolbar.customAll"))])]),r("ul",{class:"vxe-custom--body",on:s},c),!1===o.isFooter?null:r("div",{class:"vxe-custom--footer"},[r("button",{class:"btn--confirm",on:{click:l.confirmCustomEvent}},_conf.default.i18n("vxe.toolbar.customConfirm")),r("button",{class:"btn--reset",on:{click:l.resetCustomEvent}},_conf.default.i18n("vxe.toolbar.customRestore"))])])])}var _default2={name:"VxeToolbar",mixins:[_size.default],props:{loading:Boolean,refresh:[Boolean,Object],import:[Boolean,Object],export:[Boolean,Object],print:[Boolean,Object],zoom:[Boolean,Object],custom:[Boolean,Object],buttons:{type:Array,default:function(){return _conf.default.toolbar.buttons}},tools:{type:Array,default:function(){return _conf.default.toolbar.tools}},perfect:{type:Boolean,default:function(){return _conf.default.toolbar.perfect}},size:{type:String,default:function(){return _conf.default.toolbar.size||_conf.default.size}},className:[String,Function]},inject:{$xegrid:{default:null}},data:function(){return{$xetable:null,isRefresh:!1,columns:[],customStore:{isAll:!1,isIndeterminate:!1,visible:!1}}},computed:{refreshOpts:function(){return Object.assign({},_conf.default.toolbar.refresh,this.refresh)},importOpts:function(){return Object.assign({},_conf.default.toolbar.import,this.import)},exportOpts:function(){return Object.assign({},_conf.default.toolbar.export,this.export)},printOpts:function(){return Object.assign({},_conf.default.toolbar.print,this.print)},zoomOpts:function(){return Object.assign({},_conf.default.toolbar.zoom,this.zoom)},customOpts:function(){return Object.assign({},_conf.default.toolbar.custom,this.custom)}},created:function(){var o=this,n=this.refresh,i=this.refreshOpts;this.$nextTick(function(){var e=o.fintTable(),t=i.queryMethod||i.query;!n||o.$xegrid||t||(0,_log.warnLog)("vxe.error.notFunc",["queryMethod"]),e&&e.connect(o),"development"===process.env.NODE_ENV&&o.buttons&&o.buttons.forEach(function(e){e=e.buttonRender,e=e?_vXETable.default.renderer.get(e.name):null;e&&e.renderButton&&(0,_log.warnLog)("vxe.error.delFunc",["renderButton","renderToolbarButton"])})}),_event.GlobalEvent.on(this,"mousedown",this.handleGlobalMousedownEvent),_event.GlobalEvent.on(this,"blur",this.handleGlobalBlurEvent)},destroyed:function(){_event.GlobalEvent.off(this,"mousedown"),_event.GlobalEvent.off(this,"blur")},render:function(e){var t=this._e,o=this.$xegrid,n=this.perfect,i=this.loading,s=this.importOpts,r=this.exportOpts,l=this.refresh,c=this.refreshOpts,u=this.zoom,a=this.zoomOpts,f=this.custom,d=this.vSize,h=this.className;return e("div",{class:["vxe-toolbar",h?_xeUtils.default.isFunction(h)?h({$toolbar:this}):h:"",(_defineProperty(h={},"size--".concat(d),d),_defineProperty(h,"is--perfect",n),_defineProperty(h,"is--loading",i),h)]},[e("div",{class:"vxe-buttons--wrapper"},renderBtns(e,this)),e("div",{class:"vxe-tools--wrapper"},renderRightTools(e,this)),e("div",{class:"vxe-tools--operate"},[this.import?e("vxe-button",{props:{circle:!0,icon:s.icon||_conf.default.icon.TOOLBAR_TOOLS_IMPORT},attrs:{title:_conf.default.i18n("vxe.toolbar.import")},on:{click:this.importEvent}}):t(),this.export?e("vxe-button",{props:{circle:!0,icon:r.icon||_conf.default.icon.TOOLBAR_TOOLS_EXPORT},attrs:{title:_conf.default.i18n("vxe.toolbar.export")},on:{click:this.exportEvent}}):t(),this.print?e("vxe-button",{props:{circle:!0,icon:this.printOpts.icon||_conf.default.icon.TOOLBAR_TOOLS_PRINT},attrs:{title:_conf.default.i18n("vxe.toolbar.print")},on:{click:this.printEvent}}):t(),l?e("vxe-button",{props:{circle:!0,icon:this.isRefresh?c.iconLoading||_conf.default.icon.TOOLBAR_TOOLS_REFRESH_LOADING:c.icon||_conf.default.icon.TOOLBAR_TOOLS_REFRESH},attrs:{title:_conf.default.i18n("vxe.toolbar.refresh")},on:{click:this.refreshEvent}}):t(),u&&o?e("vxe-button",{props:{circle:!0,icon:o.isMaximized()?a.iconOut||_conf.default.icon.TOOLBAR_TOOLS_MINIMIZE:a.iconIn||_conf.default.icon.TOOLBAR_TOOLS_FULLSCREEN},attrs:{title:_conf.default.i18n("vxe.toolbar.zoom".concat(o.isMaximized()?"Out":"In"))},on:{click:o.triggerZoomEvent}}):t(),f?renderCustoms(e,this):t()])])},methods:{syncUpdate:function(e){var t=e.collectColumn,e=e.$table;this.$xetable=e,this.columns=t},fintTable:function(){var e=this.$parent.$children,o=e.indexOf(this);return _xeUtils.default.find(e,function(e,t){return e&&e.loadData&&o<t&&"vxe-table"===e.$vnode.componentOptions.tag})},checkTable:function(){if(this.$xetable)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},showCustom:function(){this.customStore.visible=!0,this.checkCustomStatus()},closeCustom:function(){var e=this.custom,t=this.customStore;t.visible&&(t.visible=!1,e&&!t.immediate&&this.handleTableCustom())},confirmCustomEvent:function(e){this.closeCustom(),this.emitCustomEvent("confirm",e)},customOpenEvent:function(e){var t=this.customStore;this.checkTable()&&(t.visible||(this.showCustom(),this.emitCustomEvent("open",e)))},customColseEvent:function(e){this.customStore.visible&&(this.closeCustom(),this.emitCustomEvent("close",e))},resetCustomEvent:function(e){var t=this.$xetable,o=this.columns,n=t.customOpts.checkMethod;_xeUtils.default.eachTree(o,function(e){n&&!n({column:e})||(e.visible=e.defaultVisible,e.halfVisible=!1),e.resizeWidth=0}),t.saveCustomResizable(!0),this.closeCustom(),this.emitCustomEvent("reset",e)},emitCustomEvent:function(e,t){var o=this.$xetable,n=this.$xegrid;(n||o).$emit("custom",{type:e,$table:o,$grid:n,$event:t})},changeCustomOption:function(e){var t=!e.visible;_xeUtils.default.eachTree([e],function(e){e.visible=t,e.halfVisible=!1}),this.handleOptionCheck(e),this.custom&&this.customOpts.immediate&&this.handleTableCustom(),this.checkCustomStatus()},handleOptionCheck:function(t){var e=_xeUtils.default.findTree(this.columns,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)))},handleTableCustom:function(){this.$xetable.handleCustom()},checkCustomStatus:function(){var e=this.$xetable,t=this.columns,o=e.customOpts.checkMethod;this.customStore.isAll=t.every(function(e){return!!o&&!o({column:e})||e.visible}),this.customStore.isIndeterminate=!this.customStore.isAll&&t.some(function(e){return(!o||o({column:e}))&&(e.visible||e.halfVisible)})},allCustomEvent:function(){var e=this.$xetable,t=this.columns,o=this.customStore,n=e.customOpts.checkMethod,i=!o.isAll;_xeUtils.default.eachTree(t,function(e){n&&!n({column:e})||(e.visible=i,e.halfVisible=!1)}),o.isAll=i,this.checkCustomStatus()},handleGlobalMousedownEvent:function(e){_dom.default.getEventTargetNode(e,this.$refs.customWrapper).flag||this.customColseEvent(e)},handleGlobalBlurEvent:function(e){this.customColseEvent(e)},handleClickSettingEvent:function(e){this.customStore.visible?this.customColseEvent(e):this.customOpenEvent(e)},handleMouseenterSettingEvent:function(e){this.customStore.activeBtn=!0,this.customOpenEvent(e)},handleMouseleaveSettingEvent:function(e){var t=this,o=this.customStore;o.activeBtn=!1,setTimeout(function(){o.activeBtn||o.activeWrapper||t.customColseEvent(e)},300)},handleWrapperMouseenterEvent:function(e){this.customStore.activeWrapper=!0,this.customOpenEvent(e)},handleWrapperMouseleaveEvent:function(e){var t=this,o=this.customStore;o.activeWrapper=!1,setTimeout(function(){o.activeBtn||o.activeWrapper||t.customColseEvent(e)},300)},refreshEvent:function(){var e=this,t=this.$xegrid,o=this.refreshOpts;if(!this.isRefresh){var n=o.queryMethod||o.query;if(n){this.isRefresh=!0;try{Promise.resolve(n({})).catch(function(e){return e}).then(function(){e.isRefresh=!1})}catch(e){this.isRefresh=!1}}else t&&(this.isRefresh=!0,t.commitProxy(o.code||"reload").catch(function(e){return e}).then(function(){e.isRefresh=!1}))}},btnEvent:function(e,t){var o=this.$xegrid,n=this.$xetable,i=t.code;i&&(o?o.triggerToolbarBtnEvent(t,e):(n={code:i,button:t,$xegrid:o,$table:n,$event:e},(i=_vXETable.default.commands.get(i))&&i.call(this,n,e),this.$emit("button-click",n)))},tolEvent:function(e,t){var o=this.$xegrid,n=this.$xetable,i=t.code;i&&(o?o.triggerToolbarTolEvent(t,e):(n={code:i,tool:t,$xegrid:o,$table:n,$event:e},(i=_vXETable.default.commands.get(i))&&i.call(this,n,e),this.$emit("tool-click",n)))},importEvent:function(){this.checkTable()&&this.$xetable.openImport(this.importOpts)},exportEvent:function(){this.checkTable()&&this.$xetable.openExport(this.exportOpts)},printEvent:function(){this.checkTable()&&this.$xetable.openPrint(this.printOpts)}}};exports.default=_default2;

package/lib/tools/log.js

@@ -12,7 +12,7 @@ var _conf = _interopRequireDefault(require("../v-x-e-table/src/conf"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.6.1", "] ", _conf.default.i18n(message, params));
+  return "[vxe-table v".concat("3.6.5", "] ", _conf.default.i18n(message, params));
 }
 
 function outLog(type) {

package/lib/tools/log.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,r){return"[vxe-table v".concat("3.6.1","] ",_conf.default.i18n(e,r))}function outLog(o){return function(e,r){r=getLog(e,r);return console[o](r),r}}var warnLog=outLog("warn");exports.warnLog=warnLog;var errLog=outLog("error");exports.errLog=errLog;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,r){return"[vxe-table v".concat("3.6.5","] ",_conf.default.i18n(e,r))}function outLog(o){return function(e,r){r=getLog(e,r);return console[o](r),r}}var warnLog=outLog("warn");exports.warnLog=warnLog;var errLog=outLog("error");exports.errLog=errLog;

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

@@ -221,7 +221,7 @@ var v = 'v3';
 exports.v = v;
 var VXETable = {
   v: v,
-  version: "3.6.1",
+  version: "3.6.5",
   reg: reg,
   use: use,
   setup: _setup.setup,

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

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

package/lib/v-x-e-table/style/style.css

@@ -526,6 +526,7 @@
 .vxe-icon-radio-unchecked:before {
   content: "\e7c9"; }
 
+/**Variable**/
 /*加载中*/
 .vxe-loading {
   display: none;

package/package.json

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

package/packages/edit/src/mixin.js

@@ -548,6 +548,9 @@ export default {
         if (!autofocus && compRender) {
           autofocus = compRender.autofocus
         }
+        if (!autoselect && compRender) {
+          autoselect = compRender.autoselect
+        }
         // 如果指定了聚焦 class
         if (XEUtils.isFunction(autofocus)) {
           inputElem = autofocus.call(this, params)

package/packages/filter/src/panel.js

@@ -2,6 +2,7 @@ import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
 import UtilTools from '../../tools/utils'
 import XEUtils from 'xe-utils'
+import { getSlotVNs } from '../../tools/vn'
 
 export default {
   name: 'VxeTableFilter',
@@ -50,7 +51,7 @@ export default {
         return [
           h('div', {
             class: 'vxe-table--filter-template'
-          }, compConf.renderFilter.call($xetable, h, filterRender, Object.assign({ $panel: this, context: this }, args)))
+          }, getSlotVNs(compConf.renderFilter.call($xetable, h, filterRender, Object.assign({ $panel: this, context: this }, args))))
         ]
       }
       const isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some(item => item._checked)

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

@@ -12,8 +12,14 @@ const props = {
   size: String,
   span: [String, Number],
   align: String,
-  titleAlign: String,
-  titleWidth: [String, Number],
+  titleAlign: {
+    type: String,
+    default: null
+  },
+  titleWidth: {
+    type: [String, Number],
+    default: null
+  },
   titleColon: {
     type: Boolean,
     default: null
@@ -23,7 +29,10 @@ const props = {
     default: null
   },
   className: [String, Function],
-  titleOverflow: { type: [Boolean, String], default: null },
+  titleOverflow: {
+    type: [Boolean, String],
+    default: null
+  },
   titlePrefix: Object,
   titleSuffix: Object,
   resetValue: { default: null },
@@ -42,14 +51,16 @@ Object.keys(props).forEach(name => {
 })
 
 const renderItem = (h, _vm, item, slots) => {
-  const { _e, rules, data, collapseAll, validOpts, titleOverflow: allTitleOverflow } = _vm
+  const { _e, rules, data, collapseAll, validOpts, titleAlign: allTitleAlign, titleWidth: allTitleWidth, titleColon: allTitleColon, titleAsterisk: allTitleAsterisk, titleOverflow: allTitleOverflow } = _vm
   const { title, folding, visible, field, collapseNode, itemRender, showError, errRule, className, titleOverflow } = item
   const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
   const itemClassName = compConf ? compConf.itemClassName : ''
   const span = item.span || _vm.span
   const align = item.align || _vm.align
-  const titleAlign = item.titleAlign || _vm.titleAlign
-  const titleWidth = item.titleWidth || _vm.titleWidth
+  const titleAlign = XEUtils.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign
+  const titleWidth = XEUtils.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth
+  const titleColon = XEUtils.eqNull(item.titleColon) ? allTitleColon : item.titleColon
+  const titleAsterisk = XEUtils.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk
   const itemOverflow = (XEUtils.isUndefined(titleOverflow) || XEUtils.isNull(titleOverflow)) ? allTitleOverflow : titleOverflow
   const showEllipsis = itemOverflow === 'ellipsis'
   const showTitle = itemOverflow === 'title'
@@ -91,6 +102,8 @@ const renderItem = (h, _vm, item, slots) => {
       itemClassName ? (XEUtils.isFunction(itemClassName) ? itemClassName(params) : itemClassName) : '',
       {
         'is--title': title,
+        'is--colon': titleColon,
+        'is--asterisk': titleAsterisk,
         'is--required': isRequired,
         'is--hidden': folding && collapseAll,
         'is--active': isActivetem(_vm, item),

package/packages/form/src/render.js

@@ -1,6 +1,7 @@
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
 import { isEnableConf, getFuncText } from '../../tools/utils'
+import { getSlotVNs } from '../../tools/vn'
 
 function renderPrefixIcon (h, titlePrefix) {
   return h('span', {
@@ -47,7 +48,7 @@ export function renderTitle (h, _vm, item) {
   titVNs.push(
     h('span', {
       class: 'vxe-form--item-title-label'
-    }, compConf && compConf.renderItemTitle ? compConf.renderItemTitle(itemRender, params) : (slots && slots.title ? _vm.callSlot(slots.title, params, h) : getFuncText(item.title)))
+    }, compConf && compConf.renderItemTitle ? getSlotVNs(compConf.renderItemTitle(itemRender, params)) : (slots && slots.title ? _vm.callSlot(slots.title, params, h) : getFuncText(item.title)))
   )
   contVNs.push(
     h('div', {

package/packages/locale/lang/en-US.js

@@ -56,6 +56,7 @@ export default {
       },
       combination: {
         menus: {
+          clearSort: 'Clear sort',
           sortAsc: 'Ascending order',
           sortDesc: 'Descending order',
           fixedColumn: 'Fixed column',

package/packages/locale/lang/ja-JP.js

@@ -56,6 +56,7 @@ export default {
       },
       combination: {
         menus: {
+          clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
           fixedColumn: '锁定列',

package/packages/locale/lang/zh-CN.js

@@ -56,6 +56,7 @@ export default {
       },
       combination: {
         menus: {
+          clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
           fixedColumn: '锁定列',

package/packages/locale/lang/zh-TC.js

@@ -56,6 +56,7 @@ export default {
       },
       combination: {
         menus: {
+          clearSort: '清除排序',
           sortAsc: '昇冪',
           sortDesc: '降序',
           fixedColumn: '鎖定列',

package/packages/table/src/body.js

@@ -4,6 +4,7 @@ import VXETable from '../../v-x-e-table'
 import UtilTools, { isEnableConf } from '../../tools/utils'
 import { getOffsetSize, calcTreeLine, mergeBodyMethod, removeScrollListener, restoreScrollListener, getRowid } from './util'
 import DomTools from '../../tools/dom'
+import { getSlotVNs } from '../../tools/vn'
 
 const renderType = 'body'
 
@@ -547,7 +548,7 @@ export default {
       const compConf = emptyOpts.name ? VXETable.renderer.get(emptyOpts.name) : null
       const renderEmpty = compConf ? compConf.renderEmpty : null
       if (renderEmpty) {
-        emptyContent = renderEmpty.call(this, h, emptyOpts, { $table: $xetable })
+        emptyContent = getSlotVNs(renderEmpty.call(this, h, emptyOpts, { $table: $xetable }))
       } else {
         emptyContent = $xetable.emptyText || GlobalConfig.i18n('vxe.table.emptyText')
       }

package/packages/table/src/table.js

@@ -7,6 +7,7 @@ import vSize from '../../mixins/size'
 import { isEnableConf, getFuncText } from '../../tools/utils'
 import { createResizeEvent } from '../../tools/resize'
 import { GlobalEvent } from '../../tools/event'
+import { getSlotVNs } from '../../tools/vn'
 import methods from './methods'
 import { warnLog, errLog } from '../../tools/log'
 import VxeLoading from '../../loading/index'
@@ -70,7 +71,7 @@ function renderEmptyContenet (h, _vm) {
     const compConf = emptyOpts.name ? VXETable.renderer.get(emptyOpts.name) : null
     const renderEmpty = compConf ? compConf.renderEmpty : null
     if (renderEmpty) {
-      emptyContent = renderEmpty.call(_vm, h, emptyOpts, params)
+      emptyContent = getSlotVNs(renderEmpty.call(_vm, h, emptyOpts, params))
     } else {
       emptyContent = getFuncText(_vm.emptyText) || GlobalConfig.i18n('vxe.table.emptyText')
     }

package/packages/toolbar/src/toolbar.js

@@ -4,6 +4,7 @@ import VXETable from '../../v-x-e-table'
 import vSize from '../../mixins/size'
 import UtilTools from '../../tools/utils'
 import DomTools from '../../tools/dom'
+import { getSlotVNs } from '../../tools/vn'
 import { GlobalEvent } from '../../tools/event'
 import { warnLog, errLog } from '../../tools/log'
 
@@ -52,7 +53,7 @@ function renderBtns (h, _vm) {
       if (renderToolbarButton) {
         return h('span', {
           class: 'vxe-button--item'
-        }, renderToolbarButton.call(_vm, h, buttonRender, { $grid: $xegrid, $table: $xetable, button: item }))
+        }, getSlotVNs(renderToolbarButton.call(_vm, h, buttonRender, { $grid: $xegrid, $table: $xetable, button: item })))
       }
     }
     return h('vxe-button', {
@@ -99,7 +100,7 @@ function renderRightTools (h, _vm) {
       if (renderToolbarTool) {
         return h('span', {
           class: 'vxe-tool--item'
-        }, renderToolbarTool.call(_vm, h, toolRender, { $grid: $xegrid, $table: $xetable, tool: item }))
+        }, getSlotVNs(renderToolbarTool.call(_vm, h, toolRender, { $grid: $xegrid, $table: $xetable, tool: item })))
       }
     }
     return h('vxe-button', {

package/styles/footer.scss

@@ -1,23 +1 @@
 /**Variable**/
-
-.vxe-table--footer-wrapper {
-  color: $vxe-table-footer-font-color;
-  margin-top: -1px;
-  &.body--wrapper{
-    overflow-x: auto;
-  }
-}
-
-.vxe-footer--column {
-  &.col--ellipsis {
-    & > .vxe-cell {
-      display: flex;
-      align-items: center;
-      .vxe-cell--item {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-}

package/styles/loading.scss

@@ -1,3 +1,5 @@
+/**Variable**/
+
 /*加载中*/
 .vxe-loading {
   display: none;

package/styles/modules.scss

@@ -1,14 +1,9 @@
 @import './icon.scss';
-@import './loading.scss';
-@import './table.scss';
-@import './column.scss';
-@import './colgroup.scss';
-@import './header.scss';
-@import './footer.scss';
 @import './filter.scss';
 @import './menu.scss';
 @import './export.scss';
 
+@import './table.scss';
 @import './grid.scss';
 @import './toolbar.scss';
 @import './pager.scss';

package/styles/table.scss

@@ -2,6 +2,7 @@
 @import './helpers/mixin.scss';
 @import './base/checked.scss';
 @import './base/common.scss';
+@import './loading.scss';
 
 %DefaultColumnHeight {
   height: $vxe-table-row-height-default;
@@ -1300,3 +1301,26 @@
     }
   }
 }
+
+/*footer*/
+.vxe-table--footer-wrapper {
+  color: $vxe-table-footer-font-color;
+  margin-top: -1px;
+  &.body--wrapper{
+    overflow-x: auto;
+  }
+}
+
+.vxe-footer--column {
+  &.col--ellipsis {
+    & > .vxe-cell {
+      display: flex;
+      align-items: center;
+      .vxe-cell--item {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+  }
+}

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

@@ -1,5 +1,5 @@
 import { CreateElement, VNode } from 'vue'
-import { RowInfo } from '../component'
+import { SlotVNodeType, RowInfo } from '../component'
 import { Table } from '../table'
 import { Grid } from '../grid'
 import { ColumnInfo, ColumnCellRenderOptions, ColumnContentRenderOptions } from '../column'
@@ -35,7 +35,7 @@ export interface RendererMapOptions {
   // 筛选渲染
   filterClassName?: string | ((params: ColumnFilterRenderParams) => string | { [key: string]: boolean })
   showFilterFooter?: boolean;
-  renderFilter?(h: CreateElement, renderOpts: ColumnFilterRenderOptions, params: ColumnFilterRenderParams): VNode[] | string[];
+  renderFilter?(h: CreateElement, renderOpts: ColumnFilterRenderOptions, params: ColumnFilterRenderParams): SlotVNodeType | SlotVNodeType[];
   filterMethod?(params: ColumnFilterMethodParams): boolean;
   filterResetMethod?(params: ColumnFilterResetParams): void;
   // 默认行为
@@ -43,33 +43,33 @@ export interface RendererMapOptions {
 
   // 单元格渲染
   cellClassName?: string | ((params: ColumnCellRenderParams | ColumnEditRenderParams) => string | { [key: string]: boolean })
-  renderHeader?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
-  renderDefault?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
-  renderFooter?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnFooterRenderParams): VNode[] | string[];
+  renderHeader?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): SlotVNodeType | SlotVNodeType[];
+  renderDefault?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): SlotVNodeType | SlotVNodeType[];
+  renderFooter?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnFooterRenderParams): SlotVNodeType | SlotVNodeType[];
   exportMethod?(params: ColumnExportCellRenderParams): string;
   footerExportMethod?(params: ColumnExportFooterRenderParams): string;
 
   // 编辑渲染
   autofocus?: string | ((params: ColumnCellRenderParams | ColumnEditRenderParams) => HTMLElement | null);
-  renderEdit?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
-  renderCell?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
+  renderEdit?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): SlotVNodeType | SlotVNodeType[];
+  renderCell?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): SlotVNodeType | SlotVNodeType[];
 
   // 内容渲染
-  renderExpand?(h: CreateElement, renderOpts: ColumnContentRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
+  renderExpand?(h: CreateElement, renderOpts: ColumnContentRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): SlotVNodeType | SlotVNodeType[];
 
   // 工具栏-按钮渲染
-  renderToolbarButton?(h: CreateElement, renderOpts: ToolbarButtonRenderOptions, params: ToolbarButtonRenderParams): VNode[] | string[];
-  renderToolbarTool?(h: CreateElement, renderOpts: ToolbarToolRenderOptions, params: ToolbarToolRenderParams): VNode[] | string[];
+  renderToolbarButton?(h: CreateElement, renderOpts: ToolbarButtonRenderOptions, params: ToolbarButtonRenderParams): SlotVNodeType | SlotVNodeType[];
+  renderToolbarTool?(h: CreateElement, renderOpts: ToolbarToolRenderOptions, params: ToolbarToolRenderParams): SlotVNodeType | SlotVNodeType[];
 
   // 表单-项渲染
   itemClassName?: string | ((params: FormItemRenderParams) => string | { [key: string]: boolean })
-  renderItemTitle?(h: CreateElement, renderOpts: FormItemRenderOptions, params: FormItemRenderParams): VNode[] | string[];
-  renderItemContent?(h: CreateElement, renderOpts: FormItemRenderOptions, params: FormItemRenderParams): VNode[] | string[];
+  renderItemTitle?(h: CreateElement, renderOpts: FormItemRenderOptions, params: FormItemRenderParams): SlotVNodeType | SlotVNodeType[];
+  renderItemContent?(h: CreateElement, renderOpts: FormItemRenderOptions, params: FormItemRenderParams): SlotVNodeType | SlotVNodeType[];
   itemVisibleMethod?(params: FormItemVisibleParams): boolean;
   itemResetMethod?(params: FormItemResetParams): void;
 
   // 空内容渲染
-  renderEmpty?(h: CreateElement, renderOpts: TableEmptyRender, params: EmptyRenderParams): VNode[] | string[];
+  renderEmpty?(h: CreateElement, renderOpts: TableEmptyRender, params: EmptyRenderParams): SlotVNodeType | SlotVNodeType[];
 
   [key: string]: any;
 }