diff --git a/src/control/toolbar/toolbar.tsx b/src/control/toolbar/toolbar.tsx index 7a6ba370e2949b2d02c4a7cc996594a3e181cf9a..cdbe5337009fd89a0845d4f50b3ce51808c6be5a 100644 --- a/src/control/toolbar/toolbar.tsx +++ b/src/control/toolbar/toolbar.tsx @@ -31,6 +31,11 @@ const btnContent = (item: IDEToolbarItem): (string | VNode)[] => { return result; }; +// 计算系统样式表名称 +const calcCssName = (item: IDETBGroupItem | IDETBUIActionItem) => { + return item?.sysCss?.cssName; +}; + export const ToolbarControl = defineComponent({ name: 'IBizToolbarControl', props: { @@ -59,11 +64,6 @@ export const ToolbarControl = defineComponent({ await c.onItemClick(item, event, params); }; - // 计算系统样式表名称 - const calcCssName = (item: IDETBGroupItem | IDETBUIActionItem) => { - return item?.sysCss?.cssName; - }; - const renderExtraButtons = (extraButtons: IExtraButton[]): VNode[] => { return extraButtons.map(button => { return ( @@ -86,14 +86,20 @@ export const ToolbarControl = defineComponent({ detoolbarItems.findIndex( item2 => c.state.buttonsState[item2.id!].loading, ) !== -1; + const groupButtonStyle = (item as IData)?.buttonStyle || ''; return ( @@ -177,9 +183,7 @@ export const ToolbarControl = defineComponent({ }, title: () => { return ( - - {btnContent(item)} - + {btnContent(item)} ); }, }}