diff --git a/CHANGELOG.md b/CHANGELOG.md index bb147a39fcf69607a6a2e421364cbc839b30f471..ab5810a5a4130b8f3e7832eec3da58710e6d51e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,10 @@ - 悬浮编辑模式下的编辑器样式调整,统一间距 - internalMessage支持content_type的HTML类型,适配未读状态 +### Fixed + +- 修复树右键菜单,图标绘制不正确未对齐 + ### Changed - 优化表单多数据部件表格无数据样式 diff --git a/src/control/context-menu/context-menu.scss b/src/control/context-menu/context-menu.scss index 04d372b157f02131ffc0d64a9a4361fda8f08486..e962393fd037a45ffef32eec073b4d466b00b281 100644 --- a/src/control/context-menu/context-menu.scss +++ b/src/control/context-menu/context-menu.scss @@ -21,11 +21,26 @@ popover-button-hover-bg: getCssVar(color, bg, 0), margin: getCssVar(context-menu, item-margin); } - .#{bem(icon)} { - margin-right: 3px; + .#{bem('context-menu','action-content-icon')} { + margin-right: 3px; } } + @include e('action-content'){ + display: flex; + } + + + @include e('action-content-icon') { + @include flex(row, center, center); + + width: 20px; + } + + @include e('action-content-caption'){ + @include flex(row, center, center); + } + @include e(popover) { @include set-component-css-var(context-menu, $context-menu); @@ -51,7 +66,7 @@ popover-button-hover-bg: getCssVar(color, bg, 0), background-color: getCssVar(context-menu, popover-button-hover-bg); } - .#{bem(icon)} { + .#{bem('context-menu','action-content-icon')} { margin-right: 6px; } } diff --git a/src/control/context-menu/context-menu.tsx b/src/control/context-menu/context-menu.tsx index 4750d30386a84e0f83413ccb7df99f100a3b4e62..43ebbad3fa36857e55422343e18715e390b6f6a3 100644 --- a/src/control/context-menu/context-menu.tsx +++ b/src/control/context-menu/context-menu.tsx @@ -169,10 +169,21 @@ export const ContextMenuControl = defineComponent({ disabled={this.c.state.buttonsState[detail.id!].disabled} class={this.calcActionItemClass(detail)} > - {detail.showIcon && detail.sysImage && ( - - )} - {detail.showCaption ? detail.caption : ''} +
+ {detail.showIcon && detail.sysImage && ( +
+ +
+ )} + + {detail.showCaption ? ( +
+ {detail.caption} +
+ ) : ( + '' + )} +
, ]; }