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
feat(drawing): add optional property to control rotate handle of drawing element (#3750)
VicKun71ffde4bdf3b
diff --git a/packages/engine-render/src/scene.transformer.ts b/packages/engine-render/src/scene.transformer.tsindex 23f28fe1be..185a1ac316 100644--- a/packages/engine-render/src/scene.transformer.ts+++ b/packages/engine-render/src/scene.transformer.ts@@ -15,25 +15,25 @@*/import type { IAbsoluteTransform, IKeyValue, Nullable } from '@univerjs/core';-import { Disposable, MOVE_BUFFER_VALUE, requestImmediateMacroTask, toDisposable } from '@univerjs/core';+import type { BaseObject } from './base-object';+import type { IMouseEvent, IPointerEvent } from './basics/i-events';+import type { ITransformerConfig } from './basics/transformer-config';+import type { IPoint } from './basics/vector2';+import type { Scene } from './scene';+import type { IRectProps } from './shape/rect';+import { Disposable, MOVE_BUFFER_VALUE, requestImmediateMacroTask, toDisposable } from '@univerjs/core';import { Subject, type Subscription } from 'rxjs';-import type { BaseObject } from './base-object';import { CURSOR_TYPE } from './basics/const';-import type { IMouseEvent, IPointerEvent } from './basics/i-events';+import { offsetRotationAxis } from './basics/offset-rotation-axis';+import { getCurrentScrollXY } from './basics/scroll-xy';+import { degToRad, precisionTo, radToDeg } from './basics/tools';+import { Vector2 } from './basics/vector2';import { Group } from './group';import { ScrollTimer } from './scroll-timer';-import type { IRectProps } from './shape/rect';import { Rect } from './shape/rect';--import { degToRad, precisionTo, radToDeg } from './basics/tools';-import type { Scene } from './scene';-import type { IPoint } from './basics/vector2';-import { Vector2 } from './basics/vector2';-import type { ITransformerConfig } from './basics/transformer-config';import { type IRegularPolygonProps, RegularPolygon } from './shape/regular-polygon';-import { offsetRotationAxis } from './basics/offset-rotation-axis';enum TransformerManagerType {RESIZE_LT = '__SpreadsheetTransformerResizeLT__',@@ -1535,7 +1535,7 @@ export class Transformer extends Disposable implements ITransformerConfig {private _createControl(applyObject: BaseObject, isSkipOnCropper = true) {const { left = 0, top = 0, height = 0, width = 0 } = applyObject.getState();const angle = applyObject.angle;- const { isCropper, resizeEnabled, rotateAnchorOffset, rotateSize, rotateCornerRadius, borderEnabled, borderStroke, borderStrokeWidth, borderSpacing, enabledAnchors } = this._getConfig(applyObject);+ const { isCropper, resizeEnabled, rotateEnabled, rotateAnchorOffset, rotateSize, rotateCornerRadius, borderEnabled, borderStroke, borderStrokeWidth, borderSpacing, enabledAnchors } = this._getConfig(applyObject);if (isSkipOnCropper && isCropper) {return;}@@ -1555,23 +1555,24 @@ export class Transformer extends Disposable implements ITransformerConfig {const { left: lineLeft, top: lineTop } = this._getRotateAnchorPosition(TransformerManagerType.ROTATE_LINE, height, width, applyObject);+ if (rotateEnabled) {+ const rotateLine = new Rect(`${TransformerManagerType.ROTATE_LINE}_${zIndex}`, {+ zIndex: zIndex - 1, evented: false, left: lineLeft, top: lineTop, height: rotateAnchorOffset, width: 1,+ strokeWidth: borderStrokeWidth, stroke: borderStroke,+ });- const rotateLine = new Rect(`${TransformerManagerType.ROTATE_LINE}_${zIndex}`, {- zIndex: zIndex - 1, evented: false, left: lineLeft, top: lineTop, height: rotateAnchorOffset, width: 1,- strokeWidth: borderStrokeWidth, stroke: borderStroke,- });-- const { left, top } = this._getRotateAnchorPosition(TransformerManagerType.ROTATE, height, width, applyObject);+ const { left, top } = this._getRotateAnchorPosition(TransformerManagerType.ROTATE, height, width, applyObject);- const cursor = this._getRotateAnchorCursor(TransformerManagerType.ROTATE);+ 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,- });- this._attachEventToRotate(rotate, applyObject);- this._attachHover(rotate, cursor, CURSOR_TYPE.DEFAULT);- groupElements.push(rotateLine, rotate);+ const rotate = new Rect(`${TransformerManagerType.ROTATE}_${zIndex}`, {+ zIndex: zIndex - 1, left, top, height: rotateSize, width: rotateSize,+ radius: rotateCornerRadius, strokeWidth: borderStrokeWidth * 2, stroke: borderStroke,+ });+ this._attachEventToRotate(rotate, applyObject);+ this._attachHover(rotate, cursor, CURSOR_TYPE.DEFAULT);+ groupElements.push(rotateLine, rotate);+ }}if (resizeEnabled) {for (let i = 0, len = enabledAnchors.length; i < len; i++) {diff --git a/packages/engine-render/src/shape/rect.ts b/packages/engine-render/src/shape/rect.tsindex 220ec6c49a..0729c6107b 100644--- a/packages/engine-render/src/shape/rect.ts+++ b/packages/engine-render/src/shape/rect.ts@@ -16,10 +16,10 @@import type { IKeyValue, Nullable } from '@univerjs/core';-import { ObjectType } from '../base-object';-import { Shape } from './shape';import type { UniverRenderingContext } from '../context';import type { IShapeProps } from './shape';+import { ObjectType } from '../base-object';+import { Shape } from './shape';export interface IRectProps extends IShapeProps {radius?: number;@@ -33,6 +33,7 @@ export class Rect<T extends IRectProps = IRectProps> extends Shape<T> {override objectType = ObjectType.RECT;private _radius: number = 0;+/*** For rendering, in many case object size is bigger than visual size for better user interaction.*/diff --git a/packages/engine-render/src/shape/shape.ts b/packages/engine-render/src/shape/shape.tsindex d671f6a382..b66eeff3dd 100644--- a/packages/engine-render/src/shape/shape.ts+++ b/packages/engine-render/src/shape/shape.ts@@ -16,17 +16,20 @@import type { IKeyValue, IOffset, IScale, ISize, Nullable } from '@univerjs/core';-import { BASE_OBJECT_ARRAY, BaseObject, ObjectType } from '../base-object';-import { SHAPE_TYPE } from '../basics/const';import type { IObjectFullState } from '../basics/interfaces';import type { IViewportInfo, Vector2 } from '../basics/vector2';import type { UniverRenderingContext } from '../context';+import { BASE_OBJECT_ARRAY, BaseObject, ObjectType } from '../base-object';+import { SHAPE_TYPE } from '../basics/const';export type LineJoin = 'round' | 'bevel' | 'miter';export type LineCap = 'butt' | 'round' | 'square';export type PaintFirst = 'fill' | 'stroke';+const BASE_OBJECT_ARRAY_Set = new Set(BASE_OBJECT_ARRAY);export interface IShapeProps extends IObjectFullState, ISize, IOffset, IScale {+ rotateEnabled?: boolean;+ resizeEnabled?: boolean;hoverCursor?: Nullable<string>;moveCursor?: string | null;fillRule?: string;@@ -296,7 +299,7 @@ export abstract class Shape<T extends IShapeProps> extends BaseObject {// return { scaleX: 1, scaleY: 1 };// }- private static _removeShadow(ctx: UniverRenderingContext) {}+ private static _removeShadow(ctx: UniverRenderingContext) { }private static _setFillStyles(ctx: UniverRenderingContext, props: IShapeProps) {ctx.fillStyle = props.fill!;@@ -359,7 +362,7 @@ export abstract class Shape<T extends IShapeProps> extends BaseObject {return true;}- if (BASE_OBJECT_ARRAY.indexOf(key) === -1) {+ if (!BASE_OBJECT_ARRAY_Set.has(key)) {(this as IKeyValue)[`_${key}`] = (props as IKeyValue)[key];}});@@ -396,12 +399,26 @@ export abstract class Shape<T extends IShapeProps> extends BaseObject {const transformState: IObjectFullState = {};let hasTransformState = false;++ const hasRotateEnabled = props?.rotateEnabled !== undefined;+ const hasResizeEnabled = props?.resizeEnabled !== undefined;+ if (hasRotateEnabled || hasResizeEnabled) {+ const transformerConfig = this.transformerConfig || {};+ if (hasRotateEnabled) {+ transformerConfig.rotateEnabled = props?.rotateEnabled;+ }+ if (hasResizeEnabled) {+ transformerConfig.resizeEnabled = props?.resizeEnabled;+ }+ this.transformerConfig = { ...transformerConfig };+ }+themeKeys.forEach((key) => {if ((props as IKeyValue)[key] === undefined) {return true;}- if (BASE_OBJECT_ARRAY.indexOf(key) > -1) {+ if (BASE_OBJECT_ARRAY_Set.has(key)) {transformState[key as keyof IObjectFullState] = (props as IKeyValue)[key];hasTransformState = true;} else {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 bcd8b3c8fb..84f5c9f4fe 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@@ -21,8 +21,9 @@ import type { ISetFrozenMutationParams } 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 } from '@univerjs/core';-import { getDrawingShapeKeyByDrawingSearch, IDrawingManagerService } from '@univerjs/drawing';+import { Disposable, DisposableCollection, generateRandomId, ICommandService, Inject, IUniverInstanceService } from '@univerjs/core';+import { DrawingTypeEnum, 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';@@ -57,6 +58,10 @@ export interface ICanvasFloatDom {* data of component, will save to snapshot, json-like data*/data?: Serializable;+ /**+ * the float-dom type+ */+ type?: DrawingTypeEnum;}interface ICanvasFloatDomInfo {@@ -267,7 +272,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {const { transform, drawingType, data } = floatDomParam;- if (drawingType !== DrawingTypeEnum.DRAWING_DOM) {+ if (drawingType !== DrawingTypeEnum.DRAWING_DOM && drawingType !== DrawingTypeEnum.DRAWING_CHART) {return;}@@ -301,6 +306,11 @@ export class SheetCanvasFloatDomManagerService extends Disposable {zIndex: this._drawingManagerService.getDrawingOrder(unitId, subUnitId).length - 1,};+ if (drawingType === DrawingTypeEnum.DRAWING_CHART) {+ imageConfig.fill = 'white';+ imageConfig.rotateEnabled = false;+ }+const rect = new Rect(rectShapeKey, imageConfig);scene.addObject(rect, DRAWING_OBJECT_LAYER_INDEX);@@ -444,7 +454,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {return;}- if (sheetDrawing.drawingType !== DrawingTypeEnum.DRAWING_DOM) {+ if (sheetDrawing.drawingType !== DrawingTypeEnum.DRAWING_DOM && sheetDrawing.drawingType !== DrawingTypeEnum.DRAWING_CHART) {return;}@@ -491,7 +501,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {unitId,subUnitId,drawingId: id,- drawingType: DrawingTypeEnum.DRAWING_DOM,+ drawingType: layer.type || DrawingTypeEnum.DRAWING_DOM,componentKey,sheetTransform,transform: {diff --git a/packages/sheets-drawing/src/services/sheet-drawing.service.ts b/packages/sheets-drawing/src/services/sheet-drawing.service.tsindex 55ebf8d756..758c2e7702 100644--- a/packages/sheets-drawing/src/services/sheet-drawing.service.ts+++ b/packages/sheets-drawing/src/services/sheet-drawing.service.ts@@ -14,9 +14,9 @@* limitations under the License.*/-import { type IDrawingParam, type IImageData, type IRotationSkewFlipTransform, type IUnitDrawingService, UnitDrawingService } from '@univerjs/drawing';import type { Serializable } from '@univerjs/core';import { createIdentifier } from '@univerjs/core';+import { type IDrawingParam, type IImageData, type IRotationSkewFlipTransform, type IUnitDrawingService, UnitDrawingService } from '@univerjs/drawing';interface ICellPosition {column: number; // column number