vxe-table 3.19.25 → 3.19.26

package/packages/toolbar/src/toolbar.ts

@@ -475,69 +475,54 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const buttonsSlot = slots.buttons
       const buttonPrefixSlot = slots.buttonPrefix || slots['button-prefix']
       const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix']
-      const lbVNs: VxeComponentSlotType[] = []
-      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: VxeComponentSlotType[] = []
-        if (buttons) {
-          buttons.forEach((item) => {
-            const { dropdowns, buttonRender } = item
-            if (item.visible !== false) {
-              const compConf = buttonRender ? renderer.get(buttonRender.name) : null
-              if (buttonRender && compConf && compConf.renderToolbarButton) {
-                const toolbarButtonClassName = compConf.toolbarButtonClassName
-                const params = { $grid: $xeGrid, $gantt: $xeGantt, $table: $table!, button: item }
+      const btnVNs: VxeComponentSlotType[] = []
+      if (buttons) {
+        buttons.forEach((item) => {
+          const { dropdowns, buttonRender } = item
+          if (item.visible !== false) {
+            const compConf = buttonRender ? 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 ? (XEUtils.isFunction(toolbarButtonClassName) ? toolbarButtonClassName(params) : toolbarButtonClassName) : '']
+                }, getSlotVNs(compConf.renderToolbarButton(h, buttonRender, params)))
+              )
+            } else {
+              if (VxeUIButtonComponent) {
                 btnVNs.push(
-                  h('span', {
-                    class: ['vxe-button--item', toolbarButtonClassName ? (XEUtils.isFunction(toolbarButtonClassName) ? toolbarButtonClassName(params) : toolbarButtonClassName) : '']
-                  }, getSlotVNs(compConf.renderToolbarButton(h, buttonRender, params)))
+                  h(VxeUIButtonComponent, {
+                    props: Object.assign({}, item, {
+                      content: item.content || item.name,
+                      options: undefined
+                    }),
+                    on: {
+                      click: (eventParams: VxeButtonDefines.ClickEventParams) => $xeToolbar.btnEvent(eventParams, item)
+                    },
+                    scopedSlots: dropdowns && dropdowns.length
+                      ? {
+                          dropdowns: () => $xeToolbar.renderDropdowns(h, item, true)
+                        }
+                      : {}
+                  })
                 )
-              } else {
-                if (VxeUIButtonComponent) {
-                  btnVNs.push(
-                    h(VxeUIButtonComponent, {
-                      props: Object.assign({}, item, {
-                        content: item.content || item.name,
-                        options: undefined
-                      }),
-                      on: {
-                        click: (eventParams: VxeButtonDefines.ClickEventParams) => $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 })) : [])
+      ]
     },
     /**
      * 渲染右侧工具
@@ -559,72 +544,57 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const toolsSlot = slots.tools
       const toolPrefixSlot = slots.toolPrefix || slots['tool-prefix']
       const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix']
-      const rtVNs: VxeComponentSlotType[] = []
-      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: VxeComponentSlotType[] = []
-        if (tools) {
-          tools.forEach((item, tIndex) => {
-            const { dropdowns, toolRender } = item
-            if (item.visible !== false) {
-              const rdName = toolRender ? toolRender.name : null
-              const compConf = toolRender ? renderer.get(rdName) : null
-              if (toolRender && compConf && compConf.renderToolbarTool) {
-                const toolbarToolClassName = compConf.toolbarToolClassName
-                const params = { $grid: $xeGrid, $gantt: $xeGantt, $table: $table!, tool: item }
+      const btnVNs: VxeComponentSlotType[] = []
+      if (tools) {
+        tools.forEach((item, tIndex) => {
+          const { dropdowns, toolRender } = item
+          if (item.visible !== false) {
+            const rdName = toolRender ? toolRender.name : null
+            const compConf = toolRender ? 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 as string,
+                  class: ['vxe-tool--item', toolbarToolClassName ? (XEUtils.isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName) : '']
+                }, getSlotVNs(compConf.renderToolbarTool(h, toolRender, params)))
+              )
+            } else {
+              if (VxeUIButtonComponent) {
                 btnVNs.push(
-                  h('span', {
-                    key: rdName as string,
-                    class: ['vxe-tool--item', toolbarToolClassName ? (XEUtils.isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName) : '']
-                  }, getSlotVNs(compConf.renderToolbarTool(h, toolRender, params)))
+                  h(VxeUIButtonComponent, {
+                    key: tIndex,
+                    props: Object.assign({}, item, {
+                      content: item.content || item.name,
+                      options: undefined
+                    }),
+                    on: {
+                      click: (eventParams: VxeButtonDefines.ClickEventParams) => $xeToolbar.tolEvent(eventParams, item)
+                    },
+                    scopedSlots: dropdowns && dropdowns.length
+                      ? {
+                          dropdowns: () => $xeToolbar.renderDropdowns(h, item, false)
+                        }
+                      : {}
+                  })
                 )
-              } else {
-                if (VxeUIButtonComponent) {
-                  btnVNs.push(
-                    h(VxeUIButtonComponent, {
-                      key: tIndex,
-                      props: Object.assign({}, item, {
-                        content: item.content || item.name,
-                        options: undefined
-                      }),
-                      on: {
-                        click: (eventParams: VxeButtonDefines.ClickEventParams) => $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: CreateElement) {
       // 使用已安装的组件，如果未安装则不渲染

package/styles/components/toolbar.scss

@@ -81,6 +81,16 @@
     }
   }
   .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,
@@ -88,7 +98,6 @@
   .vxe-tool--suffix-wrapper {
     display: flex;
     align-items: center;
-    flex-shrink: 0;
     flex-wrap: wrap;
   }
 }