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(docs-ui): support heading spacing style (#4912)
ZhangWei908e15da3a8d
diff --git a/packages/core/src/types/const/const.ts b/packages/core/src/types/const/const.tsindex eebc487649..83b834ca5e 100644--- a/packages/core/src/types/const/const.ts+++ b/packages/core/src/types/const/const.ts@@ -15,7 +15,7 @@*/import type { Nullable } from '../../shared';-import type { ITextStyle } from '../interfaces';+import type { IParagraphStyle, ITextStyle } from '../interfaces';import { DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DOCS_ZEN_EDITOR_UNIT_ID_KEY } from '../../common/const';import {BooleanNumber,@@ -185,9 +185,76 @@ export const NAMED_STYLE_MAP: Record<NamedStyleType, Nullable<ITextStyle>> = {[NamedStyleType.HEADING_3]: { fs: 16, bl: 1 }, // Heading 3: 16pt, bold[NamedStyleType.HEADING_4]: { fs: 14, bl: 1 }, // Heading 4: 14pt, bold[NamedStyleType.HEADING_5]: { fs: 12, bl: 1 }, // Heading 5: 12pt, bold- [NamedStyleType.HEADING_6]: { fs: 11, bl: 1 }, // Heading 6: 11pt, bold[NamedStyleType.NORMAL_TEXT]: { fs: 11 }, // Normal text: 11pt[NamedStyleType.TITLE]: { fs: 26, bl: 1 }, // Title: 26pt, bold[NamedStyleType.SUBTITLE]: { fs: 15, cl: { rgb: '#999999' } }, // Subtitle: 15pt[NamedStyleType.NAMED_STYLE_TYPE_UNSPECIFIED]: null,};++export const NAMED_STYLE_SPACE_MAP: Record<NamedStyleType, Nullable<IParagraphStyle>> = {+ [NamedStyleType.HEADING_1]: {+ spaceAbove: {+ v: 20,+ },+ spaceBelow: {+ v: 6,+ },+ },+ [NamedStyleType.HEADING_2]: {+ spaceAbove: {+ v: 18,+ },+ spaceBelow: {+ v: 6,+ },+ },+ [NamedStyleType.HEADING_3]: {+ spaceAbove: {+ v: 18,+ },+ spaceBelow: {+ v: 6,+ },+ },+ [NamedStyleType.HEADING_4]: {+ spaceAbove: {+ v: 16,+ },+ spaceBelow: {+ v: 4,+ },+ },+ [NamedStyleType.HEADING_5]: {+ spaceAbove: {+ v: 14,+ },+ spaceBelow: {+ v: 4,+ },+ },+ [NamedStyleType.NORMAL_TEXT]: {+ spaceAbove: {+ v: 0,+ },+ spaceBelow: {+ v: 0,+ },+ },+ [NamedStyleType.TITLE]: {+ spaceAbove: {+ v: 0,+ },+ spaceBelow: {+ v: 3,+ },+ },+ [NamedStyleType.SUBTITLE]: {+ spaceAbove: {+ v: 0,+ },+ spaceBelow: {+ v: 16,+ },+ },+ [NamedStyleType.NAMED_STYLE_TYPE_UNSPECIFIED]: null,+};diff --git a/packages/core/src/types/interfaces/i-document-data.ts b/packages/core/src/types/interfaces/i-document-data.tsindex 92e291beb7..1b04f48792 100644--- a/packages/core/src/types/interfaces/i-document-data.ts+++ b/packages/core/src/types/interfaces/i-document-data.ts@@ -760,7 +760,6 @@ export enum NamedStyleType {HEADING_3, // Heading 3.HEADING_4, // Heading 4.HEADING_5, // Heading 5.- HEADING_6, // Heading 6.}// export enum Alignment {diff --git a/packages/docs-ui/src/commands/commands/set-heading.command.ts b/packages/docs-ui/src/commands/commands/set-heading.command.tsindex 2befaf57de..b2c4358081 100644--- a/packages/docs-ui/src/commands/commands/set-heading.command.ts+++ b/packages/docs-ui/src/commands/commands/set-heading.command.ts@@ -50,6 +50,8 @@ export const SetParagraphNamedStyleCommand: ICommand<ISetParagraphNamedStyleCommstyle: {namedStyleType: params.value,headingId: !params.value || params.value === NamedStyleType.NORMAL_TEXT ? undefined : generateRandomId(6),+ spaceAbove: undefined,+ spaceBelow: undefined,},paragraphTextRun: {},@@ -147,5 +149,4 @@ export const QUICK_HEADING_MAP = {'###': NamedStyleType.HEADING_3,'####': NamedStyleType.HEADING_4,'#####': NamedStyleType.HEADING_5,- '######': NamedStyleType.HEADING_6,};diff --git a/packages/docs-ui/src/views/side-menu/index.tsx b/packages/docs-ui/src/views/side-menu/index.tsxindex 86fa6e1536..d4a3a4fd78 100644--- a/packages/docs-ui/src/views/side-menu/index.tsx+++ b/packages/docs-ui/src/views/side-menu/index.tsx@@ -40,8 +40,6 @@ const transformNamedStyleTypeToLevel = (type: NamedStyleType) => {return 4;case NamedStyleType.HEADING_5:return 5;- case NamedStyleType.HEADING_6:- return 6;case NamedStyleType.TITLE:return 1;default:diff --git a/packages/engine-render/src/components/docs/layout/block/paragraph/layout-ruler.ts b/packages/engine-render/src/components/docs/layout/block/paragraph/layout-ruler.tsindex c793c87f15..7deaa7bd8a 100644--- a/packages/engine-render/src/components/docs/layout/block/paragraph/layout-ruler.ts+++ b/packages/engine-render/src/components/docs/layout/block/paragraph/layout-ruler.ts@@ -30,7 +30,7 @@ import type {IFloatObject,ILayoutContext,} from '../../tools';-import { BooleanNumber, DataStreamTreeTokenType, GridType, ObjectRelativeFromV, PositionedObjectLayoutType, SpacingRule, TableTextWrapType } from '@univerjs/core';+import { BooleanNumber, DataStreamTreeTokenType, GridType, NAMED_STYLE_SPACE_MAP, ObjectRelativeFromV, PositionedObjectLayoutType, SpacingRule, TableTextWrapType } from '@univerjs/core';import { GlyphType, LineType } from '../../../../../basics/i-document-skeleton-cached';import { BreakPointType } from '../../line-breaker/break';import { addGlyphToDivide, createSkeletonBulletGlyph } from '../../model/glyph';@@ -448,7 +448,7 @@ function _lineOperator(const glyphLineHeight = defaultGlyphLineHeight || (ascent + descent);const {- paragraphStyle = {},+ paragraphStyle: originParagraphStyle = {},paragraphNonInlineSkeDrawings,skeTablesInParagraph,skeHeaders,@@ -456,6 +456,13 @@ function _lineOperator(pDrawingAnchor,paragraphIndex,} = paragraphConfig;+ const { namedStyleType } = originParagraphStyle;+ const namedStyle = namedStyleType !== undefined ? NAMED_STYLE_SPACE_MAP[namedStyleType] : null;+ const paragraphStyle = {+ ...originParagraphStyle,+ spaceAbove: originParagraphStyle.spaceAbove ?? namedStyle?.spaceAbove,+ spaceBelow: originParagraphStyle.spaceBelow ?? namedStyle?.spaceBelow,+ };const {// direction,diff --git a/packages/ui/src/components/font-size/interface.ts b/packages/ui/src/components/font-size/interface.tsindex 6f97562b7d..388e19845c 100644--- a/packages/ui/src/components/font-size/interface.ts+++ b/packages/ui/src/components/font-size/interface.ts@@ -127,8 +127,4 @@ export const HEADING_LIST = [label: 'toolbar.heading.5',value: NamedStyleType.HEADING_5,},- {- label: 'toolbar.heading.6',- value: NamedStyleType.HEADING_6,- },];