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.

refactor(doc): number unit (#2760)

Univer389e38091fa1
diff --git a/examples/src/data/docs/default-document-data-cn.ts b/examples/src/data/docs/default-document-data-cn.ts
index 1e18b9ca1d..5abdf4e3c5 100644
--- a/examples/src/data/docs/default-document-data-cn.ts
+++ b/examples/src/data/docs/default-document-data-cn.ts
@@ -254,41 +254,41 @@ export const DEFAULT_DOCUMENT_DATA_CN: IDocumentData = {
{
startIndex: 4,
paragraphStyle: {
- spaceAbove: 0,
+ spaceAbove: { v: 0 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 5,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 12,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 13,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 127,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
// hanging: 20,
// indentStart: 50,
// indentEnd: 50,
@@ -298,457 +298,457 @@ export const DEFAULT_DOCUMENT_DATA_CN: IDocumentData = {
{
startIndex: 128,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 244,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 245,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 398,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 399,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 618,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 619,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 824,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 825,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1007,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1008,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1130,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1131,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1203,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1204,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1238,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1239,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1256,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1257,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1282,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1283,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1380,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1381,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1396,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1397,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1398,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1399,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1457,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1458,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1559,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1560,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1566,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1670,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1671,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1728,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1729,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1811,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1812,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1912,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1913,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2053,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2054,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2190,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2191,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2341,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2342,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2481,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2482,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2582,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2583,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2750,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2751,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2853,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2854,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2948,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2949,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 3065,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
],
diff --git a/examples/src/data/docs/default-document-data-dreamer.ts b/examples/src/data/docs/default-document-data-dreamer.ts
index 215f58b759..1f6c8762c9 100644
--- a/examples/src/data/docs/default-document-data-dreamer.ts
+++ b/examples/src/data/docs/default-document-data-dreamer.ts
@@ -115,137 +115,137 @@ export const DEFAULT_DOCUMENT_DATA_DREAMER: IDocumentData = {
{
startIndex: 11,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 12,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 100,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 101,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1040,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1041,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1409,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1410,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1830,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 1831,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2103,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2104,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2255,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2256,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2774,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 2775,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 3318,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
],
diff --git a/examples/src/data/docs/default-document-data-en.ts b/examples/src/data/docs/default-document-data-en.ts
index 8afaa07db1..c9d831057c 100644
--- a/examples/src/data/docs/default-document-data-en.ts
+++ b/examples/src/data/docs/default-document-data-en.ts
@@ -263,7 +263,7 @@ export const DEFAULT_DOCUMENT_DATA_EN: IDocumentData = {
{
startIndex: 253,
paragraphStyle: {
- spaceAbove: 30,
+ spaceAbove: { v: 30 },
lineSpacing: 1.5,
suppressHyphenation: BooleanNumber.FALSE,
},
@@ -271,8 +271,8 @@ export const DEFAULT_DOCUMENT_DATA_EN: IDocumentData = {
{
startIndex: 404,
paragraphStyle: {
- spaceAbove: 20,
- indentFirstLine: 20,
+ spaceAbove: { v: 20 },
+ indentFirstLine: { v: 20 },
lineSpacing: 1.5,
},
},
@@ -291,7 +291,7 @@ export const DEFAULT_DOCUMENT_DATA_EN: IDocumentData = {
},
paragraphStyle: {
lineSpacing: 1.5,
- spaceAbove: 20,
+ spaceAbove: { v: 20 },
},
},
{
@@ -305,7 +305,7 @@ export const DEFAULT_DOCUMENT_DATA_EN: IDocumentData = {
},
},
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 1.5,
},
},
@@ -320,58 +320,58 @@ export const DEFAULT_DOCUMENT_DATA_EN: IDocumentData = {
},
},
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 1.5,
},
},
{
startIndex: 713,
paragraphStyle: {
- spaceAbove: 20,
- indentFirstLine: 20,
+ spaceAbove: { v: 20 },
+ indentFirstLine: { v: 20 },
lineSpacing: 1.5,
},
},
{
startIndex: 771,
paragraphStyle: {
- spaceAbove: 20,
+ spaceAbove: { v: 20 },
lineSpacing: 1.5,
},
},
{
startIndex: 1244,
paragraphStyle: {
- spaceAbove: 20,
+ spaceAbove: { v: 20 },
lineSpacing: 1.5,
- indentFirstLine: 20,
+ indentFirstLine: { v: 20 },
},
},
{
startIndex: 1589,
paragraphStyle: {
- indentFirstLine: 20,
+ indentFirstLine: { v: 20 },
lineSpacing: 1.5,
},
},
{
startIndex: 1986,
paragraphStyle: {
- indentFirstLine: 20,
+ indentFirstLine: { v: 20 },
lineSpacing: 1.5,
},
},
{
startIndex: 2062,
paragraphStyle: {
- indentFirstLine: 20,
+ indentFirstLine: { v: 20 },
lineSpacing: 1.5,
},
},
{
startIndex: 2294,
paragraphStyle: {
- indentFirstLine: 20,
+ indentFirstLine: { v: 20 },
lineSpacing: 1.5,
},
bullet: {
@@ -386,7 +386,7 @@ export const DEFAULT_DOCUMENT_DATA_EN: IDocumentData = {
{
startIndex: 2438,
paragraphStyle: {
- indentFirstLine: 20,
+ indentFirstLine: { v: 20 },
lineSpacing: 1.5,
},
bullet: {
@@ -401,7 +401,7 @@ export const DEFAULT_DOCUMENT_DATA_EN: IDocumentData = {
{
startIndex: 2628,
paragraphStyle: {
- indentFirstLine: 20,
+ indentFirstLine: { v: 20 },
lineSpacing: 1.5,
},
bullet: {
diff --git a/examples/src/data/docs/default-document.data-simple.ts b/examples/src/data/docs/default-document.data-simple.ts
index 771fbce848..27fcef8eff 100644
--- a/examples/src/data/docs/default-document.data-simple.ts
+++ b/examples/src/data/docs/default-document.data-simple.ts
@@ -54,17 +54,17 @@ export const DEFAULT_DOCUMENT_DATA_SIMPLE: IDocumentData = {
{
startIndex: 4,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 36,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
],
diff --git a/examples/src/data/sheets/demo/default-workbook-data-demo.ts b/examples/src/data/sheets/demo/default-workbook-data-demo.ts
index 564c4d51e1..322923b9ce 100644
--- a/examples/src/data/sheets/demo/default-workbook-data-demo.ts
+++ b/examples/src/data/sheets/demo/default-workbook-data-demo.ts
@@ -40,7 +40,7 @@ const richTextDemo: IDocumentData = {
{
startIndex: 489,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 1.2,
},
},
diff --git a/examples/src/data/sheets/demo/default-workbook-data-demo3.ts b/examples/src/data/sheets/demo/default-workbook-data-demo3.ts
index 86860adba0..5f72d6985e 100644
--- a/examples/src/data/sheets/demo/default-workbook-data-demo3.ts
+++ b/examples/src/data/sheets/demo/default-workbook-data-demo3.ts
@@ -36,7 +36,7 @@ const richTextDemo: IDocumentData = {
{
startIndex: 489,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 1.2,
},
},
diff --git a/examples/src/data/slides/rich-text/page3-richtext1.ts b/examples/src/data/slides/rich-text/page3-richtext1.ts
index cbbabd3563..3c88941f79 100644
--- a/examples/src/data/slides/rich-text/page3-richtext1.ts
+++ b/examples/src/data/slides/rich-text/page3-richtext1.ts
@@ -59,7 +59,7 @@ export const PAGE3_RICHTEXT_1 = {
},
},
paragraphStyle: {
- spaceBelow: 15,
+ spaceBelow: { v: 15 },
},
},
{
diff --git a/examples/src/data/slides/rich-text/page3-richtext2.ts b/examples/src/data/slides/rich-text/page3-richtext2.ts
index e1a36f1b03..8d1bdf69ee 100644
--- a/examples/src/data/slides/rich-text/page3-richtext2.ts
+++ b/examples/src/data/slides/rich-text/page3-richtext2.ts
@@ -59,7 +59,7 @@ export const PAGE3_RICHTEXT_2 = {
},
},
paragraphStyle: {
- spaceBelow: 15,
+ spaceBelow: { v: 15 },
},
},
{
diff --git a/examples/src/data/slides/rich-text/page3-richtext3.ts b/examples/src/data/slides/rich-text/page3-richtext3.ts
index 25c7d9d939..6d45fcc2c3 100644
--- a/examples/src/data/slides/rich-text/page3-richtext3.ts
+++ b/examples/src/data/slides/rich-text/page3-richtext3.ts
@@ -59,7 +59,7 @@ export const PAGE3_RICHTEXT_3 = {
},
},
paragraphStyle: {
- spaceBelow: 15,
+ spaceBelow: { v: 15 },
},
},
{
diff --git a/examples/src/data/slides/rich-text/page5-richtext1.ts b/examples/src/data/slides/rich-text/page5-richtext1.ts
index cbaddf48ce..b9bbba00e0 100644
--- a/examples/src/data/slides/rich-text/page5-richtext1.ts
+++ b/examples/src/data/slides/rich-text/page5-richtext1.ts
@@ -92,15 +92,15 @@ export const PAGE5_RICHTEXT_1: IDocumentData = {
{
startIndex: 253,
paragraphStyle: {
- spaceAbove: 20,
- indentFirstLine: 20,
+ spaceAbove: { v: 20 },
+ indentFirstLine: { v: 20 },
},
},
{
startIndex: 404,
paragraphStyle: {
- spaceAbove: 20,
- indentFirstLine: 20,
+ spaceAbove: { v: 20 },
+ indentFirstLine: { v: 20 },
},
},
{
diff --git a/packages/core/src/docs/data-model/__tests__/replacement.spec.ts b/packages/core/src/docs/data-model/__tests__/replacement.spec.ts
index 78864a1fb6..6e93c62d2c 100644
--- a/packages/core/src/docs/data-model/__tests__/replacement.spec.ts
+++ b/packages/core/src/docs/data-model/__tests__/replacement.spec.ts
@@ -18,6 +18,7 @@ import { describe, expect, it } from 'vitest';
import { BooleanNumber } from '../../../types/enum/text-style';
import { replaceInDocumentBody } from '../replacement';
+import type { IDocumentBody } from '../../../types/interfaces';
function getTestDocumentBody() {
const documentBody = {
@@ -64,17 +65,17 @@ function getTestDocumentBody() {
{
startIndex: 4,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 11,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
],
@@ -83,7 +84,7 @@ function getTestDocumentBody() {
startIndex: 12,
},
],
- };
+ } as IDocumentBody;
return documentBody;
}
@@ -125,17 +126,17 @@ describe('test case in replaceInDocumentBody utils', () => {
{
startIndex: 6,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 15,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
],
@@ -144,7 +145,7 @@ describe('test case in replaceInDocumentBody utils', () => {
startIndex: 16,
},
],
- };
+ } as IDocumentBody;
expect(replaceInDocumentBody(documentBody, '月色', 'Jocs')).toEqual(expectedBody);
});
@@ -183,17 +184,17 @@ describe('test case in replaceInDocumentBody utils', () => {
{
startIndex: 2,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 7,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
],
@@ -202,7 +203,7 @@ describe('test case in replaceInDocumentBody utils', () => {
startIndex: 8,
},
],
- };
+ } as IDocumentBody;
expect(replaceInDocumentBody(documentBody, '月色', '')).toEqual(expectedBody);
});
diff --git a/packages/core/src/docs/data-model/empty-snapshot.ts b/packages/core/src/docs/data-model/empty-snapshot.ts
index b24eadcb6e..24784fbf55 100644
--- a/packages/core/src/docs/data-model/empty-snapshot.ts
+++ b/packages/core/src/docs/data-model/empty-snapshot.ts
@@ -34,9 +34,9 @@ export function getEmptySnapshot(
{
startIndex: 0,
paragraphStyle: {
- spaceAbove: 5,
+ spaceAbove: { v: 5 },
lineSpacing: 1,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
],
diff --git a/packages/core/src/docs/data-model/preset-list-type.ts b/packages/core/src/docs/data-model/preset-list-type.ts
index d2e7ba7401..89124d0938 100644
--- a/packages/core/src/docs/data-model/preset-list-type.ts
+++ b/packages/core/src/docs/data-model/preset-list-type.ts
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import type { IListData, INestingLevel } from '../../types/interfaces/i-document-data';
import { BulletAlignment, GlyphType } from '../../types/interfaces/i-document-data';
export enum PresetListType {
@@ -33,8 +34,8 @@ export const PRESET_LIST_TYPE = {
},
startNumber: 0,
glyphSymbol: '\u25CF',
- hanging: 21,
- indentStart: 21,
+ hanging: { v: 21 },
+ indentStart: { v: 21 },
},
{
bulletAlignment: BulletAlignment.START,
@@ -44,8 +45,8 @@ export const PRESET_LIST_TYPE = {
},
startNumber: 0,
glyphSymbol: '\u25A0',
- hanging: 21,
- indentStart: 42,
+ hanging: { v: 21 },
+ indentStart: { v: 42 },
},
{
bulletAlignment: BulletAlignment.START,
@@ -55,11 +56,11 @@ export const PRESET_LIST_TYPE = {
},
startNumber: 0,
glyphSymbol: '\u25C6',
- hanging: 21,
- indentStart: 63,
+ hanging: { v: 21 },
+ indentStart: { v: 63 },
},
- ],
- },
+ ] as INestingLevel[],
+ } as IListData,
[PresetListType.ORDER_LIST]: {
listType: PresetListType.ORDER_LIST,
nestingLevel: [
@@ -71,8 +72,8 @@ export const PRESET_LIST_TYPE = {
},
startNumber: 0,
glyphType: GlyphType.DECIMAL,
- hanging: 21,
- indentStart: 21,
+ hanging: { v: 21 },
+ indentStart: { v: 21 },
},
{
bulletAlignment: BulletAlignment.START,
@@ -82,8 +83,8 @@ export const PRESET_LIST_TYPE = {
},
startNumber: 0,
glyphType: GlyphType.DECIMAL,
- hanging: 21,
- indentStart: 42,
+ hanging: { v: 21 },
+ indentStart: { v: 42 },
},
{
bulletAlignment: BulletAlignment.START,
@@ -93,9 +94,9 @@ export const PRESET_LIST_TYPE = {
},
startNumber: 0,
glyphType: GlyphType.DECIMAL,
- hanging: 21,
- indentStart: 63,
+ hanging: { v: 21 },
+ indentStart: { v: 63 },
},
- ],
- },
+ ] as INestingLevel[],
+ } as IListData,
};
diff --git a/packages/core/src/docs/data-model/text-x/__tests__/utils.spec.ts b/packages/core/src/docs/data-model/text-x/__tests__/utils.spec.ts
index 9dbb477d69..62af9ed16e 100644
--- a/packages/core/src/docs/data-model/text-x/__tests__/utils.spec.ts
+++ b/packages/core/src/docs/data-model/text-x/__tests__/utils.spec.ts
@@ -250,9 +250,9 @@ describe('test text-x utils', () => {
paragraphs: [{
startIndex: 5,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
}],
};
@@ -264,9 +264,9 @@ describe('test text-x utils', () => {
paragraphs: [{
startIndex: 5,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
}],
});
@@ -285,9 +285,9 @@ describe('test text-x utils', () => {
paragraphs: [{
startIndex: 5,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
}],
};
@@ -301,9 +301,9 @@ describe('test text-x utils', () => {
}, {
startIndex: 5,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
}],
});
@@ -322,9 +322,9 @@ describe('test text-x utils', () => {
paragraphs: [{
startIndex: 5,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
}],
};
@@ -336,9 +336,9 @@ describe('test text-x utils', () => {
paragraphs: [{
startIndex: 5,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
}, {
startIndex: 8,
diff --git a/packages/core/src/shared/doc-tool.ts b/packages/core/src/shared/doc-tool.ts
index 096dbd9344..05d5b0a56e 100644
--- a/packages/core/src/shared/doc-tool.ts
+++ b/packages/core/src/shared/doc-tool.ts
@@ -78,8 +78,8 @@ export function checkParagraphHasIndentByStyle(paragraphStyle?: IParagraphStyle)
}
if (
- ((paragraphStyle.indentStart == null || paragraphStyle.indentStart === 0) && paragraphStyle.hanging == null) ||
- paragraphStyle.hanging === 0
+ ((paragraphStyle.indentStart == null || paragraphStyle.indentStart.v === 0) && paragraphStyle.hanging == null) ||
+ paragraphStyle.hanging?.v === 0
) {
return false;
}
diff --git a/packages/core/src/types/interfaces/i-document-data.ts b/packages/core/src/types/interfaces/i-document-data.ts
index 5f5cd656a9..89af1d72cb 100644
--- a/packages/core/src/types/interfaces/i-document-data.ts
+++ b/packages/core/src/types/interfaces/i-document-data.ts
@@ -621,9 +621,9 @@ export interface ITextStyle extends IStyleBase {
}
export interface IIndentStart {
- indentFirstLine?: INumberUnit | number; // indentFirstLine,17.3.1.12 ind (Paragraph Indentation)
- hanging?: INumberUnit | number; // hanging,offset of first word except first line
- indentStart?: INumberUnit | number; // indentStart
+ indentFirstLine?: INumberUnit ; // indentFirstLine,17.3.1.12 ind (Paragraph Indentation)
+ hanging?: INumberUnit ; // hanging,offset of first word except first line
+ indentStart?: INumberUnit ; // indentStart
tabStops?: ITabStop[]; // tabStops
}
@@ -638,14 +638,14 @@ export interface IParagraphStyle extends IIndentStart {
direction?: TextDirection; // direction
spacingRule?: SpacingRule; // SpacingRule
snapToGrid?: BooleanNumber; // snapToGrid 17.3.2.34 snapToGrid (Use Document Grid Settings For Inter-Character Spacing)
- spaceAbove?: INumberUnit | number; // spaceAbove before beforeLines (Spacing Above Paragraph)
- spaceBelow?: INumberUnit | number; // spaceBelow after afterLines (Spacing Below Paragraph)
+ spaceAbove?: INumberUnit ; // spaceAbove before beforeLines (Spacing Above Paragraph)
+ spaceBelow?: INumberUnit ; // spaceBelow after afterLines (Spacing Below Paragraph)
borderBetween?: IParagraphBorder; // borderBetween
borderTop?: IParagraphBorder; // borderTop
borderBottom?: IParagraphBorder; // borderBottom
borderLeft?: IParagraphBorder; // borderLeft
borderRight?: IParagraphBorder; // borderRight
- indentEnd?: INumberUnit | number; // indentEnd
+ indentEnd?: INumberUnit ; // indentEnd
keepLines?: BooleanNumber; // 17.3.1.14 keepLines (Keep All Lines On One Page)
keepNext?: BooleanNumber; // 17.3.1.15 keepNext (Keep Paragraph With Next Paragraph)
wordWrap?: BooleanNumber; // 17.3.1.45 wordWrap (Allow Line Breaking At Character Level)
@@ -832,7 +832,7 @@ export enum FontStyleType {
export interface INumberUnit {
v: number; // value
- u: NumberUnitType; // unit
+ u?: NumberUnitType; // unit
}
export interface IObjectPositionH {
@@ -878,6 +878,7 @@ export enum NumberUnitType {
POINT,
LINE,
CHARACTER,
+ PIXEL,
}
// 20.4.3.1 ST_AlignH (Relative Horizontal Alignment Positions)
diff --git a/packages/docs-ui/src/commands/commands/doc-header-footer.command.ts b/packages/docs-ui/src/commands/commands/doc-header-footer.command.ts
index 5a8b6bd389..613127e6aa 100644
--- a/packages/docs-ui/src/commands/commands/doc-header-footer.command.ts
+++ b/packages/docs-ui/src/commands/commands/doc-header-footer.command.ts
@@ -37,9 +37,9 @@ function getEmptyHeaderFooterBody(): IDocumentBody {
{
startIndex: 0,
paragraphStyle: {
- spaceAbove: 0,
+ spaceAbove: { v: 0 },
lineSpacing: 1.5,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
],
diff --git a/packages/docs-ui/src/services/clipboard/html-to-udm/utils.ts b/packages/docs-ui/src/services/clipboard/html-to-udm/utils.ts
index eb81c8869d..84c836f1d0 100644
--- a/packages/docs-ui/src/services/clipboard/html-to-udm/utils.ts
+++ b/packages/docs-ui/src/services/clipboard/html-to-udm/utils.ts
@@ -30,13 +30,13 @@ export function getParagraphStyle(el: HTMLElement): Nullable<IParagraphStyle> {
switch (cssRule) {
case 'margin-top': {
const marginTopValue = Number.parseInt(cssValue);
- paragraphStyle.spaceAbove = /pt/.test(cssValue) ? ptToPixel(marginTopValue) : marginTopValue;
+ paragraphStyle.spaceAbove = { v: /pt/.test(cssValue) ? ptToPixel(marginTopValue) : marginTopValue };
break;
}
case 'margin-bottom': {
const marginBottomValue = Number.parseInt(cssValue);
- paragraphStyle.spaceBelow = /pt/.test(cssValue) ? ptToPixel(marginBottomValue) : marginBottomValue;
+ paragraphStyle.spaceBelow = { v: /pt/.test(cssValue) ? ptToPixel(marginBottomValue) : marginBottomValue };
break;
}
diff --git a/packages/docs-ui/src/services/clipboard/udm-to-html/__test__/convertor.spec.ts b/packages/docs-ui/src/services/clipboard/udm-to-html/__test__/convertor.spec.ts
index 7d19c86dae..cbfd83e78a 100644
--- a/packages/docs-ui/src/services/clipboard/udm-to-html/__test__/convertor.spec.ts
+++ b/packages/docs-ui/src/services/clipboard/udm-to-html/__test__/convertor.spec.ts
@@ -15,6 +15,7 @@
*/
import { describe, expect, it } from 'vitest';
+import type { IDocumentBody } from '@univerjs/core';
import { BooleanNumber } from '@univerjs/core';
import { convertBodyToHtml, covertTextRunToHtml, getBodySliceHtml, UDMToHtmlService } from '../convertor';
@@ -39,21 +40,21 @@ function getTestBody() {
{
startIndex: 4,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 11,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
],
- };
+ } as IDocumentBody;
}
describe('test case in html and udm convert', () => {
@@ -93,7 +94,7 @@ describe('test case in html and udm convert', () => {
const documentBody = getTestBody();
const expectedHtml = '<span style="font-family: Microsoft YaHei; color: rgb(0, 0, 0); font-size: 24pt;"><strong>塘月</strong></span>';
- expect(covertTextRunToHtml(documentBody.dataStream, documentBody.textRuns[0])).toBe(expectedHtml);
+ expect(covertTextRunToHtml(documentBody.dataStream, documentBody.textRuns![0])).toBe(expectedHtml);
});
it('Should get getBodySliceHtml', () => {
diff --git a/packages/docs/src/commands/commands/__tests__/clipboard.command.spec.ts b/packages/docs/src/commands/commands/__tests__/clipboard.command.spec.ts
index 75e3535799..7143189c70 100644
--- a/packages/docs/src/commands/commands/__tests__/clipboard.command.spec.ts
+++ b/packages/docs/src/commands/commands/__tests__/clipboard.command.spec.ts
@@ -75,8 +75,8 @@ function getDocumentData() {
{
startIndex: 68,
paragraphStyle: {
- spaceAbove: 20,
- indentFirstLine: 20,
+ spaceAbove: { v: 20 },
+ indentFirstLine: { v: 20 },
},
},
],
diff --git a/packages/docs/src/commands/commands/__tests__/create-command-test-bed.ts b/packages/docs/src/commands/commands/__tests__/create-command-test-bed.ts
index 15839c6347..3a7992289d 100644
--- a/packages/docs/src/commands/commands/__tests__/create-command-test-bed.ts
+++ b/packages/docs/src/commands/commands/__tests__/create-command-test-bed.ts
@@ -75,8 +75,8 @@ const TEST_DOCUMENT_DATA_EN: IDocumentData = {
{
startIndex: 68,
paragraphStyle: {
- spaceAbove: 20,
- indentFirstLine: 20,
+ spaceAbove: { v: 20 },
+ indentFirstLine: { v: 20 },
},
},
],
diff --git a/packages/docs/src/commands/commands/list.command.ts b/packages/docs/src/commands/commands/list.command.ts
index dafc4fad11..807a164bb7 100644
--- a/packages/docs/src/commands/commands/list.command.ts
+++ b/packages/docs/src/commands/commands/list.command.ts
@@ -117,7 +117,7 @@ export const ListOperationCommand: ICommand<IListOperationCommandParams> = {
for (const paragraph of currentParagraphs) {
const { startIndex, paragraphStyle = {} } = paragraph;
- const { indentFirstLine = 0, snapToGrid, indentStart = 0 } = paragraphStyle;
+ const { indentFirstLine, snapToGrid, indentStart } = paragraphStyle;
const { hanging: listHanging, indentStart: listIndentStart } = lists[listType].nestingLevel[0];
const charSpaceApply = getCharSpaceApply(charSpace, defaultTabStop, gridType, snapToGrid);
@@ -139,7 +139,7 @@ export const ListOperationCommand: ICommand<IListOperationCommandParams> = {
paragraphStyle: {
...paragraphStyle,
hanging: undefined,
- indentStart: indentStart ? Math.max(0, getNumberUnitValue(indentStart, charSpaceApply) + listHanging - listIndentStart) : undefined,
+ indentStart: indentStart ? { v: Math.max(0, getNumberUnitValue(indentStart, charSpaceApply) + getNumberUnitValue(listHanging, charSpaceApply) - getNumberUnitValue(listIndentStart, charSpaceApply)) } : undefined,
},
startIndex: 0,
}
@@ -149,7 +149,7 @@ export const ListOperationCommand: ICommand<IListOperationCommandParams> = {
...paragraphStyle,
indentFirstLine: undefined,
hanging: listHanging,
- indentStart: listIndentStart - listHanging + getNumberUnitValue(indentFirstLine, charSpaceApply) + getNumberUnitValue(indentStart, charSpaceApply),
+ indentStart: { v: getNumberUnitValue(listIndentStart, charSpaceApply) - getNumberUnitValue(listHanging, charSpaceApply) + getNumberUnitValue(indentFirstLine, charSpaceApply) + getNumberUnitValue(indentStart, charSpaceApply) },
},
bullet: {
...(paragraph.bullet ?? {
diff --git a/packages/engine-render/src/components/docs/layout/block/paragraph/bullet.ts b/packages/engine-render/src/components/docs/layout/block/paragraph/bullet.ts
index b507847363..476b159e88 100644
--- a/packages/engine-render/src/components/docs/layout/block/paragraph/bullet.ts
+++ b/packages/engine-render/src/components/docs/layout/block/paragraph/bullet.ts
@@ -78,9 +78,9 @@ export function getDefaultBulletSke(listId: string, startIndex: number = 1): IDo
spr: 0.5,
spo: 0,
},
- indentFirstLine: 0,
- hanging: 21,
- indentStart: 0,
+ indentFirstLine: { v: 0 },
+ hanging: { v: 21 },
+ indentStart: { v: 0 },
};
}
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.ts
index 8d4d3bbcac..4337128bbb 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
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import type { INumberUnit } from '@univerjs/core';
+import type { INumberUnit, Nullable } from '@univerjs/core';
import { BooleanNumber, DataStreamTreeTokenType, GridType, ObjectRelativeFromV, PositionedObjectLayoutType, SpacingRule } from '@univerjs/core';
import type {
IDocumentSkeletonColumn,
@@ -447,8 +447,8 @@ function _lineOperator(
// horizontalAlign = HorizontalAlign.UNSPECIFIED,
// direction,
- spaceAbove = 0,
- spaceBelow = 0,
+ spaceAbove,
+ spaceBelow,
// borderBetween,
// borderTop,
@@ -456,10 +456,10 @@ function _lineOperator(
// borderLeft,
// borderRight,
- indentFirstLine = 0,
- hanging = 0,
- indentStart = 0,
- indentEnd = 0,
+ indentFirstLine,
+ hanging,
+ indentStart,
+ indentEnd,
// tabStops = [],
// keepLines = BooleanNumber.FALSE,
@@ -818,10 +818,10 @@ function _pageOperator(
* 17.3.1.12 ind (Paragraph Indentation)
*/
function __getIndentPadding(
- indentFirstLine: INumberUnit | number = 0,
- hanging: INumberUnit | number = 0,
- indentStart: INumberUnit | number = 0,
- indentEnd: INumberUnit | number = 0,
+ indentFirstLine: Nullable<INumberUnit>,
+ hanging: Nullable<INumberUnit>,
+ indentStart: Nullable<INumberUnit>,
+ indentEnd: Nullable<INumberUnit>,
charSpaceApply: number,
paragraphStart = false
) {
@@ -849,8 +849,8 @@ function __getIndentPadding(
function __getParagraphSpace(
lineSpacing: number = 0,
- spaceAbove: INumberUnit | number = 0,
- spaceBelow: INumberUnit | number = 0,
+ spaceAbove: Nullable<INumberUnit>,
+ spaceBelow: Nullable<INumberUnit>,
paragraphStart: boolean,
preLine?: IDocumentSkeletonLine
) {
diff --git a/packages/engine-render/src/components/docs/layout/shaping-engine/__tests__/text-shaping.spec.ts b/packages/engine-render/src/components/docs/layout/shaping-engine/__tests__/text-shaping.spec.ts
index 548c1f317a..5c34cbf1d5 100644
--- a/packages/engine-render/src/components/docs/layout/shaping-engine/__tests__/text-shaping.spec.ts
+++ b/packages/engine-render/src/components/docs/layout/shaping-engine/__tests__/text-shaping.spec.ts
@@ -52,17 +52,17 @@ function getDocumentBody(): IDocumentBody {
{
startIndex: 4,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
{
startIndex: 36,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 2,
- spaceBelow: 0,
+ spaceBelow: { v: 0 },
},
},
],
diff --git a/packages/engine-render/src/components/docs/layout/tools.ts b/packages/engine-render/src/components/docs/layout/tools.ts
index a3f0ac9ce6..eb42817007 100644
--- a/packages/engine-render/src/components/docs/layout/tools.ts
+++ b/packages/engine-render/src/components/docs/layout/tools.ts
@@ -237,17 +237,22 @@ function isLineBlank(line?: IDocumentSkeletonLine) {
return true;
}
-export function getNumberUnitValue(unitValue: number | INumberUnit, benchMark: number) {
- if (unitValue instanceof Object) {
- const { v: value, u: unit } = unitValue;
- if (unit === NumberUnitType.POINT) {
- return value;
- }
+export function getNumberUnitValue(unitValue: Nullable<INumberUnit>, benchMark: number) {
+ if (!unitValue) {
+ return 0;
+ }
+
+ const { v: value, u: unit } = unitValue;
+
+ if (!unit) {
+ return value;
+ }
- return value * benchMark;
+ if (unit === NumberUnitType.PIXEL) {
+ return value;
}
- return unitValue;
+ return value * benchMark;
}
// Return charSpaceApply, choose between grid or font to calculate the length of a tab, where one tab represents a length of 1 character.
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 c6f886fc79..8894203731 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
@@ -43,7 +43,7 @@ const richTextDemo: IDocumentData = {
startIndex: 489,
paragraphStyle: {
horizontalAlign: 0,
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 1.2,
},
},
diff --git a/packages/sheets-ui/src/services/clipboard/html-to-usm/utils.ts b/packages/sheets-ui/src/services/clipboard/html-to-usm/utils.ts
index e3aa4f9a4f..cb97b07921 100644
--- a/packages/sheets-ui/src/services/clipboard/html-to-usm/utils.ts
+++ b/packages/sheets-ui/src/services/clipboard/html-to-usm/utils.ts
@@ -37,13 +37,13 @@ export function getParagraphStyle(el: HTMLElement): Nullable<IParagraphStyle> {
switch (cssRule) {
case 'margin-top': {
const marginTopValue = Number.parseInt(cssValue);
- paragraphStyle.spaceAbove = /pt/.test(cssValue) ? ptToPixel(marginTopValue) : marginTopValue;
+ paragraphStyle.spaceAbove = { v: /pt/.test(cssValue) ? ptToPixel(marginTopValue) : marginTopValue };
break;
}
case 'margin-bottom': {
const marginBottomValue = Number.parseInt(cssValue);
- paragraphStyle.spaceBelow = /pt/.test(cssValue) ? ptToPixel(marginBottomValue) : marginBottomValue;
+ paragraphStyle.spaceBelow = { v: /pt/.test(cssValue) ? ptToPixel(marginBottomValue) : marginBottomValue };
break;
}
diff --git a/packages/sheets/src/commands/commands/__tests__/set-range-values.command.spec.ts b/packages/sheets/src/commands/commands/__tests__/set-range-values.command.spec.ts
index 3d18bc6b04..164bcf271a 100644
--- a/packages/sheets/src/commands/commands/__tests__/set-range-values.command.spec.ts
+++ b/packages/sheets/src/commands/commands/__tests__/set-range-values.command.spec.ts
@@ -236,7 +236,7 @@ describe('Test set range values commands', () => {
{
startIndex: 489,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 1.2,
},
},
@@ -634,7 +634,7 @@ describe('Test set range values commands', () => {
{
startIndex: 489,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 1.2,
},
},
@@ -701,7 +701,7 @@ describe('Test set range values commands', () => {
{
startIndex: 489,
paragraphStyle: {
- spaceAbove: 10,
+ spaceAbove: { v: 10 },
lineSpacing: 1.2,
},
},