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(sheets-drawing-ui): float-dom error on scale (#3612)
zhangw56212166b1f7
diff --git a/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts b/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.tsindex bb537dfc1c..dea9d5f9b2 100644--- a/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts+++ b/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts@@ -15,21 +15,21 @@*/import type { IDisposable, IPosition, ITransformState, Nullable, Serializable, Worksheet } from '@univerjs/core';-import { Disposable, DisposableCollection, DrawingTypeEnum, generateRandomId, ICommandService, Inject, IUniverInstanceService, LifecycleStages, OnLifecycle } from '@univerjs/core';import type { IDrawingJsonUndo1 } from '@univerjs/drawing';-import { getDrawingShapeKeyByDrawingSearch, IDrawingManagerService } from '@univerjs/drawing';import type { BaseObject, IBoundRectNoAngle, IRectProps, IRender, Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';-import { DRAWING_OBJECT_LAYER_INDEX, IRenderManagerService, Rect, SHEET_VIEWPORT_KEY } from '@univerjs/engine-render';import type { ISetFrozenMutationParams } from '@univerjs/sheets';-import { getSheetCommandTarget, SetFrozenMutation } from '@univerjs/sheets';import type { IFloatDomData, ISheetDrawingPosition, ISheetFloatDom } from '@univerjs/sheets-drawing';+import type { IFloatDomLayout } from '@univerjs/ui';+import type { IInsertDrawingCommandParams } from '../commands/commands/interfaces';+import { Disposable, DisposableCollection, DrawingTypeEnum, generateRandomId, ICommandService, Inject, IUniverInstanceService, LifecycleStages, OnLifecycle } from '@univerjs/core';+import { getDrawingShapeKeyByDrawingSearch, IDrawingManagerService } from '@univerjs/drawing';+import { DRAWING_OBJECT_LAYER_INDEX, IRenderManagerService, Rect, SHEET_VIEWPORT_KEY } from '@univerjs/engine-render';+import { getSheetCommandTarget, SetFrozenMutation } from '@univerjs/sheets';import { DrawingApplyType, ISheetDrawingService, SetDrawingApplyMutation } from '@univerjs/sheets-drawing';import { ISheetSelectionRenderService, SetScrollOperation, SetZoomRatioOperation, SheetSkeletonManagerService } from '@univerjs/sheets-ui';-import type { IFloatDomLayout } from '@univerjs/ui';import { CanvasFloatDomService } from '@univerjs/ui';import { BehaviorSubject, Subject } from 'rxjs';import { InsertSheetDrawingCommand } from '../commands/commands/insert-sheet-drawing.command';-import type { IInsertDrawingCommandParams } from '../commands/commands/interfaces';export interface ICanvasFloatDom {/**@@ -156,6 +156,7 @@ const calcPosition = (};const offsetBound = transformBound2DOMBound(bound, scene, skeleton, worksheet);+ const { scaleX, scaleY } = scene.getAncestorScale();return {startX: offsetBound.left,@@ -163,8 +164,8 @@ const calcPosition = (startY: offsetBound.top,endY: offsetBound.bottom,rotate: angle,- width,- height,+ width: width * scaleX,+ height: height * scaleY,absolute: offsetBound.absolute,};};diff --git a/packages/ui/src/views/components/dom/FloatDom.tsx b/packages/ui/src/views/components/dom/FloatDom.tsxindex 16da9c8919..848388bc9f 100644--- a/packages/ui/src/views/components/dom/FloatDom.tsx+++ b/packages/ui/src/views/components/dom/FloatDom.tsx@@ -14,12 +14,12 @@* limitations under the License.*/+import type { IFloatDom } from '../../../services/dom/canvas-dom-layer.service';import { IUniverInstanceService, UniverInstanceType, useDependency } from '@univerjs/core';import React, { memo } from 'react';-import type { IFloatDom } from '../../../services/dom/canvas-dom-layer.service';-import { CanvasFloatDomService } from '../../../services/dom/canvas-dom-layer.service';-import { useObservable } from '../../../components/hooks/observable';import { ComponentManager } from '../../../common';+import { useObservable } from '../../../components/hooks/observable';+import { CanvasFloatDomService } from '../../../services/dom/canvas-dom-layer.service';import styles from './index.module.less';const FloatDomSingle = memo((props: { layer: IFloatDom; id: string }) => {