feat: update

dream-num · Oct 30, 2024 · f104e3f · f104e3f
1 parent 9fd90cf
commit f104e3f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 29 deletions.
diff --git a/packages/core/src/docs/data-model/text-x/build-utils/text-x-utils.ts b/packages/core/src/docs/data-model/text-x/build-utils/text-x-utils.ts
@@ -160,39 +160,38 @@ export function addCustomRangeTextX(param: IAddCustomRangeTextXParam) {
 // paragraph information needs to be preserved when performing the CUT operation
 
 export function deleteSelectionTextX(
-    selection: ITextRange,
+    selections: ITextRange[],
     body: IDocumentBody,
     memoryCursor: number = 0,
     insertBody: Nullable<IDocumentBody> = null,
     keepBullet: boolean = true
 ): Array<TextXAction> {
-    const { startOffset, endOffset } = selection;
+    selections.sort((a, b) => a.startOffset - b.startOffset);
     const dos: Array<TextXAction> = [];
     const { paragraphs = [] } = body;
 
-    const textStart = startOffset - memoryCursor;
-    const textEnd = endOffset - memoryCursor;
-
     const paragraphInRange = paragraphs?.find(
-        (p) => p.startIndex - memoryCursor >= textStart && p.startIndex - memoryCursor < textEnd
+        (p) => p.startIndex >= selections[0].startOffset && p.startIndex < selections[0].endOffset
     );
+    let cursor = memoryCursor;
+    selections.forEach((selection) => {
+        const { startOffset, endOffset } = selection;
+        if (startOffset - memoryCursor > cursor) {
+            dos.push({
+                t: TextXActionType.RETAIN,
+                len: startOffset - memoryCursor,
+            });
+            cursor = startOffset;
+        }
 
-    if (textStart > 0) {
-        dos.push({
-            t: TextXActionType.RETAIN,
-            len: textStart,
-        });
-    }
-
-    let cursor = textStart;
-
-    if (cursor < textEnd) {
-        dos.push({
-            t: TextXActionType.DELETE,
-            len: textEnd - cursor,
-        });
-        cursor = textEnd;
-    }
+        if (cursor < endOffset) {
+            dos.push({
+                t: TextXActionType.DELETE,
+                len: endOffset - memoryCursor - cursor,
+            });
+            cursor = endOffset;
+        }
+    });
 
     if (insertBody) {
         dos.push({
@@ -203,7 +202,7 @@ export function deleteSelectionTextX(
     }
 
     if (paragraphInRange && keepBullet) {
-        const nextParagraph = paragraphs.find((p) => p.startIndex - memoryCursor >= textEnd);
+        const nextParagraph = paragraphs.find((p) => p.startIndex - memoryCursor >= (selections[selections.length - 1].endOffset - 1));
         if (nextParagraph) {
             if (nextParagraph.startIndex > cursor) {
                 dos.push({

diff --git a/packages/docs-drawing-ui/src/commands/commands/insert-doc-drawing.command.ts b/packages/docs-drawing-ui/src/commands/commands/insert-doc-drawing.command.ts
@@ -77,7 +77,7 @@ export const InsertDocDrawingCommand: ICommand = {
                 });
             }
         } else {
-            const dos = BuildTextUtils.selection.getDeleteActions(activeTextRange, body, 0, null, false);
+            const dos = BuildTextUtils.selection.getDeleteActions([activeTextRange], body, 0, null, false);
             textX.push(...dos);
 
             const removedCustomBlockIds = getCustomBlockIdsInSelections(body, [activeTextRange]);

diff --git a/packages/docs-ui/src/commands/commands/clipboard.inner.command.ts b/packages/docs-ui/src/commands/commands/clipboard.inner.command.ts
@@ -197,7 +197,7 @@ export const InnerPasteCommand: ICommand<IInnerPasteCommandParams> = {
                     len: body.dataStream.length,
                 });
             } else {
-                const dos = BuildTextUtils.selection.getDeleteActions(selection, body, memoryCursor.cursor, cloneBody, i === selections.length - 1);
+                const dos = BuildTextUtils.selection.getDeleteActions([selection], body, memoryCursor.cursor, cloneBody, false);
                 textX.push(...dos);
             }
 
@@ -256,7 +256,7 @@ function getCutActionsFromTextRanges(
                 len,
             });
         } else {
-            textX.push(...BuildTextUtils.selection.getDeleteActions(selection, originBody, memoryCursor.cursor, null, i === selections.length - 1));
+            textX.push(...BuildTextUtils.selection.getDeleteActions([selection], originBody, memoryCursor.cursor, null, false));
         }
 
         memoryCursor.reset();

diff --git a/packages/docs-ui/src/commands/commands/core-editing.command.ts b/packages/docs-ui/src/commands/commands/core-editing.command.ts
@@ -105,7 +105,7 @@ export const InsertCommand: ICommand<IInsertCommandParams> = {
                 len: body.dataStream.length,
             });
         } else {
-            const dos = BuildTextUtils.selection.getDeleteActions(range, originBody, 0, body);
+            const dos = BuildTextUtils.selection.getDeleteActions([range], originBody, 0, body);
             textX.push(...dos);
         }
 

diff --git a/packages/docs-ui/src/commands/commands/ime-input.command.ts b/packages/docs-ui/src/commands/commands/ime-input.command.ts
@@ -95,7 +95,7 @@ export const IMEInputCommand: ICommand<IIMEInputCommandParams> = {
         const jsonX = JSONX.getInstance();
 
         if (!previousActiveRange.collapsed && isCompositionStart) {
-            const dos = BuildTextUtils.selection.getDeleteActions(previousActiveRange, body, 0, null, false);
+            const dos = BuildTextUtils.selection.getDeleteActions([previousActiveRange], body, 0, null, false);
             textX.push(...dos);
             doMutation.params!.textRanges = [{
                 startOffset: startOffset + len,

diff --git a/packages/docs-ui/src/commands/commands/replace-content.command.ts b/packages/docs-ui/src/commands/commands/replace-content.command.ts
@@ -334,7 +334,7 @@ export const ReplaceSelectionCommand: ICommand<IReplaceSelectionCommandParams> =
         const textX = new TextX();
         const jsonX = JSONX.getInstance();
         // delete
-        textX.push(...BuildTextUtils.selection.getDeleteActions(selection, body, 0, insertBody));
+        textX.push(...BuildTextUtils.selection.getDeleteActions([selection], body, 0, insertBody));
         doMutation.params.actions = jsonX.editOp(textX.serialize());
 
         return true;