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): preserve drawing z-index order (#7524)
siam7f671e4dbcf6
diff --git a/packages/sheets-drawing-ui/src/services/__tests__/canvas-float-dom-manager.service.spec.ts b/packages/sheets-drawing-ui/src/services/__tests__/canvas-float-dom-manager.service.spec.tsindex 6d9948ae76..57d27b42cf 100644--- a/packages/sheets-drawing-ui/src/services/__tests__/canvas-float-dom-manager.service.spec.ts+++ b/packages/sheets-drawing-ui/src/services/__tests__/canvas-float-dom-manager.service.spec.ts@@ -1451,6 +1451,37 @@ describe('SheetCanvasFloatDomManagerService', () => {chartDom.dispose();});+ it('initializes overlapping chart render object z-indexes from drawing order', async () => {+ const fixture = setup();+ disposables.push(fixture);++ await fixture.commandService.executeCommand(InsertSheetDrawingCommand.id, {+ unitId: 'test',+ drawings: [+ {+ unitId: 'test',+ subUnitId: 'sheet1',+ drawingId: 'chart-a',+ drawingType: DrawingTypeEnum.DRAWING_CHART,+ componentKey: 'ChartCard',+ transform: { left: 120, top: 72, width: 240, height: 144 },+ },+ {+ unitId: 'test',+ subUnitId: 'sheet1',+ drawingId: 'chart-b',+ drawingType: DrawingTypeEnum.DRAWING_CHART,+ componentKey: 'ChartCard',+ transform: { left: 120, top: 72, width: 240, height: 144 },+ },+ ],+ });++ expect(fixture.get(ISheetDrawingService).getDrawingOrder('test', 'sheet1')).toEqual(['chart-b', 'chart-a']);+ expect(fixture.manager.getFloatDomInfo('chart-b')?.rect.zIndex).toBe(0);+ expect(fixture.manager.getFloatDomInfo('chart-a')?.rect.zIndex).toBe(1);+ });+it('falls back to the default rect after a chart render object factory is disposed', () => {const fixture = setup();disposables.push(fixture);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 b122758cb7..569d2e6448 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@@ -1174,6 +1174,13 @@ export class SheetCanvasFloatDomManagerService extends Disposable {return { scene, transformer, renderUnit, canvas };}+ private _getDrawingZIndex(unitId: string, subUnitId: string, drawingId: string): number {+ const drawingOrder = this._drawingManagerService.getDrawingOrder(unitId, subUnitId);+ const drawingIndex = drawingOrder.indexOf(drawingId);++ return drawingIndex < 0 ? drawingOrder.length - 1 : drawingIndex;+ }+// eslint-disable-next-line max-lines-per-functionprivate _drawingAddListener() {this.disposeWithMe(@@ -1256,7 +1263,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {top,width,height,- zIndex: this._drawingManagerService.getDrawingOrder(unitId, subUnitId).length - 1,+ zIndex: this._getDrawingZIndex(unitId, subUnitId, drawingId),};const isChart = drawingType === DrawingTypeEnum.DRAWING_CHART;