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: cell margin top is not right (#3382)

Ran Luo8b4027efecc9
diff --git a/packages/engine-render/src/components/sheets/sheet-skeleton.ts b/packages/engine-render/src/components/sheets/sheet-skeleton.ts
index 2a18f71033..86609b4b8d 100644
--- a/packages/engine-render/src/components/sheets/sheet-skeleton.ts
+++ b/packages/engine-render/src/components/sheets/sheet-skeleton.ts
@@ -1123,6 +1123,7 @@ export class SpreadsheetSkeleton extends Skeleton {
documentModel = this._updateConfigAndGetDocumentModel(
isDeepClone ? Tools.deepClone(cell.p) : cell.p,
horizontalAlign,
+ paddingData,
{
horizontalAlign,
verticalAlign,
@@ -1815,6 +1816,7 @@ export class SpreadsheetSkeleton extends Skeleton {
private _updateConfigAndGetDocumentModel(
documentData: IDocumentData,
horizontalAlign: HorizontalAlign,
+ paddingData: IPaddingData,
renderConfig?: IDocumentRenderConfig
): Nullable<DocumentDataModel> {
if (!renderConfig) {
@@ -1829,6 +1831,11 @@ export class SpreadsheetSkeleton extends Skeleton {
documentData.documentStyle = {};
}
+ documentData.documentStyle.marginTop = paddingData.t ?? 0;
+ documentData.documentStyle.marginBottom = paddingData.b ?? 2;
+ documentData.documentStyle.marginLeft = paddingData.l ?? 2;
+ documentData.documentStyle.marginRight = paddingData.r ?? 2;
+
// Fix https://github.com/dream-num/univer/issues/1586
documentData.documentStyle.pageSize = {
width: Number.POSITIVE_INFINITY,
diff --git a/packages/sheets-ui/src/controllers/editor/__tests__/end-edit.controller.spec.ts b/packages/sheets-ui/src/controllers/editor/__tests__/end-edit.controller.spec.ts
index 423d3c9dc2..df0484936c 100644
--- a/packages/sheets-ui/src/controllers/editor/__tests__/end-edit.controller.spec.ts
+++ b/packages/sheets-ui/src/controllers/editor/__tests__/end-edit.controller.spec.ts
@@ -63,7 +63,7 @@ const richTextDemo: IDocumentData = {
wrapStrategy: 0,
},
marginTop: 0,
- marginBottom: 0,
+ marginBottom: 1,
marginRight: 2,
marginLeft: 2,
},