vxe-table 3.19.24 → 3.19.26

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.19.24";
+const version = "3.19.26";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2715,7 +2715,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.19.24"}`;
+const log_version = `table v${"3.19.26"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -20245,17 +20245,10 @@ function toolbar_createInternalData() {
         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(...getSlotVNs(buttonPrefixSlot.call($xeToolbar, {
-          buttons: buttons || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        })));
-      }
       if (buttons) {
         buttons.forEach(item => {
           const {
@@ -20294,15 +20287,28 @@ function toolbar_createInternalData() {
           }
         });
       }
-      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
+      })) : [])];
     },
     /**
      * 渲染右侧工具
@@ -20323,17 +20329,10 @@ function toolbar_createInternalData() {
         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(...getSlotVNs(toolPrefixSlot.call($xeToolbar, {
-          tools: tools || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        })));
-      }
       if (tools) {
         tools.forEach((item, tIndex) => {
           const {
@@ -20375,15 +20374,28 @@ function toolbar_createInternalData() {
           }
         });
       }
-      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) {
       // 使用已安装的组件，如果未安装则不渲染
@@ -20505,8 +20517,6 @@ function toolbar_createInternalData() {
     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;
@@ -20518,12 +20528,6 @@ function toolbar_createInternalData() {
         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',
@@ -20536,17 +20540,9 @@ function toolbar_createInternalData() {
         }]
       }, [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) : toolbar_renderEmptyElement($xeToolbar), props.export ? $xeToolbar.renderToolExport(h) : toolbar_renderEmptyElement($xeToolbar), props.print ? $xeToolbar.renderToolPrint(h) : toolbar_renderEmptyElement($xeToolbar), refresh ? $xeToolbar.renderToolRefresh(h) : toolbar_renderEmptyElement($xeToolbar), zoom && $xeGGWrapper ? $xeToolbar.renderToolZoom(h) : toolbar_renderEmptyElement($xeToolbar), custom ? $xeToolbar.renderToolCustom(h) : toolbar_renderEmptyElement($xeToolbar)])]);
     }