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(formula): fix the issue where images generated by the IMAGE formula could not be aligned (#6249)

wpxp12345653b6c134a817
diff --git a/packages/engine-render/src/components/sheets/sheet.render-skeleton.ts b/packages/engine-render/src/components/sheets/sheet.render-skeleton.ts
index a3b72abdb6..13a66a156e 100644
--- a/packages/engine-render/src/components/sheets/sheet.render-skeleton.ts
+++ b/packages/engine-render/src/components/sheets/sheet.render-skeleton.ts
@@ -1457,6 +1457,8 @@ export class SpreadsheetSkeleton extends SheetSkeleton {
}
const cell = this.worksheet.getCell(row, col) || this.worksheet.getCellRaw(row, col);
+ if (!cell) return;
+
const style = this.worksheet.getComposedCellStyleByCellData(row, col, cell);
this._setBgStylesCache(row, col, style, options);
diff --git a/packages/sheets-formula/src/controllers/image-formula-cell-interceptor.controller.ts b/packages/sheets-formula/src/controllers/image-formula-cell-interceptor.controller.ts
index c5775f9269..19b1f86435 100644
--- a/packages/sheets-formula/src/controllers/image-formula-cell-interceptor.controller.ts
+++ b/packages/sheets-formula/src/controllers/image-formula-cell-interceptor.controller.ts
@@ -18,7 +18,7 @@ import type { ICellData, ICommandInfo, Nullable } from '@univerjs/core';
import type { IImageFormulaInfo, IRuntimeImageFormulaDataType, ISetImageFormulaDataMutationParams, IUnitImageFormulaDataType } from '@univerjs/engine-formula';
import { BooleanNumber, BuildTextUtils, CellValueType, createDocumentModelWithStyle, Disposable, DrawingTypeEnum, generateRandomId, ICommandService, ImageSourceType, Inject, InterceptorEffectEnum, ObjectMatrix, ObjectRelativeFromH, ObjectRelativeFromV, PositionedObjectLayoutType, WrapTextType } from '@univerjs/core';
import { ErrorType, FormulaDataModel, SetImageFormulaDataMutation } from '@univerjs/engine-formula';
-import { INTERCEPTOR_POINT, SheetInterceptorService } from '@univerjs/sheets';
+import { InterceptCellContentPriority, INTERCEPTOR_POINT, SheetInterceptorService } from '@univerjs/sheets';
export class ImageFormulaCellInterceptorController extends Disposable {
private _errorValueCell: ICellData = {
@@ -87,8 +87,8 @@ export class ImageFormulaCellInterceptorController extends Disposable {
private _initInterceptorCellContent() {
this.disposeWithMe(
this._sheetInterceptorService.intercept(INTERCEPTOR_POINT.CELL_CONTENT, {
- priority: 100,
- effect: InterceptorEffectEnum.Value,
+ priority: InterceptCellContentPriority.CELL_IMAGE,
+ effect: InterceptorEffectEnum.Value | InterceptorEffectEnum.Style,
// eslint-disable-next-line max-lines-per-function
handler: (cell, location, next) => {
const { unitId, subUnitId, row, col } = location;
@@ -172,6 +172,7 @@ export class ImageFormulaCellInterceptorController extends Disposable {
if (jsonXActions) {
docDataModel.apply(jsonXActions);
return next({
+ ...cell,
p: docDataModel.getSnapshot(),
});
}