From 528517094373b5fa9ca2145bb259889db865a588 Mon Sep 17 00:00:00 2001 From: zjx-git <53986795+zjx-git@users.noreply.github.com> Date: Wed, 21 Aug 2024 17:51:55 +0800 Subject: [PATCH] fix: set row margin boundary error --- src/editor/core/draw/Draw.ts | 4 ++-- src/editor/core/range/RangeManager.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/editor/core/draw/Draw.ts b/src/editor/core/draw/Draw.ts index fb3387c..2e52b5b 100644 --- a/src/editor/core/draw/Draw.ts +++ b/src/editor/core/draw/Draw.ts @@ -1188,7 +1188,7 @@ export class Draw { const { defaultBasicRowMarginHeight, defaultRowMargin, scale } = this.options return ( - defaultBasicRowMarginHeight * (el.rowMargin || defaultRowMargin) * scale + defaultBasicRowMarginHeight * (el.rowMargin ?? defaultRowMargin) * scale ) } @@ -1227,7 +1227,7 @@ export class Draw { const curRow: IRow = rowList[rowList.length - 1] const element = elementList[i] const rowMargin = - defaultBasicRowMarginHeight * (element.rowMargin || defaultRowMargin) + defaultBasicRowMarginHeight * (element.rowMargin ?? defaultRowMargin) const metrics: IElementMetrics = { width: 0, height: 0, diff --git a/src/editor/core/range/RangeManager.ts b/src/editor/core/range/RangeManager.ts index a377f24..f0ad4b8 100644 --- a/src/editor/core/range/RangeManager.ts +++ b/src/editor/core/range/RangeManager.ts @@ -430,7 +430,7 @@ export class RangeManager { const color = curElement.color || null const highlight = curElement.highlight || null const rowFlex = curElement.rowFlex || null - const rowMargin = curElement.rowMargin || this.options.defaultRowMargin + const rowMargin = curElement.rowMargin ?? this.options.defaultRowMargin const dashArray = curElement.dashArray || [] const level = curElement.level || null const listType = curElement.listType || null