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(docs): text selection in multiple columns (#2199)

Ran Luo5f9816e06094
diff --git a/examples/src/data/docs/default-document-data-cn.ts b/examples/src/data/docs/default-document-data-cn.ts
index 87be3a815a..468ca85c57 100644
--- a/examples/src/data/docs/default-document-data-cn.ts
+++ b/examples/src/data/docs/default-document-data-cn.ts
@@ -15,7 +15,7 @@
*/
import type { IDocumentData } from '@univerjs/core';
-import { BooleanNumber, ObjectRelativeFromH, ObjectRelativeFromV, PositionedObjectLayoutType, WrapTextType } from '@univerjs/core';
+import { BooleanNumber, ColumnSeparatorType, ObjectRelativeFromH, ObjectRelativeFromV, PositionedObjectLayoutType, SectionType, WrapTextType } from '@univerjs/core';
import { ptToPixel } from '@univerjs/engine-render';
export const DEFAULT_DOCUMENT_DATA_CN: IDocumentData = {
@@ -703,39 +703,39 @@ export const DEFAULT_DOCUMENT_DATA_CN: IDocumentData = {
sectionBreaks: [
{
startIndex: 3066,
- // columnProperties: [
- // {
- // width: ptToPixel(240),
- // paddingEnd: ptToPixel(15),
- // },
- // ],
- // columnSeparatorType: ColumnSeparatorType.NONE,
- // sectionType: SectionType.SECTION_TYPE_UNSPECIFIED,
+ columnProperties: [
+ {
+ width: ptToPixel(240),
+ paddingEnd: ptToPixel(15),
+ },
+ ],
+ columnSeparatorType: ColumnSeparatorType.NONE,
+ sectionType: SectionType.SECTION_TYPE_UNSPECIFIED,
// textDirection: textDirectionDocument,
// contentDirection: textDirection!,
},
],
customBlocks: [
- {
- startIndex: 189,
- blockId: 'shapeTest1',
- },
- {
- startIndex: 367,
- blockId: 'shapeTest2',
- },
- {
- startIndex: 489,
- blockId: 'shapeTest3',
- },
- {
- startIndex: 668,
- blockId: 'shapeTest4',
- },
- {
- startIndex: 962,
- blockId: 'shapeTest5',
- },
+ // {
+ // startIndex: 189,
+ // blockId: 'shapeTest1',
+ // },
+ // {
+ // startIndex: 367,
+ // blockId: 'shapeTest2',
+ // },
+ // {
+ // startIndex: 489,
+ // blockId: 'shapeTest3',
+ // },
+ // {
+ // startIndex: 668,
+ // blockId: 'shapeTest4',
+ // },
+ // {
+ // startIndex: 962,
+ // blockId: 'shapeTest5',
+ // },
],
},
documentStyle: {
diff --git a/packages/engine-render/src/components/docs/layout/doc-skeleton.ts b/packages/engine-render/src/components/docs/layout/doc-skeleton.ts
index c31ec6957e..66f2d9809b 100644
--- a/packages/engine-render/src/components/docs/layout/doc-skeleton.ts
+++ b/packages/engine-render/src/components/docs/layout/doc-skeleton.ts
@@ -287,7 +287,7 @@ export class DocumentSkeleton extends Skeleton {
this._findLiquid.translatePagePadding(page);
- const sections = page.sections;
+ const { sections } = page;
for (const section of sections) {
const { columns, height } = section;
@@ -303,6 +303,7 @@ export class DocumentSkeleton extends Skeleton {
for (const column of columns) {
const { lines, width: columnWidth } = column;
+ this._findLiquid.translateSave();
this._findLiquid.translateColumn(column);
// const { x: startX } = this._findLiquid;
@@ -410,6 +411,7 @@ export class DocumentSkeleton extends Skeleton {
this._findLiquid.translateRestore();
}
}
+ this._findLiquid.translateRestore();
}
}
this._findLiquid.restorePagePadding(page);