vxe-table 3.19.24 → 3.19.26

package/lib/toolbar/src/toolbar.js

@@ -517,17 +517,10 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
         connectTable
       } = internalData;
       const $table = connectTable;
+      const buttonsSlot = slots.buttons;
       const buttonPrefixSlot = slots.buttonPrefix || slots['button-prefix'];
       const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix'];
       const btnVNs = [];
-      if (buttonPrefixSlot) {
-        btnVNs.push(...(0, _vn.getSlotVNs)(buttonPrefixSlot.call($xeToolbar, {
-          buttons: buttons || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        })));
-      }
       if (buttons) {
         buttons.forEach(item => {
           const {
@@ -566,15 +559,28 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
           }
         });
       }
-      if (buttonSuffixSlot) {
-        btnVNs.push(...(0, _vn.getSlotVNs)(buttonSuffixSlot.call($xeToolbar, {
-          buttons: buttons || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        })));
-      }
-      return btnVNs;
+      return [h('div', {
+        class: 'vxe-button--prefix-wrapper'
+      }, buttonPrefixSlot ? (0, _vn.getSlotVNs)(buttonPrefixSlot.call($xeToolbar, {
+        buttons: buttons || [],
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
+        $table: $table
+      })) : []), h('div', {
+        class: 'vxe-button--item-wrapper'
+      }, buttonsSlot ? (0, _vn.getSlotVNs)(buttonsSlot.call($xeToolbar, {
+        buttons: buttons || [],
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
+        $table: $table
+      })) : btnVNs), h('div', {
+        class: 'vxe-button--suffix-wrapper'
+      }, buttonSuffixSlot ? (0, _vn.getSlotVNs)(buttonSuffixSlot.call($xeToolbar, {
+        buttons: buttons || [],
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
+        $table: $table
+      })) : [])];
     },
     /**
      * 渲染右侧工具
@@ -595,17 +601,10 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
         connectTable
       } = internalData;
       const $table = connectTable;
+      const toolsSlot = slots.tools;
       const toolPrefixSlot = slots.toolPrefix || slots['tool-prefix'];
       const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix'];
       const btnVNs = [];
-      if (toolPrefixSlot) {
-        btnVNs.push(...(0, _vn.getSlotVNs)(toolPrefixSlot.call($xeToolbar, {
-          tools: tools || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        })));
-      }
       if (tools) {
         tools.forEach((item, tIndex) => {
           const {
@@ -647,15 +646,28 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
           }
         });
       }
-      if (toolSuffixSlot) {
-        btnVNs.push(...(0, _vn.getSlotVNs)(toolSuffixSlot.call($xeToolbar, {
-          tools: tools || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        })));
-      }
-      return btnVNs;
+      return [h('div', {
+        class: 'vxe-tool--prefix-wrapper'
+      }, toolPrefixSlot ? (0, _vn.getSlotVNs)(toolPrefixSlot.call($xeToolbar, {
+        tools: tools || [],
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
+        $table: $table
+      })) : []), h('div', {
+        class: 'vxe-tool--item-wrapper'
+      }, toolsSlot ? (0, _vn.getSlotVNs)(toolsSlot.call($xeToolbar, {
+        tools: tools || [],
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
+        $table: $table
+      })) : btnVNs), h('div', {
+        class: 'vxe-tool--suffix-wrapper'
+      }, toolSuffixSlot ? (0, _vn.getSlotVNs)(toolSuffixSlot.call($xeToolbar, {
+        tools: tools || [],
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
+        $table: $table
+      })) : [])];
     },
     renderToolImport(h) {
       // 使用已安装的组件，如果未安装则不渲染
@@ -777,8 +789,6 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
     renderVN(h) {
       const $xeToolbar = this;
       const props = $xeToolbar;
-      const slots = $xeToolbar.$scopedSlots;
-      const internalData = $xeToolbar.internalData;
       const $xeGrid = $xeToolbar.$xeGrid;
       const $xeGantt = $xeToolbar.$xeGantt;
       const $xeGGWrapper = $xeGrid || $xeGantt;
@@ -790,12 +800,6 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
         custom,
         className
       } = props;
-      const {
-        connectTable
-      } = internalData;
-      const $table = connectTable;
-      const toolsSlot = slots.tools;
-      const buttonsSlot = slots.buttons;
       const vSize = $xeToolbar.computeSize;
       return h('div', {
         ref: 'refElem',
@@ -808,17 +812,9 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
         }]
       }, [h('div', {
         class: 'vxe-buttons--wrapper'
-      }, buttonsSlot ? buttonsSlot({
-        $grid: $xeGrid,
-        $gantt: $xeGantt,
-        $table: $table
-      }) : $xeToolbar.renderLeftBtns(h)), h('div', {
+      }, $xeToolbar.renderLeftBtns(h)), h('div', {
         class: 'vxe-tools--wrapper'
-      }, toolsSlot ? toolsSlot({
-        $grid: $xeGrid,
-        $gantt: $xeGantt,
-        $table: $table
-      }) : $xeToolbar.renderRightTools(h)), h('div', {
+      }, $xeToolbar.renderRightTools(h)), h('div', {
         class: 'vxe-tools--operate'
       }, [props.import ? $xeToolbar.renderToolImport(h) : renderEmptyElement($xeToolbar), props.export ? $xeToolbar.renderToolExport(h) : renderEmptyElement($xeToolbar), props.print ? $xeToolbar.renderToolPrint(h) : renderEmptyElement($xeToolbar), refresh ? $xeToolbar.renderToolRefresh(h) : renderEmptyElement($xeToolbar), zoom && $xeGGWrapper ? $xeToolbar.renderToolZoom(h) : renderEmptyElement($xeToolbar), custom ? $xeToolbar.renderToolCustom(h) : renderEmptyElement($xeToolbar)])]);
     }

package/lib/toolbar/src/toolbar.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,getIcon,getI18n,renderer,commands,createEvent,globalMixins,renderEmptyElement}=_ui.VxeUI;function createInternalData(){return{connectTable:null}}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeToolbar",mixins:[globalMixins.sizeMixin],props:{loading:Boolean,refresh:[Boolean,Object],refreshOptions:Object,import:[Boolean,Object],importOptions:Object,export:[Boolean,Object],exportOptions:Object,print:[Boolean,Object],printOptions:Object,zoom:[Boolean,Object],zoomOptions:Object,custom:[Boolean,Object],customOptions:Object,buttons:{type:Array,default:()=>getConfig().toolbar.buttons},tools:{type:Array,default:()=>getConfig().toolbar.tools},perfect:{type:Boolean,default:()=>getConfig().toolbar.perfect},size:{type:String,default:()=>getConfig().toolbar.size||getConfig().size},className:[String,Function]},inject:{$xeGrid:{default:null},$xeGantt:{default:null}},data(){return{xID:_xeUtils.default.uniqueId(),reactData:{isRefresh:!1,connectFlag:0,columns:[]},internalData:createInternalData()}},computed:Object.assign(Object.assign({},{}),{computeRefreshOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.refresh,!0),this.refreshOptions,this.refresh)},computeImportOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.import,!0),this.importOptions,this.import)},computeExportOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.export,!0),this.exportOptions,this.export)},computePrintOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.print,!0),this.printOptions,this.print)},computeZoomOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.zoom,!0),this.zoomOptions,this.zoom)},computeCustomOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.custom,!0),this.customOptions,this.custom)},computeTableCustomOpts(){var e=this.reactData,t=this.internalData.connectTable;return(e.connectFlag||t)&&t?t.computeCustomOpts:{trigger:""}},computeTrigger(){return this.computeTableCustomOpts.trigger}}),methods:{dispatchEvent(e,t,o){this.$emit(e,createEvent(o,{$toolbar:this},t))},fintTable(){var e=this.$parent.$children;let o=e.indexOf(this);return _xeUtils.default.find(e,(e,t)=>e&&e.loadData&&t>o&&"vxe-table"===e.$vnode.componentOptions.tag)},syncUpdate(e){var t=this.reactData;this.internalData.connectTable=e.$table,t.columns=e.collectColumn,t.connectFlag++},checkTable(){var e=this.internalData.connectTable;if(e)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},handleClickSettingEvent({$event:e}){var t=this.internalData.connectTable;t&&t.triggerCustomEvent&&t.triggerCustomEvent(e)},handleMouseenterSettingEvent({$event:e}){var t=this.internalData.connectTable;t&&t.customOpenEvent(e)},handleMouseleaveSettingEvent({$event:t}){var e=this.internalData.connectTable;let o=e;if(o){let e=o.reactData.customStore;e.activeBtn=!1,setTimeout(()=>{e.activeBtn||e.activeWrapper||o.customCloseEvent(t)},350)}},refreshEvent({$event:e}){let t=this.reactData;var o=this.$xeGrid,r=this.$xeGantt,o=o||r,r=t.isRefresh,n=this.computeRefreshOpts;if(!r){r=n.queryMethod||n.query;if(r){t.isRefresh=!0;try{Promise.resolve(r({})).catch(e=>e).then(()=>{t.isRefresh=!1})}catch(e){t.isRefresh=!1}}else o&&(t.isRefresh=!0,o.triggerToolbarCommitEvent({code:n.code||"reload"},e).catch(()=>{}).then(()=>{t.isRefresh=!1}))}},zoomEvent({$event:e}){var t=this.$xeGrid,o=this.$xeGantt,t=t||o;t?t.triggerZoomEvent(e):(0,_log.warnLog)("vxe.error.notProp",["[toolbar] zoom"])},importEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.importData()},openImportEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openImport()},exportEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.exportData()},openExportEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openExport()},printEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.print()},openPrintEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openPrint()},handleDefaultCodeEvent(e,t,o){var r=this;switch(t.code){case"print":r.printEvent();break;case"open_print":r.openPrintEvent();break;case"custom":r.handleClickSettingEvent(e);break;case"export":r.exportEvent();break;case"open_export":r.openExportEvent();break;case"import":r.importEvent();break;case"open_import":r.openImportEvent();break;case"zoom":r.zoomEvent(e);break;case"refresh":r.refreshEvent(e);break;default:o()}},btnEvent(e,o){let r=this;var t=r.internalData;let n=r.$xeGrid,a=r.$xeGantt,i=n||a,l=e.$event;t=t.connectTable;let s=t,c=o.code;c&&r.handleDefaultCodeEvent(e,o,()=>{var e,t;i?i.triggerToolbarBtnEvent(o,l):(t=commands.get(c),e={code:c,button:o,$table:s,$grid:n,$gantt:a,$event:l},t&&((t=t.tableCommandMethod||t.commandMethod)?t(e):(0,_log.errLog)("vxe.error.notCommands",["[toolbar] "+c])),r.dispatchEvent("button-click",e,l))})},tolEvent(e,o){let r=this;var t=r.internalData;let n=r.$xeGrid,a=r.$xeGantt,i=n||a,l=e.$event;t=t.connectTable;let s=t,c=o.code;c&&r.handleDefaultCodeEvent(e,o,()=>{var e,t;i?i.triggerToolbarTolEvent(o,l):(t=commands.get(c),e={code:c,button:null,tool:o,$table:s,$grid:n,$gantt:a,$event:l},t&&((t=t.tableCommandMethod||t.commandMethod)?t(e):(0,_log.errLog)("vxe.error.notCommands",["[toolbar] "+c])),r.dispatchEvent("tool-click",e,l))})},renderDropdowns(o,e,r){let n=_ui.VxeUI.getComponent("VxeButton"),a=this;e=e.dropdowns;return e?e.map((t,e)=>!1!==t.visible&&n?o(n,{key:e,props:Object.assign({},t,{content:t.content||t.name,options:void 0}),on:{click:e=>r?a.btnEvent(e,t):a.tolEvent(e,t)}}):renderEmptyElement(a)):[]},renderLeftBtns(i){let l=_ui.VxeUI.getComponent("VxeButton"),s=this;var e=s,t=s.$scopedSlots,o=s.internalData;let c=s.$xeGrid,p=s.$xeGantt;e=e.buttons,o=o.connectTable;let u=o;o=t.buttonPrefix||t["button-prefix"],t=t.buttonSuffix||t["button-suffix"];let m=[];return o&&m.push(...(0,_vn.getSlotVNs)(o.call(s,{buttons:e||[],$grid:c,$gantt:p,$table:u}))),e&&e.forEach(t=>{var e,o,r,{dropdowns:n,buttonRender:a}=t;!1!==t.visible&&(e=a?renderer.get(a.name):null,a&&e&&e.renderToolbarButton?(o=e.toolbarButtonClassName,r={$grid:c,$gantt:p,$table:u,button:t},m.push(i("span",{class:["vxe-button--item",o?_xeUtils.default.isFunction(o)?o(r):o:""]},(0,_vn.getSlotVNs)(e.renderToolbarButton(i,a,r))))):l&&m.push(i(l,{props:Object.assign({},t,{content:t.content||t.name,options:void 0}),on:{click:e=>s.btnEvent(e,t)},scopedSlots:n&&n.length?{dropdowns:()=>s.renderDropdowns(i,t,!0)}:{}})))}),t&&m.push(...(0,_vn.getSlotVNs)(t.call(s,{buttons:e||[],$grid:c,$gantt:p,$table:u}))),m},renderRightTools(s){let c=_ui.VxeUI.getComponent("VxeButton"),p=this;var e=p,t=p.$scopedSlots,o=p.internalData;let u=p.$xeGrid,m=p.$xeGantt;e=e.tools,o=o.connectTable;let d=o;o=t.toolPrefix||t["tool-prefix"],t=t.toolSuffix||t["tool-suffix"];let g=[];return o&&g.push(...(0,_vn.getSlotVNs)(o.call(p,{tools:e||[],$grid:u,$gantt:m,$table:d}))),e&&e.forEach((t,e)=>{var o,r,n,a,{dropdowns:i,toolRender:l}=t;!1!==t.visible&&(o=l?l.name:null,r=l?renderer.get(o):null,l&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,a={$grid:u,$gantt:m,$table:d,tool:t},g.push(s("span",{key:o,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(a):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(s,l,a))))):c&&g.push(s(c,{key:e,props:Object.assign({},t,{content:t.content||t.name,options:void 0}),on:{click:e=>p.tolEvent(e,t)},scopedSlots:i&&i.length?{dropdowns:()=>p.renderDropdowns(s,t,!1)}:{}})))}),t&&g.push(...(0,_vn.getSlotVNs)(t.call(p,{tools:e||[],$grid:u,$gantt:m,$table:d}))),g},renderToolImport(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computeImportOpts;return t?e(t,{key:"import",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_IMPORT,title:getI18n("vxe.toolbar.import")},on:{click:this.openImportEvent}}):renderEmptyElement(this)},renderToolExport(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computeExportOpts;return t?e(t,{key:"export",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_EXPORT,title:getI18n("vxe.toolbar.export")},on:{click:this.openExportEvent}}):renderEmptyElement(this)},renderToolPrint(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computePrintOpts;return t?e(t,{key:"print",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_PRINT,title:getI18n("vxe.toolbar.print")},on:{click:this.openPrintEvent}}):renderEmptyElement(this)},renderToolRefresh(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.reactData,r=this.computeRefreshOpts;return t?e(t,{key:"refresh",props:{circle:!0,icon:o.isRefresh?r.iconLoading||getIcon().TOOLBAR_TOOLS_REFRESH_LOADING:r.icon||getIcon().TOOLBAR_TOOLS_REFRESH,title:getI18n("vxe.toolbar.refresh")},on:{click:this.refreshEvent}}):renderEmptyElement(this)},renderToolZoom(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this,r=o.$xeGrid||o.$xeGantt,n=o.computeZoomOpts;return r&&t?e(t,{key:"zoom",props:{circle:!0,icon:r.isMaximized()?n.iconOut||getIcon().TOOLBAR_TOOLS_MINIMIZE:n.iconIn||getIcon().TOOLBAR_TOOLS_FULLSCREEN,title:getI18n("vxe.toolbar.zoom"+(r.isMaximized()?"Out":"In"))},on:{click:o.zoomEvent}}):renderEmptyElement(o)},renderToolCustom(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this,r=o.computeCustomOpts,n=o.computeTrigger,a={};return"manual"!==n&&("hover"===n?(a.mouseenter=o.handleMouseenterSettingEvent,a.mouseleave=o.handleMouseleaveSettingEvent):a.click=o.handleClickSettingEvent),t?e(t,{key:"custom",props:{circle:!0,icon:r.icon||getIcon().TOOLBAR_TOOLS_CUSTOM,title:getI18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target"},on:a}):renderEmptyElement(o)},renderVN(e){var t=this,o=t,r=t.$scopedSlots,n=t.$xeGrid,a=t.$xeGantt,i=n||a,{perfect:l,loading:s,refresh:c,zoom:p,custom:u,className:m}=o,d=t.internalData.connectTable,g=r.tools,r=r.buttons,b=t.computeSize;return e("div",{ref:"refElem",class:["vxe-toolbar",m?_xeUtils.default.isFunction(m)?m({$toolbar:t}):m:"",{["size--"+b]:b,"is--perfect":l,"is--loading":s}]},[e("div",{class:"vxe-buttons--wrapper"},r?r({$grid:n,$gantt:a,$table:d}):t.renderLeftBtns(e)),e("div",{class:"vxe-tools--wrapper"},g?g({$grid:n,$gantt:a,$table:d}):t.renderRightTools(e)),e("div",{class:"vxe-tools--operate"},[o.import?t.renderToolImport(e):renderEmptyElement(t),o.export?t.renderToolExport(e):renderEmptyElement(t),o.print?t.renderToolPrint(e):renderEmptyElement(t),c?t.renderToolRefresh(e):renderEmptyElement(t),p&&i?t.renderToolZoom(e):renderEmptyElement(t),u?t.renderToolCustom(e):renderEmptyElement(t)])])}},created(){let o=this,r=o;var e=o.$xeGrid,t=o.$xeGantt;let n=e||t;o.$nextTick(()=>{var e=o.computeRefreshOpts,t=o.fintTable(),e=e.queryMethod||e.query,e=(!r.refresh||n||e||(0,_log.warnLog)("vxe.error.notFunc",["[toolbar] queryMethod"]),_xeUtils.default.isPlainObject(r.custom)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] custom={...}","custom=boolean & custom-options={...}"]),_xeUtils.default.isPlainObject(r.print)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] print={...}","print=boolean & print-options={...}"]),_xeUtils.default.isPlainObject(r.export)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] export={...}","export=boolean & export-options={...}"]),_xeUtils.default.isPlainObject(r.import)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] import={...}","import=boolean & import-options={...}"]),_xeUtils.default.isPlainObject(r.refresh)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] refresh={...}","refresh=boolean & refresh-options={...}"]),_xeUtils.default.isPlainObject(r.refresh)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] zoom={...}","zoom=boolean & zoom-options={...}"]),t&&t.connect(this),o.computeCustomOpts);e.isFooter&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] toolbar.custom.isFooter","table.custom-config.showFooter"]),e.showFooter&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] toolbar.custom.showFooter","table.custom-config.showFooter"]),e.immediate&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] toolbar.custom.immediate","table.custom-config.immediate"]),e.trigger&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] toolbar.custom.trigger","table.custom-config.trigger"])});e=_ui.VxeUI.getComponent("VxeButton");(r.refresh||r.import||r.export||r.print||r.zoom)&&!e&&(0,_log.errLog)("vxe.error.reqComp",["vxe-button"])},destroyed(){var e=this.internalData;_xeUtils.default.assign(e,createInternalData())},render(e){return this.renderVN(e)}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,getIcon,getI18n,renderer,commands,createEvent,globalMixins,renderEmptyElement}=_ui.VxeUI;function createInternalData(){return{connectTable:null}}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeToolbar",mixins:[globalMixins.sizeMixin],props:{loading:Boolean,refresh:[Boolean,Object],refreshOptions:Object,import:[Boolean,Object],importOptions:Object,export:[Boolean,Object],exportOptions:Object,print:[Boolean,Object],printOptions:Object,zoom:[Boolean,Object],zoomOptions:Object,custom:[Boolean,Object],customOptions:Object,buttons:{type:Array,default:()=>getConfig().toolbar.buttons},tools:{type:Array,default:()=>getConfig().toolbar.tools},perfect:{type:Boolean,default:()=>getConfig().toolbar.perfect},size:{type:String,default:()=>getConfig().toolbar.size||getConfig().size},className:[String,Function]},inject:{$xeGrid:{default:null},$xeGantt:{default:null}},data(){return{xID:_xeUtils.default.uniqueId(),reactData:{isRefresh:!1,connectFlag:0,columns:[]},internalData:createInternalData()}},computed:Object.assign(Object.assign({},{}),{computeRefreshOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.refresh,!0),this.refreshOptions,this.refresh)},computeImportOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.import,!0),this.importOptions,this.import)},computeExportOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.export,!0),this.exportOptions,this.export)},computePrintOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.print,!0),this.printOptions,this.print)},computeZoomOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.zoom,!0),this.zoomOptions,this.zoom)},computeCustomOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.custom,!0),this.customOptions,this.custom)},computeTableCustomOpts(){var e=this.reactData,t=this.internalData.connectTable;return(e.connectFlag||t)&&t?t.computeCustomOpts:{trigger:""}},computeTrigger(){return this.computeTableCustomOpts.trigger}}),methods:{dispatchEvent(e,t,o){this.$emit(e,createEvent(o,{$toolbar:this},t))},fintTable(){var e=this.$parent.$children;let o=e.indexOf(this);return _xeUtils.default.find(e,(e,t)=>e&&e.loadData&&t>o&&"vxe-table"===e.$vnode.componentOptions.tag)},syncUpdate(e){var t=this.reactData;this.internalData.connectTable=e.$table,t.columns=e.collectColumn,t.connectFlag++},checkTable(){var e=this.internalData.connectTable;if(e)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},handleClickSettingEvent({$event:e}){var t=this.internalData.connectTable;t&&t.triggerCustomEvent&&t.triggerCustomEvent(e)},handleMouseenterSettingEvent({$event:e}){var t=this.internalData.connectTable;t&&t.customOpenEvent(e)},handleMouseleaveSettingEvent({$event:t}){var e=this.internalData.connectTable;let o=e;if(o){let e=o.reactData.customStore;e.activeBtn=!1,setTimeout(()=>{e.activeBtn||e.activeWrapper||o.customCloseEvent(t)},350)}},refreshEvent({$event:e}){let t=this.reactData;var o=this.$xeGrid,r=this.$xeGantt,o=o||r,r=t.isRefresh,n=this.computeRefreshOpts;if(!r){r=n.queryMethod||n.query;if(r){t.isRefresh=!0;try{Promise.resolve(r({})).catch(e=>e).then(()=>{t.isRefresh=!1})}catch(e){t.isRefresh=!1}}else o&&(t.isRefresh=!0,o.triggerToolbarCommitEvent({code:n.code||"reload"},e).catch(()=>{}).then(()=>{t.isRefresh=!1}))}},zoomEvent({$event:e}){var t=this.$xeGrid,o=this.$xeGantt,t=t||o;t?t.triggerZoomEvent(e):(0,_log.warnLog)("vxe.error.notProp",["[toolbar] zoom"])},importEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.importData()},openImportEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openImport()},exportEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.exportData()},openExportEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openExport()},printEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.print()},openPrintEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openPrint()},handleDefaultCodeEvent(e,t,o){var r=this;switch(t.code){case"print":r.printEvent();break;case"open_print":r.openPrintEvent();break;case"custom":r.handleClickSettingEvent(e);break;case"export":r.exportEvent();break;case"open_export":r.openExportEvent();break;case"import":r.importEvent();break;case"open_import":r.openImportEvent();break;case"zoom":r.zoomEvent(e);break;case"refresh":r.refreshEvent(e);break;default:o()}},btnEvent(e,o){let r=this;var t=r.internalData;let n=r.$xeGrid,a=r.$xeGantt,i=n||a,l=e.$event;t=t.connectTable;let s=t,c=o.code;c&&r.handleDefaultCodeEvent(e,o,()=>{var e,t;i?i.triggerToolbarBtnEvent(o,l):(t=commands.get(c),e={code:c,button:o,$table:s,$grid:n,$gantt:a,$event:l},t&&((t=t.tableCommandMethod||t.commandMethod)?t(e):(0,_log.errLog)("vxe.error.notCommands",["[toolbar] "+c])),r.dispatchEvent("button-click",e,l))})},tolEvent(e,o){let r=this;var t=r.internalData;let n=r.$xeGrid,a=r.$xeGantt,i=n||a,l=e.$event;t=t.connectTable;let s=t,c=o.code;c&&r.handleDefaultCodeEvent(e,o,()=>{var e,t;i?i.triggerToolbarTolEvent(o,l):(t=commands.get(c),e={code:c,button:null,tool:o,$table:s,$grid:n,$gantt:a,$event:l},t&&((t=t.tableCommandMethod||t.commandMethod)?t(e):(0,_log.errLog)("vxe.error.notCommands",["[toolbar] "+c])),r.dispatchEvent("tool-click",e,l))})},renderDropdowns(o,e,r){let n=_ui.VxeUI.getComponent("VxeButton"),a=this;e=e.dropdowns;return e?e.map((t,e)=>!1!==t.visible&&n?o(n,{key:e,props:Object.assign({},t,{content:t.content||t.name,options:void 0}),on:{click:e=>r?a.btnEvent(e,t):a.tolEvent(e,t)}}):renderEmptyElement(a)):[]},renderLeftBtns(i){let l=_ui.VxeUI.getComponent("VxeButton"),s=this;var e=s,t=s.$scopedSlots,o=s.internalData;let c=s.$xeGrid,p=s.$xeGantt;e=e.buttons,o=o.connectTable;let u=o;var o=t.buttons,r=t.buttonPrefix||t["button-prefix"],t=t.buttonSuffix||t["button-suffix"];let m=[];return e&&e.forEach(t=>{var e,o,r,{dropdowns:n,buttonRender:a}=t;!1!==t.visible&&(e=a?renderer.get(a.name):null,a&&e&&e.renderToolbarButton?(o=e.toolbarButtonClassName,r={$grid:c,$gantt:p,$table:u,button:t},m.push(i("span",{class:["vxe-button--item",o?_xeUtils.default.isFunction(o)?o(r):o:""]},(0,_vn.getSlotVNs)(e.renderToolbarButton(i,a,r))))):l&&m.push(i(l,{props:Object.assign({},t,{content:t.content||t.name,options:void 0}),on:{click:e=>s.btnEvent(e,t)},scopedSlots:n&&n.length?{dropdowns:()=>s.renderDropdowns(i,t,!0)}:{}})))}),[i("div",{class:"vxe-button--prefix-wrapper"},r?(0,_vn.getSlotVNs)(r.call(s,{buttons:e||[],$grid:c,$gantt:p,$table:u})):[]),i("div",{class:"vxe-button--item-wrapper"},o?(0,_vn.getSlotVNs)(o.call(s,{buttons:e||[],$grid:c,$gantt:p,$table:u})):m),i("div",{class:"vxe-button--suffix-wrapper"},t?(0,_vn.getSlotVNs)(t.call(s,{buttons:e||[],$grid:c,$gantt:p,$table:u})):[])]},renderRightTools(s){let c=_ui.VxeUI.getComponent("VxeButton"),p=this;var e=p,t=p.$scopedSlots,o=p.internalData;let u=p.$xeGrid,m=p.$xeGantt;e=e.tools,o=o.connectTable;let d=o;var o=t.tools,r=t.toolPrefix||t["tool-prefix"],t=t.toolSuffix||t["tool-suffix"];let g=[];return e&&e.forEach((t,e)=>{var o,r,n,a,{dropdowns:i,toolRender:l}=t;!1!==t.visible&&(o=l?l.name:null,r=l?renderer.get(o):null,l&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,a={$grid:u,$gantt:m,$table:d,tool:t},g.push(s("span",{key:o,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(a):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(s,l,a))))):c&&g.push(s(c,{key:e,props:Object.assign({},t,{content:t.content||t.name,options:void 0}),on:{click:e=>p.tolEvent(e,t)},scopedSlots:i&&i.length?{dropdowns:()=>p.renderDropdowns(s,t,!1)}:{}})))}),[s("div",{class:"vxe-tool--prefix-wrapper"},r?(0,_vn.getSlotVNs)(r.call(p,{tools:e||[],$grid:u,$gantt:m,$table:d})):[]),s("div",{class:"vxe-tool--item-wrapper"},o?(0,_vn.getSlotVNs)(o.call(p,{tools:e||[],$grid:u,$gantt:m,$table:d})):g),s("div",{class:"vxe-tool--suffix-wrapper"},t?(0,_vn.getSlotVNs)(t.call(p,{tools:e||[],$grid:u,$gantt:m,$table:d})):[])]},renderToolImport(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computeImportOpts;return t?e(t,{key:"import",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_IMPORT,title:getI18n("vxe.toolbar.import")},on:{click:this.openImportEvent}}):renderEmptyElement(this)},renderToolExport(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computeExportOpts;return t?e(t,{key:"export",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_EXPORT,title:getI18n("vxe.toolbar.export")},on:{click:this.openExportEvent}}):renderEmptyElement(this)},renderToolPrint(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computePrintOpts;return t?e(t,{key:"print",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_PRINT,title:getI18n("vxe.toolbar.print")},on:{click:this.openPrintEvent}}):renderEmptyElement(this)},renderToolRefresh(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.reactData,r=this.computeRefreshOpts;return t?e(t,{key:"refresh",props:{circle:!0,icon:o.isRefresh?r.iconLoading||getIcon().TOOLBAR_TOOLS_REFRESH_LOADING:r.icon||getIcon().TOOLBAR_TOOLS_REFRESH,title:getI18n("vxe.toolbar.refresh")},on:{click:this.refreshEvent}}):renderEmptyElement(this)},renderToolZoom(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this,r=o.$xeGrid||o.$xeGantt,n=o.computeZoomOpts;return r&&t?e(t,{key:"zoom",props:{circle:!0,icon:r.isMaximized()?n.iconOut||getIcon().TOOLBAR_TOOLS_MINIMIZE:n.iconIn||getIcon().TOOLBAR_TOOLS_FULLSCREEN,title:getI18n("vxe.toolbar.zoom"+(r.isMaximized()?"Out":"In"))},on:{click:o.zoomEvent}}):renderEmptyElement(o)},renderToolCustom(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this,r=o.computeCustomOpts,n=o.computeTrigger,a={};return"manual"!==n&&("hover"===n?(a.mouseenter=o.handleMouseenterSettingEvent,a.mouseleave=o.handleMouseleaveSettingEvent):a.click=o.handleClickSettingEvent),t?e(t,{key:"custom",props:{circle:!0,icon:r.icon||getIcon().TOOLBAR_TOOLS_CUSTOM,title:getI18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target"},on:a}):renderEmptyElement(o)},renderVN(e){var t=this,o=t,r=t.$xeGrid||t.$xeGantt,{perfect:n,loading:a,refresh:i,zoom:l,custom:s,className:c}=o,p=t.computeSize;return e("div",{ref:"refElem",class:["vxe-toolbar",c?_xeUtils.default.isFunction(c)?c({$toolbar:t}):c:"",{["size--"+p]:p,"is--perfect":n,"is--loading":a}]},[e("div",{class:"vxe-buttons--wrapper"},t.renderLeftBtns(e)),e("div",{class:"vxe-tools--wrapper"},t.renderRightTools(e)),e("div",{class:"vxe-tools--operate"},[o.import?t.renderToolImport(e):renderEmptyElement(t),o.export?t.renderToolExport(e):renderEmptyElement(t),o.print?t.renderToolPrint(e):renderEmptyElement(t),i?t.renderToolRefresh(e):renderEmptyElement(t),l&&r?t.renderToolZoom(e):renderEmptyElement(t),s?t.renderToolCustom(e):renderEmptyElement(t)])])}},created(){let o=this,r=o;var e=o.$xeGrid,t=o.$xeGantt;let n=e||t;o.$nextTick(()=>{var e=o.computeRefreshOpts,t=o.fintTable(),e=e.queryMethod||e.query,e=(!r.refresh||n||e||(0,_log.warnLog)("vxe.error.notFunc",["[toolbar] queryMethod"]),_xeUtils.default.isPlainObject(r.custom)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] custom={...}","custom=boolean & custom-options={...}"]),_xeUtils.default.isPlainObject(r.print)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] print={...}","print=boolean & print-options={...}"]),_xeUtils.default.isPlainObject(r.export)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] export={...}","export=boolean & export-options={...}"]),_xeUtils.default.isPlainObject(r.import)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] import={...}","import=boolean & import-options={...}"]),_xeUtils.default.isPlainObject(r.refresh)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] refresh={...}","refresh=boolean & refresh-options={...}"]),_xeUtils.default.isPlainObject(r.refresh)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] zoom={...}","zoom=boolean & zoom-options={...}"]),t&&t.connect(this),o.computeCustomOpts);e.isFooter&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] toolbar.custom.isFooter","table.custom-config.showFooter"]),e.showFooter&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] toolbar.custom.showFooter","table.custom-config.showFooter"]),e.immediate&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] toolbar.custom.immediate","table.custom-config.immediate"]),e.trigger&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] toolbar.custom.trigger","table.custom-config.trigger"])});e=_ui.VxeUI.getComponent("VxeButton");(r.refresh||r.import||r.export||r.print||r.zoom)&&!e&&(0,_log.errLog)("vxe.error.reqComp",["vxe-button"])},destroyed(){var e=this.internalData;_xeUtils.default.assign(e,createInternalData())},render(e){return this.renderVN(e)}});

package/lib/toolbar/style/style.css

@@ -61,10 +61,6 @@
   display: flex;
   align-items: center;
 }
-.vxe-toolbar .vxe-buttons--wrapper,
-.vxe-toolbar .vxe-tools--wrapper {
-  flex-wrap: wrap;
-}
 .vxe-toolbar .vxe-tools--operate {
   flex-shrink: 0;
 }
@@ -75,6 +71,26 @@
   background-color: var(--vxe-ui-toolbar-custom-active-background-color);
   border-radius: 50%;
 }
+.vxe-toolbar .vxe-button--item-wrapper,
+.vxe-toolbar .vxe-tool--item-wrapper {
+  flex-grow: 1;
+}
+.vxe-toolbar .vxe-button--prefix-wrapper,
+.vxe-toolbar .vxe-button--suffix-wrapper,
+.vxe-toolbar .vxe-tool--prefix-wrapper,
+.vxe-toolbar .vxe-tool--suffix-wrapper {
+  flex-shrink: 0;
+}
+.vxe-toolbar .vxe-button--item-wrapper,
+.vxe-toolbar .vxe-tool--item-wrapper,
+.vxe-toolbar .vxe-button--prefix-wrapper,
+.vxe-toolbar .vxe-button--suffix-wrapper,
+.vxe-toolbar .vxe-tool--prefix-wrapper,
+.vxe-toolbar .vxe-tool--suffix-wrapper {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+}
 
 .vxe-toolbar {
   font-size: var(--vxe-ui-font-size-default);

package/lib/toolbar/style/style.min.css

@@ -1 +1 @@
-.vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid var(--vxe-ui-table-border-color);border-bottom-width:0;background-color:var(--vxe-ui-table-header-background-color)}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--wrapper{flex-wrap:wrap}.vxe-toolbar .vxe-tools--operate{flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:var(--vxe-ui-toolbar-custom-active-background-color);border-radius:50%}.vxe-toolbar{font-size:var(--vxe-ui-font-size-default)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini)}
+.vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid var(--vxe-ui-table-border-color);border-bottom-width:0;background-color:var(--vxe-ui-table-header-background-color)}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-tools--operate{flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:var(--vxe-ui-toolbar-custom-active-background-color);border-radius:50%}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-tool--item-wrapper{flex-grow:1}.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{flex-shrink:0}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--item-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{display:flex;align-items:center;flex-wrap:wrap}.vxe-toolbar{font-size:var(--vxe-ui-font-size-default)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini)}

package/lib/ui/index.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
 exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
 var _core = require("@vxe-ui/core");
 var _utils = require("./src/utils");
-const version = exports.version = "3.19.24";
+const version = exports.version = "3.19.26";
 _core.VxeUI.version = version;
 _core.VxeUI.tableVersion = version;
 _core.VxeUI.setConfig({

package/lib/ui/index.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.19.24",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{autoOptions:{isCalcHeader:!0,isCalcBody:!0,isCalcFooter:!0},maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},menuConfig:{destroyOnClose:!0},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{destroyOnClose:!0,multiple:!0,showIcon:!0},floatingFilterConfig:{},aggregateConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0,showRootLine:!0},expandConfig:{showIcon:!0,mode:"fixed"},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isAll:!0,isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{gt:24,preSize:0,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:"list",result:"result",total:"page.total",footerData:"footerData",message:"message"}}},toolbar:{},gantt:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_MENU_OPTION_LOADING:iconPrefix+"repeat roll",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,i){return _core.VxeUI.modal.alert(e,o,i)},confirm(e,o,i){return _core.VxeUI.modal.confirm(e,o,i)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,i){return _core.VxeUI.modal.notification(e,o,i)}});var _default=exports.default=_core.VxeUI;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.19.26",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{autoOptions:{isCalcHeader:!0,isCalcBody:!0,isCalcFooter:!0},maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},menuConfig:{destroyOnClose:!0},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{destroyOnClose:!0,multiple:!0,showIcon:!0},floatingFilterConfig:{},aggregateConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0,showRootLine:!0},expandConfig:{showIcon:!0,mode:"fixed"},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isAll:!0,isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{gt:24,preSize:0,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:"list",result:"result",total:"page.total",footerData:"footerData",message:"message"}}},toolbar:{},gantt:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_MENU_OPTION_LOADING:iconPrefix+"repeat roll",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,i){return _core.VxeUI.modal.alert(e,o,i)},confirm(e,o,i){return _core.VxeUI.modal.confirm(e,o,i)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,i){return _core.VxeUI.modal.notification(e,o,i)}});var _default=exports.default=_core.VxeUI;

package/lib/ui/src/log.js

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `table v${"3.19.24"}`;
+const version = `table v${"3.19.26"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.19.24",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.19.26",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/lib/vxe-toolbar/style/style.css

@@ -61,10 +61,6 @@
   display: flex;
   align-items: center;
 }
-.vxe-toolbar .vxe-buttons--wrapper,
-.vxe-toolbar .vxe-tools--wrapper {
-  flex-wrap: wrap;
-}
 .vxe-toolbar .vxe-tools--operate {
   flex-shrink: 0;
 }
@@ -75,6 +71,26 @@
   background-color: var(--vxe-ui-toolbar-custom-active-background-color);
   border-radius: 50%;
 }
+.vxe-toolbar .vxe-button--item-wrapper,
+.vxe-toolbar .vxe-tool--item-wrapper {
+  flex-grow: 1;
+}
+.vxe-toolbar .vxe-button--prefix-wrapper,
+.vxe-toolbar .vxe-button--suffix-wrapper,
+.vxe-toolbar .vxe-tool--prefix-wrapper,
+.vxe-toolbar .vxe-tool--suffix-wrapper {
+  flex-shrink: 0;
+}
+.vxe-toolbar .vxe-button--item-wrapper,
+.vxe-toolbar .vxe-tool--item-wrapper,
+.vxe-toolbar .vxe-button--prefix-wrapper,
+.vxe-toolbar .vxe-button--suffix-wrapper,
+.vxe-toolbar .vxe-tool--prefix-wrapper,
+.vxe-toolbar .vxe-tool--suffix-wrapper {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+}
 
 .vxe-toolbar {
   font-size: var(--vxe-ui-font-size-default);

package/lib/vxe-toolbar/style/style.min.css

@@ -1 +1 @@
-.vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid var(--vxe-ui-table-border-color);border-bottom-width:0;background-color:var(--vxe-ui-table-header-background-color)}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--wrapper{flex-wrap:wrap}.vxe-toolbar .vxe-tools--operate{flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:var(--vxe-ui-toolbar-custom-active-background-color);border-radius:50%}.vxe-toolbar{font-size:var(--vxe-ui-font-size-default)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini)}
+.vxe-toolbar{position:relative;display:flex;flex-direction:row;align-items:center;padding:.6em 0;color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);background-color:var(--vxe-ui-layout-background-color)}.vxe-toolbar:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-toolbar.is--perfect{border:1px solid var(--vxe-ui-table-border-color);border-bottom-width:0;background-color:var(--vxe-ui-table-header-background-color)}.vxe-toolbar.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:999;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:var(--vxe-ui-loading-background-color)}.vxe-toolbar .vxe-buttons--wrapper{flex-grow:1}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button+.vxe-button--item,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button,.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item+.vxe-button--item{margin-left:.8em}.vxe-toolbar .vxe-buttons--wrapper>.vxe-button--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button+.vxe-tool--item,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-button,.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item+.vxe-tool--item{margin-left:.8em}.vxe-toolbar .vxe-tools--wrapper>.vxe-tool--item{display:inline-block}.vxe-toolbar .vxe-tools--wrapper>.vxe-button{display:flex;align-items:center;justify-content:center}.vxe-toolbar .vxe-buttons--wrapper,.vxe-toolbar .vxe-tools--operate,.vxe-toolbar .vxe-tools--wrapper{display:flex;align-items:center}.vxe-toolbar .vxe-tools--operate{flex-shrink:0}.vxe-toolbar .vxe-custom--wrapper{position:relative}.vxe-toolbar .vxe-custom--wrapper.is--active>.vxe-button{background-color:var(--vxe-ui-toolbar-custom-active-background-color);border-radius:50%}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-tool--item-wrapper{flex-grow:1}.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{flex-shrink:0}.vxe-toolbar .vxe-button--item-wrapper,.vxe-toolbar .vxe-button--prefix-wrapper,.vxe-toolbar .vxe-button--suffix-wrapper,.vxe-toolbar .vxe-tool--item-wrapper,.vxe-toolbar .vxe-tool--prefix-wrapper,.vxe-toolbar .vxe-tool--suffix-wrapper{display:flex;align-items:center;flex-wrap:wrap}.vxe-toolbar{font-size:var(--vxe-ui-font-size-default)}.vxe-toolbar.size--medium{font-size:var(--vxe-ui-font-size-medium)}.vxe-toolbar.size--small{font-size:var(--vxe-ui-font-size-small)}.vxe-toolbar.size--mini{font-size:var(--vxe-ui-font-size-mini)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.19.24",
+  "version": "3.19.26",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -67,8 +67,7 @@
     "vue": "~2.6.14",
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
-    "vue-template-compiler": "2.6.14",
-    "vxe-gantt": "~3.0.26"
+    "vue-template-compiler": "2.6.14"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/toolbar/src/toolbar.ts

@@ -472,12 +472,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { buttons } = props
       const { connectTable } = internalData
       const $table = connectTable
+      const buttonsSlot = slots.buttons
       const buttonPrefixSlot = slots.buttonPrefix || slots['button-prefix']
       const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix']
       const btnVNs: VxeComponentSlotType[] = []
-      if (buttonPrefixSlot) {
-        btnVNs.push(...getSlotVNs(buttonPrefixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })))
-      }
       if (buttons) {
         buttons.forEach((item) => {
           const { dropdowns, buttonRender } = item
@@ -514,10 +512,17 @@ export default /* define-vxe-component start */ defineVxeComponent({
           }
         })
       }
-      if (buttonSuffixSlot) {
-        btnVNs.push(...getSlotVNs(buttonSuffixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })))
-      }
-      return btnVNs
+      return [
+        h('div', {
+          class: 'vxe-button--prefix-wrapper'
+        }, buttonPrefixSlot ? getSlotVNs(buttonPrefixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : []),
+        h('div', {
+          class: 'vxe-button--item-wrapper'
+        }, buttonsSlot ? getSlotVNs(buttonsSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : btnVNs),
+        h('div', {
+          class: 'vxe-button--suffix-wrapper'
+        }, buttonSuffixSlot ? getSlotVNs(buttonSuffixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : [])
+      ]
     },
     /**
      * 渲染右侧工具
@@ -536,12 +541,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { tools } = props
       const { connectTable } = internalData
       const $table = connectTable
+      const toolsSlot = slots.tools
       const toolPrefixSlot = slots.toolPrefix || slots['tool-prefix']
       const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix']
       const btnVNs: VxeComponentSlotType[] = []
-      if (toolPrefixSlot) {
-        btnVNs.push(...getSlotVNs(toolPrefixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })))
-      }
       if (tools) {
         tools.forEach((item, tIndex) => {
           const { dropdowns, toolRender } = item
@@ -581,10 +584,17 @@ export default /* define-vxe-component start */ defineVxeComponent({
           }
         })
       }
-      if (toolSuffixSlot) {
-        btnVNs.push(...getSlotVNs(toolSuffixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })))
-      }
-      return btnVNs
+      return [
+        h('div', {
+          class: 'vxe-tool--prefix-wrapper'
+        }, toolPrefixSlot ? getSlotVNs(toolPrefixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : []),
+        h('div', {
+          class: 'vxe-tool--item-wrapper'
+        }, toolsSlot ? getSlotVNs(toolsSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : btnVNs),
+        h('div', {
+          class: 'vxe-tool--suffix-wrapper'
+        }, toolSuffixSlot ? getSlotVNs(toolSuffixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })) : [])
+      ]
     },
     renderToolImport  (h: CreateElement) {
       // 使用已安装的组件，如果未安装则不渲染
@@ -734,17 +744,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
     renderVN  (h: CreateElement): VNode {
       const $xeToolbar = this
       const props = $xeToolbar
-      const slots = $xeToolbar.$scopedSlots
-      const internalData = $xeToolbar.internalData
       const $xeGrid = $xeToolbar.$xeGrid
       const $xeGantt = $xeToolbar.$xeGantt
       const $xeGGWrapper = $xeGrid || $xeGantt
 
       const { perfect, loading, refresh, zoom, custom, className } = props
-      const { connectTable } = internalData
-      const $table = connectTable
-      const toolsSlot = slots.tools
-      const buttonsSlot = slots.buttons
       const vSize = $xeToolbar.computeSize
       return h('div', {
         ref: 'refElem',
@@ -756,10 +760,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }, [
         h('div', {
           class: 'vxe-buttons--wrapper'
-        }, buttonsSlot ? buttonsSlot({ $grid: $xeGrid, $gantt: $xeGantt, $table: $table }) : $xeToolbar.renderLeftBtns(h)),
+        }, $xeToolbar.renderLeftBtns(h)),
         h('div', {
           class: 'vxe-tools--wrapper'
-        }, toolsSlot ? toolsSlot({ $grid: $xeGrid, $gantt: $xeGantt, $table: $table }) : $xeToolbar.renderRightTools(h)),
+        }, $xeToolbar.renderRightTools(h)),
         h('div', {
           class: 'vxe-tools--operate'
         }, [

package/styles/components/toolbar.scss

@@ -68,10 +68,6 @@
     display: flex;
     align-items: center;
   }
-  .vxe-buttons--wrapper,
-  .vxe-tools--wrapper {
-    flex-wrap: wrap;
-  }
   .vxe-tools--operate {
     flex-shrink: 0;
   }
@@ -84,6 +80,26 @@
       }
     }
   }
+  .vxe-button--item-wrapper,
+  .vxe-tool--item-wrapper {
+    flex-grow: 1;
+  }
+  .vxe-button--prefix-wrapper,
+  .vxe-button--suffix-wrapper,
+  .vxe-tool--prefix-wrapper,
+  .vxe-tool--suffix-wrapper {
+    flex-shrink: 0;
+  }
+  .vxe-button--item-wrapper,
+  .vxe-tool--item-wrapper,
+  .vxe-button--prefix-wrapper,
+  .vxe-button--suffix-wrapper,
+  .vxe-tool--prefix-wrapper,
+  .vxe-tool--suffix-wrapper {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+  }
 }
 
 .vxe-toolbar {