Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(drawing-ui): fix incomplete display of drawing panel styles (#2387)
白熱9831db9f92f7
diff --git a/packages/drawing-ui/src/views/panel/DrawingArrange.tsx b/packages/drawing-ui/src/views/panel/DrawingArrange.tsxindex 7185bdbc3a..9f2b4bb36f 100644--- a/packages/drawing-ui/src/views/panel/DrawingArrange.tsx+++ b/packages/drawing-ui/src/views/panel/DrawingArrange.tsx@@ -86,28 +86,40 @@ export const DrawingArrange = (props: IDrawingArrangeProps) => {<div className={styles.imageCommonPanelRow}><div className={clsx(styles.imageCommonPanelColumn, styles.imageCommonPanelSpan2)}><Button size="small" onClick={() => { onArrangeBtnClick(ArrangeTypeEnum.forward); }}>- <div className={clsx(styles.imageCommonPanelInline)}><MoveUpSingle /></div>- <div className={clsx(styles.imageCommonPanelInline)}>{localeService.t('image-panel.arrange.forward')}</div>+ <span className={styles.imageCommonPanelInline}>+ <MoveUpSingle />+ {localeService.t('image-panel.arrange.forward')}+ </span>+</Button></div><div className={clsx(styles.imageCommonPanelColumn, styles.imageCommonPanelSpan2)}><Button size="small" onClick={() => { onArrangeBtnClick(ArrangeTypeEnum.backward); }}>- <div className={clsx(styles.imageCommonPanelInline)}><MoveDownSingle /></div>- <div className={clsx(styles.imageCommonPanelInline)}>{localeService.t('image-panel.arrange.backward')}</div>+ <span className={styles.imageCommonPanelInline}>+ <MoveDownSingle />+ {localeService.t('image-panel.arrange.backward')}+ </span>+</Button></div></div><div className={styles.imageCommonPanelRow}><div className={clsx(styles.imageCommonPanelColumn, styles.imageCommonPanelSpan2)}><Button size="small" onClick={() => { onArrangeBtnClick(ArrangeTypeEnum.front); }}>- <div className={clsx(styles.imageCommonPanelInline)}><TopmostSingle /></div>- <div className={clsx(styles.imageCommonPanelInline)}>{localeService.t('image-panel.arrange.front')}</div>+ <span className={styles.imageCommonPanelInline}>+ <TopmostSingle />+ {localeService.t('image-panel.arrange.front')}+ </span>+</Button></div><div className={clsx(styles.imageCommonPanelColumn, styles.imageCommonPanelSpan2)}><Button size="small" onClick={() => { onArrangeBtnClick(ArrangeTypeEnum.back); }}>- <div className={clsx(styles.imageCommonPanelInline)}><BottomSingle /></div>- <div className={clsx(styles.imageCommonPanelInline)}>{localeService.t('image-panel.arrange.back')}</div>+ <span className={styles.imageCommonPanelInline}>+ <BottomSingle />+ {localeService.t('image-panel.arrange.back')}+ </span>+</Button></div></div>diff --git a/packages/drawing-ui/src/views/panel/DrawingGroup.tsx b/packages/drawing-ui/src/views/panel/DrawingGroup.tsxindex 3cab56dfec..ea41398ce7 100644--- a/packages/drawing-ui/src/views/panel/DrawingGroup.tsx+++ b/packages/drawing-ui/src/views/panel/DrawingGroup.tsx@@ -192,20 +192,26 @@ export const DrawingGroup = (props: IDrawingGroupProps) => {<div className={styles.imageCommonPanelRow}><div className={clsx(styles.imageCommonPanelColumn, styles.imageCommonPanelSpan2, styles.imageCommonPanelColumnCenter)}><Button size="small" onClick={() => { onGroupBtnClick(); }} style={{ display: gridDisplay(groupBtnShow) }}>- <div className={clsx(styles.imageCommonPanelInline)}><GroupSingle /></div>- <div className={clsx(styles.imageCommonPanelInline)}>{localeService.t('image-panel.group.group')}</div>+ <span className={styles.imageCommonPanelInline}>+ <GroupSingle />+ {localeService.t('image-panel.group.group')}+ </span></Button></div>{/* <div className={clsx(styles.imageCommonPanelColumn, styles.imageCommonPanelSpan3)}><Button size="small" onClick={() => { onGroupBtnClick(GroupType.regroup); }} style={{ display: gridDisplay(groupBtnShow) }}>- <div className={clsx(styles.imageCommonPanelInline)}><CreateCopySingle /></div>- <div className={clsx(styles.imageCommonPanelInline)}>{localeService.t('image-panel.group.reGroup')}</div>+ <span className={styles.imageCommonPanelInline}>+ <CreateCopySingle />+ {localeService.t('image-panel.group.reGroup')}+ </span></Button></div> */}<div className={clsx(styles.imageCommonPanelColumn, styles.imageCommonPanelSpan2, styles.imageCommonPanelColumnCenter)}><Button size="small" onClick={() => { onUngroupBtnClick(); }} style={{ display: gridDisplay(ungroupBtnShow) }}>- <div className={clsx(styles.imageCommonPanelInline)}><UngroupSingle /></div>- <div className={clsx(styles.imageCommonPanelInline)}>{localeService.t('image-panel.group.unGroup')}</div>+ <span className={styles.imageCommonPanelInline}>+ <UngroupSingle />+ {localeService.t('image-panel.group.unGroup')}+ </span></Button></div></div>diff --git a/packages/drawing-ui/src/views/panel/ImageCropper.tsx b/packages/drawing-ui/src/views/panel/ImageCropper.tsxindex 1c7e239c92..09b80b3dd0 100644--- a/packages/drawing-ui/src/views/panel/ImageCropper.tsx+++ b/packages/drawing-ui/src/views/panel/ImageCropper.tsx@@ -124,8 +124,10 @@ export const ImageCropper = (props: IImageCropperProps) => {<div className={clsx(styles.imageCommonPanelRow, styles.imageCommonPanelRowVertical)}><div className={clsx(styles.imageCommonPanelColumn, styles.imageCommonPanelSpan2)}><Button size="small" onClick={() => { onCropperBtnClick(cropValue as CropType); }}>- <div className={clsx(styles.imageCommonPanelInline)}><CreateCopySingle /></div>- <div className={clsx(styles.imageCommonPanelInline)}>{localeService.t('image-panel.crop.start')}</div>+ <span className={styles.imageCommonPanelInline}>+ <CreateCopySingle />+ {localeService.t('image-panel.crop.start')}+ </span></Button></div><div className={clsx(styles.imageCommonPanelColumn, styles.imageCommonPanelSpan2)}>diff --git a/packages/drawing-ui/src/views/panel/index.module.less b/packages/drawing-ui/src/views/panel/index.module.lessindex d8a19f5f57..791a3a1a0e 100644--- a/packages/drawing-ui/src/views/panel/index.module.less+++ b/packages/drawing-ui/src/views/panel/index.module.less@@ -1,8 +1,6 @@.image-common-panel {- position: absolute;- height: 100%;- width: 90%;text-align: center;+ padding: var(--padding-sm);font-size: var(--font-size-sm);&-grid {position: relative;@@ -45,7 +43,9 @@}&-inline {- display: inline-block;+ display: flex;+ align-items: center;+ gap: var(--margin-xxs);}&-span2 {