vxe-table 3.19.25 → 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.25";
+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.25"}`;
+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
@@ -20248,80 +20248,67 @@ function toolbar_createInternalData() {
       const buttonsSlot = slots.buttons;
       const buttonPrefixSlot = slots.buttonPrefix || slots['button-prefix'];
       const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix'];
-      const lbVNs = [];
-      if (buttonPrefixSlot) {
-        lbVNs.push(h('span', {
-          key: 'tbp',
-          class: 'vxe-button--prefix-wrapper'
-        }, getSlotVNs(buttonPrefixSlot.call($xeToolbar, {
-          buttons: buttons || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        }))));
-      }
-      if (buttons || buttonsSlot) {
-        const btnVNs = [];
-        if (buttons) {
-          buttons.forEach(item => {
-            const {
-              dropdowns,
-              buttonRender
-            } = item;
-            if (item.visible !== false) {
-              const compConf = buttonRender ? toolbar_renderer.get(buttonRender.name) : null;
-              if (buttonRender && compConf && compConf.renderToolbarButton) {
-                const toolbarButtonClassName = compConf.toolbarButtonClassName;
-                const params = {
-                  $grid: $xeGrid,
-                  $gantt: $xeGantt,
-                  $table: $table,
-                  button: item
-                };
-                btnVNs.push(h('span', {
-                  class: ['vxe-button--item', toolbarButtonClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(toolbarButtonClassName) ? toolbarButtonClassName(params) : toolbarButtonClassName : '']
-                }, getSlotVNs(compConf.renderToolbarButton(h, buttonRender, params))));
-              } else {
-                if (VxeUIButtonComponent) {
-                  btnVNs.push(h(VxeUIButtonComponent, {
-                    props: Object.assign({}, item, {
-                      content: item.content || item.name,
-                      options: undefined
-                    }),
-                    on: {
-                      click: eventParams => $xeToolbar.btnEvent(eventParams, item)
-                    },
-                    scopedSlots: dropdowns && dropdowns.length ? {
-                      dropdowns: () => $xeToolbar.renderDropdowns(h, item, true)
-                    } : {}
-                  }));
-                }
+      const btnVNs = [];
+      if (buttons) {
+        buttons.forEach(item => {
+          const {
+            dropdowns,
+            buttonRender
+          } = item;
+          if (item.visible !== false) {
+            const compConf = buttonRender ? toolbar_renderer.get(buttonRender.name) : null;
+            if (buttonRender && compConf && compConf.renderToolbarButton) {
+              const toolbarButtonClassName = compConf.toolbarButtonClassName;
+              const params = {
+                $grid: $xeGrid,
+                $gantt: $xeGantt,
+                $table: $table,
+                button: item
+              };
+              btnVNs.push(h('span', {
+                class: ['vxe-button--item', toolbarButtonClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(toolbarButtonClassName) ? toolbarButtonClassName(params) : toolbarButtonClassName : '']
+              }, getSlotVNs(compConf.renderToolbarButton(h, buttonRender, params))));
+            } else {
+              if (VxeUIButtonComponent) {
+                btnVNs.push(h(VxeUIButtonComponent, {
+                  props: Object.assign({}, item, {
+                    content: item.content || item.name,
+                    options: undefined
+                  }),
+                  on: {
+                    click: eventParams => $xeToolbar.btnEvent(eventParams, item)
+                  },
+                  scopedSlots: dropdowns && dropdowns.length ? {
+                    dropdowns: () => $xeToolbar.renderDropdowns(h, item, true)
+                  } : {}
+                }));
               }
             }
-          });
-        }
-        lbVNs.push(h('span', {
-          key: 'tti',
-          class: 'vxe-button--item-wrapper'
-        }, buttonsSlot ? getSlotVNs(buttonsSlot.call($xeToolbar, {
-          buttons: buttons || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        })) : btnVNs));
-      }
-      if (buttonSuffixSlot) {
-        lbVNs.push(h('span', {
-          key: 'tbs',
-          class: 'vxe-button--suffix-wrapper'
-        }, getSlotVNs(buttonSuffixSlot.call($xeToolbar, {
-          buttons: buttons || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        }))));
+          }
+        });
       }
-      return lbVNs;
+      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
+      })) : [])];
     },
     /**
      * 渲染右侧工具
@@ -20345,83 +20332,70 @@ function toolbar_createInternalData() {
       const toolsSlot = slots.tools;
       const toolPrefixSlot = slots.toolPrefix || slots['tool-prefix'];
       const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix'];
-      const rtVNs = [];
-      if (toolPrefixSlot) {
-        rtVNs.push(h('span', {
-          key: 'ttp',
-          class: 'vxe-tool--prefix-wrapper'
-        }, getSlotVNs(toolPrefixSlot.call($xeToolbar, {
-          tools: tools || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        }))));
-      }
-      if (tools || toolsSlot) {
-        const btnVNs = [];
-        if (tools) {
-          tools.forEach((item, tIndex) => {
-            const {
-              dropdowns,
-              toolRender
-            } = item;
-            if (item.visible !== false) {
-              const rdName = toolRender ? toolRender.name : null;
-              const compConf = toolRender ? toolbar_renderer.get(rdName) : null;
-              if (toolRender && compConf && compConf.renderToolbarTool) {
-                const toolbarToolClassName = compConf.toolbarToolClassName;
-                const params = {
-                  $grid: $xeGrid,
-                  $gantt: $xeGantt,
-                  $table: $table,
-                  tool: item
-                };
-                btnVNs.push(h('span', {
-                  key: rdName,
-                  class: ['vxe-tool--item', toolbarToolClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName : '']
-                }, getSlotVNs(compConf.renderToolbarTool(h, toolRender, params))));
-              } else {
-                if (VxeUIButtonComponent) {
-                  btnVNs.push(h(VxeUIButtonComponent, {
-                    key: tIndex,
-                    props: Object.assign({}, item, {
-                      content: item.content || item.name,
-                      options: undefined
-                    }),
-                    on: {
-                      click: eventParams => $xeToolbar.tolEvent(eventParams, item)
-                    },
-                    scopedSlots: dropdowns && dropdowns.length ? {
-                      dropdowns: () => $xeToolbar.renderDropdowns(h, item, false)
-                    } : {}
-                  }));
-                }
+      const btnVNs = [];
+      if (tools) {
+        tools.forEach((item, tIndex) => {
+          const {
+            dropdowns,
+            toolRender
+          } = item;
+          if (item.visible !== false) {
+            const rdName = toolRender ? toolRender.name : null;
+            const compConf = toolRender ? toolbar_renderer.get(rdName) : null;
+            if (toolRender && compConf && compConf.renderToolbarTool) {
+              const toolbarToolClassName = compConf.toolbarToolClassName;
+              const params = {
+                $grid: $xeGrid,
+                $gantt: $xeGantt,
+                $table: $table,
+                tool: item
+              };
+              btnVNs.push(h('span', {
+                key: rdName,
+                class: ['vxe-tool--item', toolbarToolClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName : '']
+              }, getSlotVNs(compConf.renderToolbarTool(h, toolRender, params))));
+            } else {
+              if (VxeUIButtonComponent) {
+                btnVNs.push(h(VxeUIButtonComponent, {
+                  key: tIndex,
+                  props: Object.assign({}, item, {
+                    content: item.content || item.name,
+                    options: undefined
+                  }),
+                  on: {
+                    click: eventParams => $xeToolbar.tolEvent(eventParams, item)
+                  },
+                  scopedSlots: dropdowns && dropdowns.length ? {
+                    dropdowns: () => $xeToolbar.renderDropdowns(h, item, false)
+                  } : {}
+                }));
               }
             }
-          });
-        }
-        rtVNs.push(h('span', {
-          key: 'tti',
-          class: 'vxe-tool--item-wrapper'
-        }, toolsSlot ? getSlotVNs(toolsSlot.call($xeToolbar, {
-          tools: tools || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        })) : btnVNs));
-      }
-      if (toolSuffixSlot) {
-        rtVNs.push(h('span', {
-          key: 'tts',
-          class: 'vxe-tool--suffix-wrapper'
-        }, getSlotVNs(toolSuffixSlot.call($xeToolbar, {
-          tools: tools || [],
-          $grid: $xeGrid,
-          $gantt: $xeGantt,
-          $table: $table
-        }))));
+          }
+        });
       }
-      return rtVNs;
+      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) {
       // 使用已安装的组件，如果未安装则不渲染