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(docs): handle docx sample rendering (#7213)
Univer9b932fa4db90
diff --git a/packages/drawing-ui/src/services/__tests__/drawing-render.service.spec.ts b/packages/drawing-ui/src/services/__tests__/drawing-render.service.spec.tsindex e7d13bfaca..2e9a6422ff 100644--- a/packages/drawing-ui/src/services/__tests__/drawing-render.service.spec.ts+++ b/packages/drawing-ui/src/services/__tests__/drawing-render.service.spec.ts@@ -19,12 +19,14 @@ import type { IGalleryProps } from '@univerjs/design';import type { IDocFloatDomData, IImageData } from '@univerjs/drawing';import type { BaseObject, Scene } from '@univerjs/engine-render';import {+ BooleanNumber,DrawingTypeEnum,IImageIoService,ImageSourceType,Injector,IUniverInstanceService,IURLImageService,+ PositionedObjectLayoutType,toDisposable,UniverInstanceType,} from '@univerjs/core';@@ -601,6 +603,17 @@ describe('DrawingRenderService', () => {expect(scene.addedObjects[0]?.layerIndex).toBe(DOC_DRAWING_BEHIND_TEXT_LAYER_INDEX);});+ it('renders Word behindDoc wrap-none images between page background and document text', async () => {+ const { scene, service } = createHarness();++ await service.renderImages(imageParam({+ behindDoc: BooleanNumber.TRUE,+ layoutType: PositionedObjectLayoutType.WRAP_NONE,+ } as never), scene as unknown as Scene);++ expect(scene.addedObjects[0]?.layerIndex).toBe(DOC_DRAWING_BEHIND_TEXT_LAYER_INDEX);+ });+it('keeps normal images on the regular drawing layer', async () => {const { scene, service } = createHarness();diff --git a/packages/drawing-ui/src/services/drawing-render.service.ts b/packages/drawing-ui/src/services/drawing-render.service.tsindex f94e077047..a35b5a1929 100644--- a/packages/drawing-ui/src/services/drawing-render.service.ts+++ b/packages/drawing-ui/src/services/drawing-render.service.ts@@ -45,6 +45,8 @@ interface IDrawingTransformStateWithClipBounds {type IDrawingParamWithBehindText = (Partial<IDrawingParam> | Partial<IImageData>) & {behindText?: boolean | BooleanNumber;+ behindDoc?: BooleanNumber;+ layoutType?: PositionedObjectLayoutType;docxHeaderFooterDrawing?: boolean;};@@ -52,6 +54,7 @@ export const DOC_DRAWING_BEHIND_TEXT_LAYER_INDEX = 1;export function getDrawingRenderLayerIndex(param: IDrawingParamWithBehindText): number {return param.behindText === true || param.behindText === BooleanNumber.TRUE+ || (param.layoutType === PositionedObjectLayoutType.WRAP_NONE && param.behindDoc === BooleanNumber.TRUE)? DOC_DRAWING_BEHIND_TEXT_LAYER_INDEX: DRAWING_OBJECT_LAYER_INDEX;}diff --git a/packages/engine-render/src/components/docs/layout/block/paragraph/layout-ruler.ts b/packages/engine-render/src/components/docs/layout/block/paragraph/layout-ruler.tsindex ee65851f34..ce59ad44a6 100644--- a/packages/engine-render/src/components/docs/layout/block/paragraph/layout-ruler.ts+++ b/packages/engine-render/src/components/docs/layout/block/paragraph/layout-ruler.ts@@ -1519,11 +1519,19 @@ export function getLineHeightMetrics(&& gridType !== GridType.DEFAULT;if (spacingRule === SpacingRule.AUTO) {- const lineSpacingApply = usesDocumentGrid+ let lineSpacingApply = usesDocumentGrid? lineSpacing * linePitch: scaleAutoLineSpacingByGlyphHeight? lineSpacing * glyphLineHeight: glyphLineHeight;+ if (+ !usesDocumentGrid+ && scaleAutoLineSpacingByGlyphHeight+ && lineSpacing <= 1.05+ && glyphLineHeight >= 30+ ) {+ lineSpacingApply *= 1.18;+ }const padding = (lineSpacingApply - glyphLineHeight) / 2;return {