vxe-table 4.17.24 → 4.17.26

package/lib/index.umd.js

@@ -3141,7 +3141,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.17.24";
+const version = "4.17.26";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3656,7 +3656,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.17.24"}`;
+const log_version = `table v${"4.17.26"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -20417,17 +20417,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({
-          buttons: buttons || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        })));
-      }
       if (buttons) {
         buttons.forEach((item, index) => {
           const {
@@ -20465,15 +20458,28 @@ function toolbar_createInternalData() {
           }
         });
       }
-      if (buttonSuffixSlot) {
-        btnVNs.push(...getSlotVNs(buttonSuffixSlot({
-          buttons: buttons || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        })));
-      }
-      return btnVNs;
+      return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-button--prefix-wrapper'
+      }, buttonPrefixSlot ? getSlotVNs(buttonPrefixSlot({
+        buttons: buttons || [],
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
+        $table: $table
+      })) : []), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-button--item-wrapper'
+      }, buttonsSlot ? getSlotVNs(buttonsSlot({
+        buttons: buttons || [],
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
+        $table: $table
+      })) : btnVNs), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-button--suffix-wrapper'
+      }, buttonSuffixSlot ? getSlotVNs(buttonSuffixSlot({
+        buttons: buttons || [],
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
+        $table: $table
+      })) : [])];
     };
     /**
      * 渲染右侧工具
@@ -20486,17 +20492,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({
-          tools: tools || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        })));
-      }
       if (tools) {
         tools.forEach((item, tIndex) => {
           const {
@@ -20535,15 +20534,28 @@ function toolbar_createInternalData() {
           }
         });
       }
-      if (toolSuffixSlot) {
-        btnVNs.push(...getSlotVNs(toolSuffixSlot({
-          tools: tools || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        })));
-      }
-      return btnVNs;
+      return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-tool--prefix-wrapper'
+      }, toolPrefixSlot ? getSlotVNs(toolPrefixSlot({
+        tools: tools || [],
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
+        $table: $table
+      })) : []), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-tool--item-wrapper'
+      }, toolsSlot ? getSlotVNs(toolsSlot({
+        tools: tools || [],
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
+        $table: $table
+      })) : btnVNs), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-tool--suffix-wrapper'
+      }, toolSuffixSlot ? getSlotVNs(toolSuffixSlot({
+        tools: tools || [],
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
+        $table: $table
+      })) : [])];
     };
     const renderToolImport = () => {
       const importOpts = computeImportOpts.value;
@@ -20627,13 +20639,7 @@ function toolbar_createInternalData() {
         custom,
         className
       } = props;
-      const {
-        connectTable
-      } = internalData;
       const vSize = computeSize.value;
-      const toolsSlot = slots.tools;
-      const buttonsSlot = slots.buttons;
-      const $table = connectTable;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refElem,
         class: ['vxe-toolbar', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
@@ -20645,17 +20651,9 @@ function toolbar_createInternalData() {
         }]
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-buttons--wrapper'
-      }, buttonsSlot ? buttonsSlot({
-        $grid: $xeGrid,
-        $gantt: $xeGantt,
-        $table: $table
-      }) : renderLeftBtns()), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, renderLeftBtns()), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-tools--wrapper'
-      }, toolsSlot ? toolsSlot({
-        $grid: $xeGrid,
-        $gantt: $xeGantt,
-        $table: $table
-      }) : renderRightTools()), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, renderRightTools()), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-tools--operate'
       }, [props.import ? renderToolImport() : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), props.export ? renderToolExport() : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), props.print ? renderToolPrint() : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), refresh ? renderToolRefresh() : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), zoom && $xeGGWrapper ? renderToolZoom() : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), custom ? renderToolCustom() : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]);
     };