Skip to content

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.

fix(drawing): fix remove drawing elements the control when not remove… (#3873)

VicKun448d32ca2a17
diff --git a/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-chromium-win32.png b/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-chromium-win32.png
new file mode 100644
index 0000000000..8a7c7601c9
Binary files /dev/null and b/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-chromium-win32.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-ci-chromium-linux.png
index 9c1489493f..913df1d462 100644
Binary files a/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-chromium-win32.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-chromium-win32.png
new file mode 100644
index 0000000000..4b7044caa0
Binary files /dev/null and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-chromium-win32.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-fullpage-chromium-win32.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-fullpage-chromium-win32.png
new file mode 100644
index 0000000000..4bf6a11c0b
Binary files /dev/null and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-fullpage-chromium-win32.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-chromium-win32.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-chromium-win32.png
new file mode 100644
index 0000000000..90112f7246
Binary files /dev/null and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-chromium-win32.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png
index 41875f2f7d..fa2ba6004a 100644
Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-chromium-win32.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-chromium-win32.png
new file mode 100644
index 0000000000..209f1e9ace
Binary files /dev/null and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-chromium-win32.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRenderingScrolling-chromium-win32.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRenderingScrolling-chromium-win32.png
new file mode 100644
index 0000000000..209f1e9ace
Binary files /dev/null and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRenderingScrolling-chromium-win32.png differ
diff --git a/packages/engine-render/src/scene.transformer.ts b/packages/engine-render/src/scene.transformer.ts
index 5615c47df0..f874b46aca 100644
--- a/packages/engine-render/src/scene.transformer.ts
+++ b/packages/engine-render/src/scene.transformer.ts
@@ -1529,6 +1529,17 @@ export class Transformer extends Disposable implements ITransformerConfig {
this._clearControl$.next(changeSelf);
}
+ /**
+ * @description Clear the control of the object with the specified id
+ * @param {string[]} ids the id of the object to be cleared
+ */
+ public clearControlByIds(ids: string[]) {
+ for (const id of ids) {
+ this._selectedObjectMap.delete(id);
+ }
+ this.refreshControls();
+ }
+
private _clearControlMap() {
this._transformerControlMap.forEach((control) => {
control.dispose();
@@ -1568,7 +1579,6 @@ export class Transformer extends Disposable implements ITransformerConfig {
const { left, top } = this._getRotateAnchorPosition(TransformerManagerType.ROTATE, height, width, applyObject);
const cursor = this._getRotateAnchorCursor(TransformerManagerType.ROTATE);
-
const rotate = new Rect(`${TransformerManagerType.ROTATE}_${zIndex}`, {
zIndex: zIndex - 1, left, top, height: rotateSize, width: rotateSize,
radius: rotateCornerRadius, strokeWidth: borderStrokeWidth * 2, stroke: borderStroke,
@@ -1591,7 +1601,6 @@ export class Transformer extends Disposable implements ITransformerConfig {
} else {
anchor = this._createCopperResizeAnchor(type, applyObject, zIndex);
}
-
this._attachEventToAnchor(anchor, type, applyObject);
groupElements.push(anchor);
}
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.ts
index c0fa706e2a..3a211d73a6 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
@@ -394,6 +394,26 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
});
})
);
+
+ // remove float-dom control when drawing removed
+ this.disposeWithMe(
+ this._drawingManagerService.remove$.subscribe((params) => {
+ (params).forEach((param) => {
+ const { unitId, subUnitId, drawingId } = param;
+ const rectShapeKey = getDrawingShapeKeyByDrawingSearch({ unitId, subUnitId, drawingId });
+
+ const renderObject = this._getSceneAndTransformerByDrawingSearch(unitId);
+ if (renderObject == null) {
+ return;
+ }
+ const { transformer, scene } = renderObject;
+ const rectShape = scene.getObject(rectShapeKey);
+ if (rectShape?.oKey) {
+ transformer.clearControlByIds([rectShape?.oKey]);
+ }
+ });
+ })
+ );
}
private _scrollUpdateListener() {