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.

feat(sheets-ui): support printing of minimap chart and float-dom (#5012)

ZhangWeicbf5f7bb7823
diff --git a/packages/core/src/types/const/const.ts b/packages/core/src/types/const/const.ts
index 9466fc550b..ec760acca2 100644
--- a/packages/core/src/types/const/const.ts
+++ b/packages/core/src/types/const/const.ts
@@ -260,3 +260,5 @@ export const NAMED_STYLE_SPACE_MAP: Record<NamedStyleType, Nullable<IParagraphSt
},
[NamedStyleType.NAMED_STYLE_TYPE_UNSPECIFIED]: null,
};
+
+export const PRINT_CHART_COMPONENT_KEY = 'univer-sheets-chart-print-chart';
diff --git a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-printing.controller.ts b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-printing.controller.tsx
similarity index 66%
rename from packages/sheets-drawing-ui/src/controllers/sheet-drawing-printing.controller.ts
rename to packages/sheets-drawing-ui/src/controllers/sheet-drawing-printing.controller.tsx
index 3b382550dc..c4d1567dd3 100644
--- a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-printing.controller.ts
+++ b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-printing.controller.tsx
@@ -15,22 +15,32 @@
*/
import type { IRange } from '@univerjs/core';
-import { Disposable, DrawingTypeEnum, Inject, Tools } from '@univerjs/core';
+import type { IFloatDomData } from '@univerjs/sheets-drawing';
+import type { IPrintingFloatDomProps } from '../views/printing-float-dom';
+import { Disposable, DrawingTypeEnum, Inject, Injector, PRINT_CHART_COMPONENT_KEY, Tools } from '@univerjs/core';
+import { render, unmount } from '@univerjs/design';
import { IDrawingManagerService } from '@univerjs/drawing';
import { DrawingRenderService } from '@univerjs/drawing-ui';
import { IRenderManagerService } from '@univerjs/engine-render';
import { SheetPrintInterceptorService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
+import { ComponentManager, connectInjector } from '@univerjs/ui';
+import { SheetCanvasFloatDomManagerService } from '../services/canvas-float-dom-manager.service';
+import { PrintingFloatDom } from '../views/printing-float-dom';
export class SheetDrawingPrintingController extends Disposable {
constructor(
@Inject(SheetPrintInterceptorService) private readonly _sheetPrintInterceptorService: SheetPrintInterceptorService,
@Inject(DrawingRenderService) private readonly _drawingRenderService: DrawingRenderService,
@IDrawingManagerService private readonly _drawingManagerService: IDrawingManagerService,
- @IRenderManagerService private readonly _renderManagerService: IRenderManagerService
+ @IRenderManagerService private readonly _renderManagerService: IRenderManagerService,
+ @Inject(SheetCanvasFloatDomManagerService) private readonly _canvasFloatDomManagerService: SheetCanvasFloatDomManagerService,
+ @Inject(ComponentManager) private readonly _componetManager: ComponentManager,
+ @Inject(Injector) private readonly _injector: Injector
) {
super();
this._initPrinting();
+ this._initPrintingDom();
}
private _initPrinting() {
@@ -77,7 +87,7 @@ export class SheetDrawingPrintingController extends Disposable {
const { scaleX, scaleY } = renderer.scene;
const newRange: IRange = range ? { ...range } : { startColumn: 0, endColumn: 0, endRow: 0, startRow: 0 };
- const data = subUnitData.order.map((key) => subUnitData.data[key]).filter((item) => item.drawingType !== DrawingTypeEnum.DRAWING_DOM);
+ const data = subUnitData.order.map((key) => subUnitData.data[key]);
if (data.length) {
data.forEach((param) => {
if (!param.groupId && param.transform && Tools.isDefine(param.transform.left) && Tools.isDefine(param.transform.top) && Tools.isDefine(param.transform.width) && Tools.isDefine(param.transform.height)) {
@@ -109,4 +119,39 @@ export class SheetDrawingPrintingController extends Disposable {
)
);
}
+
+ private _initPrintingDom() {
+ this.disposeWithMe(
+ this._sheetPrintInterceptorService.interceptor.intercept(
+ this._sheetPrintInterceptorService.interceptor.getInterceptPoints().PRINTING_DOM_COLLECT,
+ {
+ handler: (disposableCollection, pos, next) => {
+ const { unitId, subUnitId } = pos;
+ const floatDomInfos = this._canvasFloatDomManagerService.getFloatDomsBySubUnitId(unitId, subUnitId)
+ .map((i) => {
+ const drawing = this._drawingManagerService.getDrawingByParam({ drawingId: i.id, unitId, subUnitId }) as IFloatDomData;
+
+ return drawing && {
+ ...drawing,
+ componentKey: this._componetManager.get(drawing.drawingType === DrawingTypeEnum.DRAWING_CHART ? PRINT_CHART_COMPONENT_KEY : drawing.componentKey) as any,
+ };
+ })
+ .filter(Boolean) as IFloatDomData[];
+ const PrintingFloatDomInjector = connectInjector(PrintingFloatDom, this._injector) as React.ComponentType<IPrintingFloatDomProps>;
+
+ render(
+ <PrintingFloatDomInjector floatDomInfos={floatDomInfos} scene={pos.scene} skeleton={pos.skeleton} worksheet={pos.worksheet} />,
+ pos.root
+ );
+
+ disposableCollection?.add(() => {
+ unmount(pos.root);
+ });
+
+ return next(disposableCollection);
+ },
+ }
+ )
+ );
+ }
}
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 f44292ecc8..b713783057 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
@@ -49,10 +49,6 @@ export interface ICanvasFloatDom {
* subUnitId of worksheet, if not set, will use current worksheet
*/
subUnitId?: string;
- /**
- * @deprecated Please use `data`. for saving to disk, everything add to float-dom must be serializable.
- */
- props?: Record<string, any>;
/**
* data of component, will save to snapshot, json-like data
*/
@@ -73,7 +69,7 @@ enum ScrollDirectionResponse {
HORIZONTAL = 'HORIZONTAL',
VERTICAL = 'VERTICAL',
}
-interface ICanvasFloatDomInfo {
+export interface ICanvasFloatDomInfo {
position$: BehaviorSubject<IFloatDomLayout>;
dispose: IDisposable;
rect: Rect;
@@ -82,6 +78,7 @@ interface ICanvasFloatDomInfo {
boundsOfViewArea?: IBoundRectNoAngle;
scrollDirectionResponse?: ScrollDirectionResponse; // update float dom pos by scrolling
domAnchor?: IDOMAnchor;
+ id: string;
}
export interface IDOMAnchor {
@@ -114,7 +111,7 @@ export interface ILimitBound extends IBoundRectNoAngle {
* @returns ILimitBound
*/
// eslint-disable-next-line max-lines-per-function
-export function transformBound2DOMBound(posOfFloatObject: IBoundRectNoAngle, scene: Scene, skeleton: SpreadsheetSkeleton, worksheet: Worksheet, floatDomInfo?: ICanvasFloatDomInfo): ILimitBound {
+export function transformBound2DOMBound(posOfFloatObject: IBoundRectNoAngle, scene: Scene, skeleton: SpreadsheetSkeleton, worksheet: Worksheet, floatDomInfo?: ICanvasFloatDomInfo, skipBoundsOfViewArea = false): ILimitBound {
const { scaleX, scaleY } = scene.getAncestorScale();
const viewMain = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
@@ -140,8 +137,8 @@ export function transformBound2DOMBound(posOfFloatObject: IBoundRectNoAngle, sce
const { boundsOfViewArea: specBoundsOfViewArea, scrollDirectionResponse } = floatDomInfo || {};
const { rowHeaderWidth, columnHeaderHeight } = skeleton;
const boundsOfViewArea = {
- top: columnHeaderHeight,
- left: rowHeaderWidth,
+ top: skipBoundsOfViewArea ? 0 : columnHeaderHeight,
+ left: skipBoundsOfViewArea ? 0 : rowHeaderWidth,
};
if (specBoundsOfViewArea) {
if (Tools.isDefine(boundsOfViewArea.top)) {
@@ -237,14 +234,13 @@ export function transformBound2DOMBound(posOfFloatObject: IBoundRectNoAngle, sce
* @param worksheet
* @returns {IFloatDomLayout} position
*/
-const calcPosition = (
+export const calcSheetFloatDomPosition = (
floatObject: BaseObject,
- renderUnit: IRender,
+ scene: Scene,
skeleton: SpreadsheetSkeleton,
worksheet: Worksheet,
floatDomInfo?: ICanvasFloatDomInfo
): IFloatDomLayout => {
- const { scene } = renderUnit;
const { left, top, width, height, angle } = floatObject;
const boundOfFloatObject: IBoundRectNoAngle = {
left,
@@ -270,15 +266,7 @@ const calcPosition = (
return domPos;
};
-export interface ISheetCanvasFloatDomHook {
- onGetFloatDomProps: (id: string) => Record<string, any>;
-}
-
export class SheetCanvasFloatDomManagerService extends Disposable {
- /**
- * for update dom container position when scrolling and zoom
- */
- private _domLayerMap: Map<string, Map<string, Map<string, { props?: any }>>> = new Map();
/**
* for update dom container position when scrolling and zoom
*/
@@ -293,8 +281,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
private _remove$ = new Subject<{ unitId: string; subUnitId: string; id: string }>();
remove$ = this._remove$.asObservable();
- private _hooks: ISheetCanvasFloatDomHook[] = [];
-
constructor(
@Inject(IRenderManagerService) private _renderManagerService: IRenderManagerService,
@IUniverInstanceService private _univerInstanceService: IUniverInstanceService,
@@ -317,31 +303,14 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
});
}
- /**
- * For scrolling and zoom
- * @param unitId
- * @param subUnitId
- */
- private _ensureMap(unitId: string, subUnitId: string) {
- let unitMap = this._domLayerMap.get(unitId);
- if (!unitMap) {
- unitMap = new Map();
- this._domLayerMap.set(unitId, unitMap);
- }
-
- let subUnitMap = unitMap.get(subUnitId);
- if (!subUnitMap) {
- subUnitMap = new Map();
- unitMap.set(subUnitId, subUnitMap);
- }
-
- return subUnitMap;
- }
-
getFloatDomInfo(id: string) {
return this._domLayerInfoMap.get(id);
}
+ getFloatDomsBySubUnitId(unitId: string, subUnitId: string) {
+ return Array.from(this._domLayerInfoMap.values()).filter((info) => info.subUnitId === subUnitId && info.unitId === unitId);
+ }
+
private _getSceneAndTransformerByDrawingSearch(unitId: Nullable<string>) {
if (unitId == null) {
return;
@@ -357,26 +326,16 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
const transformer = scene.getTransformerByCreate();
const canvas = renderUnit.engine.getCanvasElement();
-
return { scene, transformer, renderUnit, canvas };
}
- private _getFloatDomProps(id: string) {
- let props;
- this._hooks.forEach((hook) => {
- props = hook.onGetFloatDomProps(id);
- });
-
- return props;
- }
-
// eslint-disable-next-line max-lines-per-function
private _drawingAddListener() {
this.disposeWithMe(
// eslint-disable-next-line max-lines-per-function
this._drawingManagerService.add$.subscribe((params: IDrawingSearch[]) => {
- // eslint-disable-next-line max-lines-per-function, complexity
+ // eslint-disable-next-line max-lines-per-function
(params).forEach((param) => {
const { unitId, subUnitId, drawingId } = param;
const target = getSheetCommandTarget(this._univerInstanceService, { unitId, subUnitId });
@@ -439,11 +398,12 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
};
const isChart = drawingType === DrawingTypeEnum.DRAWING_CHART;
+ imageConfig.rotateEnabled = false;
if (isChart) {
const backgroundColor = data ? (data as Record<string, string>).backgroundColor : 'white';
imageConfig.fill = backgroundColor;
- imageConfig.rotateEnabled = false;
+
if (data && (data as Record<string, string>).border) {
imageConfig.stroke = (data as Record<string, string>).border;
}
@@ -463,9 +423,8 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
if (floatDomParam.allowTransform !== false) {
scene.attachTransformerTo(rect);
}
- const map = this._ensureMap(unitId, subUnitId);
const disposableCollection = new DisposableCollection();
- const initPosition = calcPosition(rect, renderObject.renderUnit, skeleton.skeleton, target.worksheet);
+ const initPosition = calcSheetFloatDomPosition(rect, renderObject.renderUnit.scene, skeleton.skeleton, target.worksheet);
const position$ = new BehaviorSubject<IFloatDomLayout>(initPosition);
const info: ICanvasFloatDomInfo = {
@@ -474,6 +433,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
position$,
unitId,
subUnitId,
+ id: drawingId,
};
this._canvasFloatDomService.addFloatDom({
@@ -492,13 +452,12 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
onWheel: (evt: WheelEvent) => {
canvas.dispatchEvent(new WheelEvent(evt.type, evt));
},
- props: map.get(drawingId)?.props ?? this._getFloatDomProps(drawingId),
data,
unitId,
});
const listener = rect.onTransformChange$.subscribeEvent(() => {
- const newPosition = calcPosition(rect, renderObject.renderUnit, skeleton.skeleton, target.worksheet);
+ const newPosition = calcSheetFloatDomPosition(rect, renderObject.renderUnit.scene, skeleton.skeleton, target.worksheet);
position$.next(
newPosition
);
@@ -509,9 +468,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
});
listener && disposableCollection.add(listener);
this._domLayerInfoMap.set(drawingId, info);
- map.set(drawingId, {
- ...map.get(drawingId),
- });
});
})
);
@@ -540,8 +496,10 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
private _scrollUpdateListener() {
const updateSheet = (unitId: string, subUnitId: string) => {
const renderObject = this._getSceneAndTransformerByDrawingSearch(unitId);
- const map = this._ensureMap(unitId, subUnitId);
- const ids = Array.from(map.keys());
+ const ids = Array.from(this._domLayerInfoMap.keys())
+ .map((id) => ({ id, ...this._domLayerInfoMap.get(id) }))
+ .filter((info) => info.subUnitId === subUnitId && info.unitId === unitId)
+ .map((info) => info.id);
const target = getSheetCommandTarget(this._univerInstanceService, { unitId, subUnitId });
const skeleton = this._renderManagerService.getRenderById(unitId)?.with(SheetSkeletonManagerService).getSkeletonParam(subUnitId);
if (!renderObject || !target || !skeleton) {
@@ -550,7 +508,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
ids.forEach((id) => {
const floatDomInfo = this._domLayerInfoMap.get(id);
if (floatDomInfo) {
- const position = calcPosition(floatDomInfo.rect, renderObject.renderUnit, skeleton.skeleton, target.worksheet, floatDomInfo);
+ const position = calcSheetFloatDomPosition(floatDomInfo.rect, renderObject.renderUnit.scene, skeleton.skeleton, target.worksheet, floatDomInfo);
floatDomInfo.position$.next(position);
}
});
@@ -587,7 +545,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
if (commandInfo.id === SetZoomRatioOperation.id) {
const params = (commandInfo.params) as any;
const { unitId } = params;
- const subUnitIds = Array.from(this._domLayerMap.get(unitId)?.keys() ?? []);
+ const subUnitIds = Array.from(this._domLayerInfoMap.values()).filter((info) => info.unitId === unitId).map((info) => info.subUnitId);
subUnitIds.forEach((subUnitId) => {
updateSheet(unitId, subUnitId);
});
@@ -700,8 +658,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
if (sheetTransform == null) {
return;
}
- const map = this._ensureMap(unitId, subUnitId);
- map.set(id, layer);
const sheetDrawingParam: ISheetFloatDom = {
unitId,
@@ -752,8 +708,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
}
if (removeDrawing) {
- const map = this._ensureMap(unitId, subUnitId);
- map.delete(id);
const param = this._drawingManagerService.getDrawingByParam({ unitId, subUnitId, drawingId: id });
if (!param) {
return;
@@ -765,17 +719,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
}
}
- addHook(hook: ISheetCanvasFloatDomHook): IDisposable {
- this._hooks.push(hook);
-
- return {
- dispose: () => {
- const index = this._hooks.findIndex((h) => h === hook);
- this._hooks.splice(index, 1);
- },
- };
- }
-
// eslint-disable-next-line max-lines-per-function, complexity
addFloatDomToRange(range: IRange, config: ICanvasFloatDom, domAnchor: Partial<IDOMAnchor>, propId?: string) {
const target = getSheetCommandTarget(this._univerInstanceService, {
@@ -801,8 +744,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
if (sheetTransform == null) {
return;
}
- const map = this._ensureMap(unitId, subUnitId);
- map.set(id, config);
const scene = renderObject.scene;
const { scaleX } = scene.getAncestorScale();
@@ -915,7 +856,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
if (floatDomParam.allowTransform !== false) {
scene.attachTransformerTo(domRect);
}
- const map = this._ensureMap(unitId, subUnitId);
const disposableCollection = new DisposableCollection();
const viewMain = scene.getMainViewport();
@@ -937,7 +877,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
subUnitId,
} as unknown as ICanvasFloatDomInfo;
- const initedPosition = calcPosition(domRect, renderObject.renderUnit, skeletonParam.skeleton, target.worksheet, floatDomInfo);
+ const initedPosition = calcSheetFloatDomPosition(domRect, renderObject.renderUnit.scene, skeletonParam.skeleton, target.worksheet, floatDomInfo);
const position$ = new BehaviorSubject<IFloatDomLayout>(initedPosition);
floatDomInfo.position$ = position$;
@@ -952,7 +892,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
onWheel: (evt: WheelEvent) => {
canvas.dispatchEvent(new WheelEvent(evt.type, evt));
},
- props: map.get(drawingId)?.props ?? this._getFloatDomProps(drawingId),
data,
unitId,
};
@@ -994,7 +933,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
height: domAnchor.height ?? newRangePos.height,
zIndex: this._drawingManagerService.getDrawingOrder(unitId, subUnitId).length - 1,
});
- const newPos = calcPosition(newRect, renderObject.renderUnit, skeletonParam.skeleton, target.worksheet, floatDomInfo);
+ const newPos = calcSheetFloatDomPosition(newRect, renderObject.renderUnit.scene, skeletonParam.skeleton, target.worksheet, floatDomInfo);
position$.next(newPos);
}));
const skm = this._renderManagerService.getRenderById(unitId)?.with(SheetSkeletonManagerService);
@@ -1007,7 +946,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
});
const listener = domRect.onTransformChange$.subscribeEvent(() => {
- const newPosition = calcPosition(domRect, renderObject.renderUnit, skeletonParam.skeleton, target.worksheet, floatDomInfo);
+ const newPosition = calcSheetFloatDomPosition(domRect, renderObject.renderUnit.scene, skeletonParam.skeleton, target.worksheet, floatDomInfo);
position$.next(
newPosition
);
@@ -1018,9 +957,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
});
listener && disposableCollection.add(listener);
this._domLayerInfoMap.set(drawingId, floatDomInfo);
- map.set(drawingId, {
- ...map.get(drawingId),
- });
}
return {
@@ -1031,6 +967,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
};
}
+ // eslint-disable-next-line max-lines-per-function, complexity
addFloatDomToColumnHeader(column: number, config: ICanvasFloatDom, domLayoutParam: IDOMAnchor, propId?: string) {
const target = getSheetCommandTarget(this._univerInstanceService, {
unitId: config.unitId,
@@ -1065,9 +1002,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
return;
}
- const map = this._ensureMap(unitId, subUnitId);
- map.set(id, config);
-
const sheetDrawingParam: ISheetFloatDom = {
unitId,
subUnitId,
@@ -1165,7 +1099,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
if (floatDomParam.allowTransform !== false) {
scene.attachTransformerTo(domRect);
}
- const map = this._ensureMap(unitId, subUnitId);
const disposableCollection = new DisposableCollection();
const viewMain = scene.getMainViewport();
@@ -1186,7 +1119,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
scrollDirectionResponse: ScrollDirectionResponse.HORIZONTAL,
} as unknown as ICanvasFloatDomInfo;
- const initedPosition = calcPosition(domRect, renderObject.renderUnit, skeleton.skeleton, target.worksheet, floatDomInfo);
+ const initedPosition = calcSheetFloatDomPosition(domRect, renderObject.renderUnit.scene, skeleton.skeleton, target.worksheet, floatDomInfo);
const position$ = new BehaviorSubject<IFloatDomLayout>(initedPosition);
floatDomInfo.position$ = position$;
@@ -1200,7 +1133,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
onWheel: (evt: WheelEvent) => {
canvas.dispatchEvent(new WheelEvent(evt.type, evt));
},
- props: map.get(drawingId)?.props ?? this._getFloatDomProps(drawingId),
data,
unitId,
};
@@ -1221,7 +1153,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
this._canvasFloatDomService.addFloatDom(floatDomCfg);
const listener = domRect.onTransformChange$.subscribeEvent(() => {
- const newPosition = calcPosition(domRect, renderObject.renderUnit, skeleton.skeleton, target.worksheet, floatDomInfo);
+ const newPosition = calcSheetFloatDomPosition(domRect, renderObject.renderUnit.scene, skeleton.skeleton, target.worksheet, floatDomInfo);
position$.next(
newPosition
);
@@ -1249,7 +1181,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
height: domLayoutParam.height,
zIndex: this._drawingManagerService.getDrawingOrder(unitId, subUnitId).length - 1,
});
- const newPos = calcPosition(newRect, renderObject.renderUnit, skeleton.skeleton, target.worksheet, floatDomInfo);
+ const newPos = calcSheetFloatDomPosition(newRect, renderObject.renderUnit.scene, skeleton.skeleton, target.worksheet, floatDomInfo);
position$.next(newPos);
}));
@@ -1266,9 +1198,6 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
});
listener && disposableCollection.add(listener);
this._domLayerInfoMap.set(drawingId, floatDomInfo);
- map.set(drawingId, {
- ...map.get(drawingId),
- });
}
return {
@@ -1289,6 +1218,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
* @param activeViewport
* @returns position of cell to canvas.
*/
+ // eslint-disable-next-line max-lines-per-function
private _createRangePositionObserver(
range: IRange,
currentRender: IRender,
diff --git a/packages/sheets-drawing-ui/src/views/printing-float-dom/index.tsx b/packages/sheets-drawing-ui/src/views/printing-float-dom/index.tsx
new file mode 100644
index 0000000000..5fd3b30952
--- /dev/null
+++ b/packages/sheets-drawing-ui/src/views/printing-float-dom/index.tsx
@@ -0,0 +1,84 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Worksheet } from '@univerjs/core';
+import type { Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';
+import type { IFloatDomData } from '@univerjs/sheets-drawing';
+import type { IFloatDom, IFloatDomLayout } from '@univerjs/ui';
+import { FloatDomSingle } from '@univerjs/ui';
+import { useMemo } from 'react';
+import { BehaviorSubject } from 'rxjs';
+import { transformBound2DOMBound } from '../../services/canvas-float-dom-manager.service';
+
+export interface IPrintingFloatDomProps {
+ floatDomInfos: IFloatDomData[];
+ scene: Scene;
+ skeleton: SpreadsheetSkeleton;
+ worksheet: Worksheet;
+};
+
+export const PrintingFloatDom = (props: IPrintingFloatDomProps) => {
+ const { floatDomInfos, scene, skeleton, worksheet } = props;
+ const floatDomParams = useMemo(() => floatDomInfos.map((info) => {
+ const { width, height, angle, left, top } = info.transform!;
+ const offsetBound = transformBound2DOMBound(
+ {
+ left: left ?? 0,
+ right: (left ?? 0) + (width ?? 0),
+ top: top ?? 0,
+ bottom: (top ?? 0) + (height ?? 0),
+ },
+ scene,
+ skeleton,
+ worksheet,
+ undefined,
+ true
+ );
+ const { scaleX, scaleY } = scene.getAncestorScale();
+
+ const domPos: IFloatDomLayout = {
+ startX: offsetBound.left,
+ endX: offsetBound.right,
+ startY: offsetBound.top,
+ endY: offsetBound.bottom,
+ rotate: angle!,
+ width: width! * scaleX,
+ height: height! * scaleY,
+ absolute: offsetBound.absolute,
+ };
+
+ const floatDom: IFloatDom = {
+ position$: new BehaviorSubject<IFloatDomLayout>(domPos),
+ id: info.drawingId,
+ componentKey: info.componentKey,
+ onPointerMove: () => { },
+ onPointerDown: () => { },
+ onPointerUp: () => { },
+ onWheel: () => { },
+ unitId: info.unitId,
+ };
+
+ return [info.drawingId, floatDom] as const;
+ }), [floatDomInfos, scene, skeleton, worksheet]);
+
+ return (
+ <div style={{ position: 'absolute', top: 0, left: 0 }}>
+ {floatDomParams.map(([id, floatDom]) => (
+ <FloatDomSingle key={id} layer={floatDom} id={id} />
+ ))}
+ </div>
+ );
+};
diff --git a/packages/sheets-graphics/package.json b/packages/sheets-graphics/package.json
index aa3812ee2b..3a40988a72 100644
--- a/packages/sheets-graphics/package.json
+++ b/packages/sheets-graphics/package.json
@@ -57,7 +57,8 @@
},
"dependencies": {
"@univerjs/core": "workspace:*",
- "@univerjs/engine-render": "workspace:*"
+ "@univerjs/engine-render": "workspace:*",
+ "@univerjs/sheets-ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/sheets-graphics/src/controllers/graphics-render.controller.ts b/packages/sheets-graphics/src/controllers/graphics-render.controller.ts
index b78aa7afc3..575a2ccea3 100644
--- a/packages/sheets-graphics/src/controllers/graphics-render.controller.ts
+++ b/packages/sheets-graphics/src/controllers/graphics-render.controller.ts
@@ -16,7 +16,8 @@
import type { ISelectionCellWithMergeInfo } from '@univerjs/core';
import type { IRenderContext, IRenderModule, Spreadsheet, SpreadsheetSkeleton, UniverRenderingContext } from '@univerjs/engine-render';
-import { Disposable } from '@univerjs/core';
+import { Disposable, Inject } from '@univerjs/core';
+import { SheetPrintInterceptorService } from '@univerjs/sheets-ui';
import { UNIQUE_KEY } from '../common/const';
import { Graphics } from '../views/extensions/graphics.extension';
@@ -24,10 +25,12 @@ export class SheetGraphicsRenderController extends Disposable implements IRender
private _graphicsExtensionInstance: Graphics | null = null;
constructor(
- private readonly _context: IRenderContext
+ private readonly _context: IRenderContext,
+ @Inject(SheetPrintInterceptorService) private readonly _sheetPrintInterceptorService: SheetPrintInterceptorService
) {
super();
this._initRender();
+ this._initPrinting();
}
private _initRender() {
@@ -38,6 +41,21 @@ export class SheetGraphicsRenderController extends Disposable implements IRender
}
}
+ private _initPrinting() {
+ this.disposeWithMe(this._sheetPrintInterceptorService.interceptor.intercept(
+ this._sheetPrintInterceptorService.interceptor.getInterceptPoints().PRINTING_COMPONENT_COLLECT,
+ {
+ handler: (component, context, next) => {
+ const { spreadsheet } = context;
+ if (this._graphicsExtensionInstance) {
+ spreadsheet.register(this._graphicsExtensionInstance.copy());
+ }
+ return next(component);
+ },
+ }
+ ));
+ }
+
registerRenderer(key: string, renderer: (ctx: UniverRenderingContext, skeleton: SpreadsheetSkeleton, coordInfo: ISelectionCellWithMergeInfo) => void) {
this._graphicsExtensionInstance?.registerRenderer(key, renderer);
}
diff --git a/packages/sheets-graphics/src/views/extensions/graphics.extension.ts b/packages/sheets-graphics/src/views/extensions/graphics.extension.ts
index 2360d2d3bb..94bd11b657 100644
--- a/packages/sheets-graphics/src/views/extensions/graphics.extension.ts
+++ b/packages/sheets-graphics/src/views/extensions/graphics.extension.ts
@@ -54,4 +54,12 @@ export class Graphics extends SheetExtension {
override dispose(): void {
this._graphicsRenderMap.clear();
}
+
+ copy() {
+ const newGraphics = new Graphics();
+ this._graphicsRenderMap.forEach((renderer, key) => {
+ newGraphics.registerRenderer(key, renderer);
+ });
+ return newGraphics;
+ }
}
diff --git a/packages/sheets-ui/src/services/print-interceptor.service.ts b/packages/sheets-ui/src/services/print-interceptor.service.ts
index 9540f1d4c6..8583a74e9b 100644
--- a/packages/sheets-ui/src/services/print-interceptor.service.ts
+++ b/packages/sheets-ui/src/services/print-interceptor.service.ts
@@ -14,22 +14,37 @@
* limitations under the License.
*/
-import type { IRange } from '@univerjs/core';
+import type { DisposableCollection, IRange, Worksheet } from '@univerjs/core';
+import type { Engine, Scene, Spreadsheet, SpreadsheetSkeleton } from '@univerjs/engine-render';
import { createInterceptorKey, Disposable, InterceptorManager } from '@univerjs/core';
-import type { Scene } from '@univerjs/engine-render';
-interface ISheetPos {
+interface ISheetPrintContext {
unitId: string;
subUnitId: string;
+ scene: Scene;
+ engine: Engine;
+ root: HTMLElement;
+ worksheet: Worksheet;
+ skeleton: SpreadsheetSkeleton;
+ offset: {
+ offsetX: number;
+ offsetY: number;
+ };
}
-const PRINTING_RANGE = createInterceptorKey<IRange, ISheetPos>('PRINTING_RANGE');
-const PRINTING_COMPONENT_COLLECT = createInterceptorKey<undefined, ISheetPos & { scene: Scene }>('PRINTING_COMPONENT_COLLECT');
+interface ISheetPrintComponentContext extends ISheetPrintContext {
+ spreadsheet: Spreadsheet;
+}
+
+const PRINTING_RANGE = createInterceptorKey<IRange, { unitId: string; subUnitId: string }>('PRINTING_RANGE');
+const PRINTING_COMPONENT_COLLECT = createInterceptorKey<undefined, ISheetPrintComponentContext>('PRINTING_COMPONENT_COLLECT');
+const PRINTING_DOM_COLLECT = createInterceptorKey<DisposableCollection, ISheetPrintContext>('PRINTING_DOM_COLLECT');
export class SheetPrintInterceptorService extends Disposable {
readonly interceptor = new InterceptorManager({
PRINTING_RANGE,
PRINTING_COMPONENT_COLLECT,
+ PRINTING_DOM_COLLECT,
});
constructor() {
@@ -43,5 +58,10 @@ export class SheetPrintInterceptorService extends Disposable {
priority: -1,
handler: (_value) => _value,
}));
+
+ this.disposeWithMe(this.interceptor.intercept(this.interceptor.getInterceptPoints().PRINTING_DOM_COLLECT, {
+ priority: -1,
+ handler: (_value) => _value,
+ }));
}
}
diff --git a/packages/ui/src/controllers/ui/ui-desktop.controller.tsx b/packages/ui/src/controllers/ui/ui-desktop.controller.tsx
index 081bc7821a..3e6abe874c 100644
--- a/packages/ui/src/controllers/ui/ui-desktop.controller.tsx
+++ b/packages/ui/src/controllers/ui/ui-desktop.controller.tsx
@@ -15,11 +15,13 @@
*/
import type { IDisposable } from '@univerjs/core';
+import type { IUniverWorkbenchProps } from '../../views/workbench/Workbench';
import type { IUniverUIConfig } from '../config.schema';
import type { IWorkbenchOptions } from './ui.controller';
import { Inject, Injector, IUniverInstanceService, LifecycleService, toDisposable } from '@univerjs/core';
import { render as createRoot, unmount } from '@univerjs/design';
import { IRenderManagerService } from '@univerjs/engine-render';
+import React from 'react';
import { ComponentManager } from '../../common';
import { HEADING_ITEM_COMPONENT, HeadingItem } from '../../components';
import { COMMON_LABEL_COMPONENT, CommonLabel } from '../../components/common-label';
@@ -102,7 +104,7 @@ function bootstrap(
mountContainer = createContainer('univer');
}
- const ConnectedApp = connectInjector(DesktopWorkbench, injector);
+ const ConnectedApp = connectInjector(DesktopWorkbench, injector) as React.ComponentType<IUniverWorkbenchProps>;
const onRendered = (contentElement: HTMLElement) => callback(contentElement, mountContainer);
function render() {
diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts
index ba18a87a53..f8971fc1ba 100644
--- a/packages/ui/src/index.ts
+++ b/packages/ui/src/index.ts
@@ -114,7 +114,7 @@ export { useSidebarClick } from './services/sidebar/hooks/use-sidebar-click';
export { ILeftSidebarService, ISidebarService } from './services/sidebar/sidebar.service';
export { DesktopZenZoneService } from './services/zen-zone/desktop-zen-zone.service';
export { IZenZoneService } from './services/zen-zone/zen-zone.service';
-
+export { FloatDomSingle } from './views/components/dom/FloatDom';
export { DISABLE_AUTO_FOCUS_KEY, UniverUIPlugin } from './ui-plugin';
export { UNIVER_UI_PLUGIN_NAME } from './ui-plugin';
diff --git a/packages/ui/src/views/components/dom/FloatDom.tsx b/packages/ui/src/views/components/dom/FloatDom.tsx
index ece437e828..155f14300e 100644
--- a/packages/ui/src/views/components/dom/FloatDom.tsx
+++ b/packages/ui/src/views/components/dom/FloatDom.tsx
@@ -22,9 +22,9 @@ import { ComponentManager } from '../../../common';
import { CanvasFloatDomService } from '../../../services/dom/canvas-dom-layer.service';
import { useDependency, useObservable } from '../../../utils/di';
-const FloatDomSingle = memo((props: { layer: IFloatDom; id: string }) => {
+export const FloatDomSingle = memo((props: { layer: IFloatDom; id: string }) => {
const { layer, id } = props;
- const componentManager = useDependency(ComponentManager);
+
const size$ = useMemo(() => layer.position$.pipe(
distinctUntilChanged(
(prev, curr) => prev.absolute.left === curr.absolute.left &&
@@ -43,7 +43,7 @@ const FloatDomSingle = memo((props: { layer: IFloatDom; id: string }) => {
const innerStyle = useRef<React.CSSProperties>({
});
- const Component = typeof layer.componentKey === 'string' ? componentManager.get(layer.componentKey) : layer.componentKey;
+ const Component = typeof layer.componentKey === 'string' ? useDependency(ComponentManager).get(layer.componentKey) : layer.componentKey;
const layerProps: any = useMemo(() => ({
data: layer.data,
...layer.props,
@@ -105,6 +105,7 @@ const FloatDomSingle = memo((props: { layer: IFloatDom; id: string }) => {
floatDomId={layer.id}
context={{
docDisabled,
+ root: innerDomRef,
}}
/>
)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8587791648..dec99fc76e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2521,6 +2521,9 @@ importers:
'@univerjs/engine-render':
specifier: workspace:*
version: link:../engine-render
+ '@univerjs/sheets-ui':
+ specifier: workspace:*
+ version: link:../sheets-ui
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*