@gct-paas/word 0.1.16 → 0.1.17

package/dist/core/command/commands/MergeCells.d.ts

@@ -1,7 +1,12 @@
 import { CommandBase } from '../base/CommandBase';
 import { Doc } from '../../view/Doc';
+import { WrText } from '../../model/document';
 import { CommandPayloadMap } from '../types';
 export declare class MergeCells extends CommandBase<'mergeCells'> {
     constructor(doc: Doc, payload?: CommandPayloadMap['mergeCells']);
-    protected execute(): Promise<null>;
+    protected execute(): Promise<{
+        wr: WrText | undefined;
+        pos: number;
+        side: string;
+    } | null>;
 }

package/dist/core/command/commands/UnmergeCells.d.ts

@@ -1,7 +1,12 @@
 import { CommandBase } from '../base/CommandBase';
 import { Doc } from '../../view/Doc';
+import { WrText } from '../../model/document';
 import { CommandPayloadMap } from '../types';
 export declare class UnmergeCells extends CommandBase<'unmergeCells'> {
     constructor(doc: Doc, payload?: CommandPayloadMap['unmergeCells']);
-    protected execute(): Promise<null | undefined>;
+    protected execute(): Promise<{
+        wr: WrText | undefined;
+        pos: number;
+        side: string;
+    } | null | undefined>;
 }

package/dist/index.es.js

@@ -28646,7 +28646,7 @@ class Enter extends CommandBase {
     const wp = mapper.getModelNodeById(run.parent.modelRef.id);
     let targetModelIndex = 0;
     if (!run.isPlaceholderRun) {
-      if (run.isWidgetRun) {
+      if (run.isWidgetRun || run.isPageWidgetRun) {
         const hitwr = mapper.getModelNodeByLayoutId(run.id);
         let wrIndex = wp.children.findIndex((r) => r.id === hitwr.id);
         targetModelIndex = ++wrIndex;
@@ -37210,7 +37210,15 @@ class MergeCells extends CommandBase {
         topLeftCell.merge(rowSpan, colSpan, { skipConsistency: true });
       }
     });
-    return null;
+    const mapper = this.doc.layoutMapper;
+    const normalized = this.doc.cursorManager.normalizeRange(cursor.getSelection());
+    const start = mapper.getLayoutNodeById(normalized.rangeStart.nodeId);
+    const wr = mapper.getModelNodeById(start.modelRef.id);
+    return {
+      wr,
+      pos: -1,
+      side: "after"
+    };
   }
 }
 const __vite_glob_0_21$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -38036,7 +38044,15 @@ class UnmergeCells extends CommandBase {
         });
       }
     });
-    return null;
+    const mapper = this.doc.layoutMapper;
+    const normalized = this.doc.cursorManager.normalizeRange(cursor.getSelection());
+    const start = mapper.getLayoutNodeById(normalized.rangeStart.nodeId);
+    const wr = mapper.getModelNodeById(start.modelRef.id);
+    return {
+      wr,
+      pos: -1,
+      side: "after"
+    };
   }
 }
 const __vite_glob_0_47 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",