@gct-paas/word 0.1.47-beta.4 → 0.1.47-beta.5

package/dist/core/command/base/CommandBase.d.ts

@@ -3,6 +3,7 @@ import { Doc } from '../../view/Doc';
 import { Wr, Wp, Wtbl, Wtr, Wtc } from '../../model/document';
 import { RawElement } from '../../model/types/raw';
 import { CursorManager } from '../../cursor/CursorManager';
+import { LayoutNode } from '../../view/base/LayoutNode';
 export declare const SelectionMode: {
     readonly PP: "PP";
     readonly PTr: "PTr";
@@ -209,5 +210,7 @@ export declare abstract class CommandBase<T extends CommandType = CommandType> i
         modelIndex: number;
         modelParent: Wp;
     } | undefined;
+    /** 设计态删除字段组件后，清理 DataManager 中该字段的 defaults / rawData / 依赖 */
+    protected cleanupDesignFieldBinding(run?: LayoutNode): void;
 }
 export {};

package/dist/core/data/DataManager.d.ts

@@ -290,6 +290,18 @@ export declare class DataManager {
      * 获取父路径
      */
     private getParentPath;
+    /**
+     * 设计态删除字段后，清理该字段在 DataManager 中的绑定数据
+     * @param designValuePath 设计时 valuePath（可含 [n] / [n_y][n_x] 通配符）
+     * @param runtimeValuePath 版面解析后的具体路径（可选）
+     */
+    removeFieldBindingData(designValuePath: JsonPath, runtimeValuePath?: JsonPath): void;
+    /** 收集与字段绑定相关的路径（含 value / label / href 及通配符变体） */
+    private collectFieldBindingPaths;
+    /** 收集可从 rawData 删除的具体路径（跳过含通配符的设计路径） */
+    private collectConcreteRawDataPaths;
+    /** 移除字段注册的组件依赖 */
+    private removeFieldDependencies;
     /**
      * 设置默认值
      * @param path jsonpath 路径 (支持 [n] 数组索引和 [n] 通配符)

package/dist/index.es.js

@@ -31535,6 +31535,14 @@ class CommandBase {
       modelParent: wp
     };
   }
+  /** 设计态删除字段组件后，清理 DataManager 中该字段的 defaults / rawData / 依赖 */
+  cleanupDesignFieldBinding(run) {
+    if (!run?.isWidgetRun) return;
+    const textWidget = run;
+    const designValuePath = textWidget.widgetMeta?.field?.valuePath;
+    if (!designValuePath) return;
+    this.doc.dataManager.removeFieldBindingData(designValuePath, textWidget.valuePath);
+  }
 }
 class Backspace extends CommandBase {
   constructor(doc, payload) {
@@ -31730,6 +31738,7 @@ class Backspace extends CommandBase {
       const wrPrev = modelWr.getPrev();
       const wrNext = modelWr.getNext();
       modelWr.remove();
+      this.cleanupDesignFieldBinding(run);
       return this.buildResultAfterEmpty(wrPrev, wrNext, modelWp, run);
     }
     if (position === -1) {
@@ -32150,6 +32159,7 @@ class Delete extends CommandBase {
         return null;
       }
       modelWr.remove();
+      this.cleanupDesignFieldBinding(run);
       const wrPrev = modelWr.getPrev();
       const wrNext = modelWr.getNext();
       return this.buildResultAfterEmpty(wrPrev, wrNext, modelWp);
@@ -49856,6 +49866,78 @@ class DataManager {
     const lastSeparatorIndex = Math.max(lastDotIndex, lastBracketIndex);
     return path2.substring(0, lastSeparatorIndex);
   }
+  /**
+   * 设计态删除字段后，清理该字段在 DataManager 中的绑定数据
+   * @param designValuePath 设计时 valuePath（可含 [n] / [n_y][n_x] 通配符）
+   * @param runtimeValuePath 版面解析后的具体路径（可选）
+   */
+  removeFieldBindingData(designValuePath, runtimeValuePath) {
+    if (!designValuePath) return;
+    const bindingPaths = this.collectFieldBindingPaths(designValuePath);
+    for (const path2 of bindingPaths) {
+      this.defaults.delete(path2);
+      this.fieldRuntimeConfigByPath.delete(path2);
+      this.subscriptions.delete(path2);
+    }
+    for (const path2 of this.collectConcreteRawDataPaths(designValuePath, runtimeValuePath)) {
+      this.delete(path2);
+    }
+    this.removeFieldDependencies(designValuePath);
+  }
+  /** 收集与字段绑定相关的路径（含 value / label / href 及通配符变体） */
+  collectFieldBindingPaths(designValuePath) {
+    const bases = [
+      designValuePath,
+      getLabelPath(designValuePath),
+      getHrefPath(designValuePath)
+    ];
+    const wildcardKeys = new Set(bases.map((path2) => this.convertPathToWildcard(path2)));
+    const result = new Set(bases);
+    const scanTargets = [
+      ...this.defaults.keys(),
+      ...this.fieldRuntimeConfigByPath.keys(),
+      ...this.subscriptions.keys()
+    ];
+    for (const path2 of scanTargets) {
+      if (wildcardKeys.has(this.convertPathToWildcard(path2))) {
+        result.add(path2);
+      }
+    }
+    return result;
+  }
+  /** 收集可从 rawData 删除的具体路径（跳过含通配符的设计路径） */
+  collectConcreteRawDataPaths(designValuePath, runtimeValuePath) {
+    const paths = /* @__PURE__ */ new Set();
+    for (const path2 of [designValuePath, runtimeValuePath]) {
+      if (!path2 || path2.includes("[n")) continue;
+      paths.add(path2);
+      paths.add(getLabelPath(path2));
+      paths.add(getHrefPath(path2));
+    }
+    return [...paths];
+  }
+  /** 移除字段注册的组件依赖 */
+  removeFieldDependencies(designValuePath) {
+    const wildcardKeys = new Set(
+      [designValuePath, getLabelPath(designValuePath), getHrefPath(designValuePath)].map(
+        (path2) => this.convertPathToWildcard(path2)
+      )
+    );
+    const nodes = this.collectDepNodes();
+    const removedKeys = /* @__PURE__ */ new Set();
+    const remaining = [];
+    for (const node of nodes.values()) {
+      if (wildcardKeys.has(this.convertPathToWildcard(node.targetPath))) {
+        removedKeys.add(node.key);
+        continue;
+      }
+      remaining.push(node);
+    }
+    for (const key of removedKeys) {
+      this.ranImmediateDepKeys.delete(key);
+    }
+    this.rebuildDepGraphIndex(remaining);
+  }
   /**
    * 设置默认值
    * @param path jsonpath 路径 (支持 [n] 数组索引和 [n] 通配符)
@@ -111969,6 +112051,21 @@ const _sfc_main$23 = /* @__PURE__ */ defineComponent({
     };
   }
 });
+function resolveTableModelId(table) {
+  return table?.raw?.modelRef?.id ?? table?.id;
+}
+function resolveTableRowModelIndex(tableRow) {
+  const realRowIndex = tableRow?.raw?.realRowIndex;
+  if (typeof realRowIndex === "number" && realRowIndex >= 0) {
+    return realRowIndex;
+  }
+  const fallback = tableRow?.line?.tableRowIndex ?? tableRow?.pathIndex?.at(-1);
+  return fallback === void 0 ? void 0 : fallback;
+}
+function resolveTableColModelIndex(tableCell) {
+  const colIndex = tableCell?.line?.tableCellIndex ?? tableCell?.pathIndex?.at(-1);
+  return colIndex === void 0 ? void 0 : colIndex;
+}
 const _hoisted_1$1q = { class: "item-suffix" };
 const _hoisted_2$U = { class: "item-suffix" };
 const _hoisted_3$F = { class: "item-suffix" };
@@ -111984,9 +112081,9 @@ const _sfc_main$22 = /* @__PURE__ */ defineComponent({
     const { docInst } = useDocPubApiContext();
     const { interaction } = useTableSelection();
     const props = __props;
-    const tableId = props.table?.id;
-    const rowIndex = props.tableRow?.pathIndex.at(-1);
-    const colIndex = props.tableCell?.pathIndex.at(-1);
+    const tableId = computed(() => resolveTableModelId(props.table));
+    const rowIndex = computed(() => resolveTableRowModelIndex(props.tableRow));
+    const colIndex = computed(() => resolveTableColModelIndex(props.tableCell));
     const insertBeforeColCount = ref(1);
     const insertAfterColCount = ref(1);
     const insertBeforeRowCount = ref(1);
@@ -112013,35 +112110,35 @@ const _sfc_main$22 = /* @__PURE__ */ defineComponent({
     const handleAction = (type4, options) => {
       switch (type4) {
         case "add-col":
-          if (!tableId || colIndex === void 0) return;
+          if (!tableId.value || colIndex.value === void 0) return;
           docInst?.value?.execute(CommandType.insertCol, {
-            tableId,
-            colIndex,
+            tableId: tableId.value,
+            colIndex: colIndex.value,
             position: options,
             count: options === "before" ? insertBeforeColCount.value : insertAfterColCount.value
           });
           break;
         case "delete-col":
-          if (!tableId || colIndex === void 0) return;
+          if (!tableId.value || colIndex.value === void 0) return;
           docInst.value.execute(CommandType.deleteCol, {
-            tableId,
-            colIndex
+            tableId: tableId.value,
+            colIndex: colIndex.value
           });
           break;
         case "add-row":
-          if (!tableId || rowIndex === void 0) return;
+          if (!tableId.value || rowIndex.value === void 0) return;
           docInst?.value?.execute(CommandType.insertRow, {
-            tableId,
-            rowIndex,
+            tableId: tableId.value,
+            rowIndex: rowIndex.value,
             position: options,
             count: options === "before" ? insertBeforeRowCount.value : insertAfterRowCount.value
           });
           break;
         case "delete-row":
-          if (!tableId || rowIndex === void 0) return;
+          if (!tableId.value || rowIndex.value === void 0) return;
           docInst?.value?.execute(CommandType.deleteRow, {
-            tableId,
-            rowIndex
+            tableId: tableId.value,
+            rowIndex: rowIndex.value
           });
           break;
         case "data-group":
@@ -112196,7 +112293,7 @@ const _sfc_main$22 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const TableMenu = /* @__PURE__ */ _export_sfc(_sfc_main$22, [["__scopeId", "data-v-8bfe3f32"]]);
+const TableMenu = /* @__PURE__ */ _export_sfc(_sfc_main$22, [["__scopeId", "data-v-243eee50"]]);
 const OFFSET = 4;
 const _sfc_main$21 = /* @__PURE__ */ defineComponent({
   __name: "index",
@@ -112211,6 +112308,7 @@ const _sfc_main$21 = /* @__PURE__ */ defineComponent({
     const contextMenuRef = ref(null);
     const menuProps = ref({});
     const menuComponent = ref(null);
+    const menuKey = ref(0);
     const show = (params) => {
       const {
         x: x2,
@@ -112220,15 +112318,10 @@ const _sfc_main$21 = /* @__PURE__ */ defineComponent({
         tableRow,
         tableCell
       } = params;
-      if (type4 === "table") {
-        menuProps.value = {
-          table,
-          tableRow,
-          tableCell
-        };
-      }
+      menuProps.value = type4 === "table" ? { table, tableRow, tableCell } : {};
       pos.value = { x: x2, y: y2 };
       menuComponent.value = menuMap[type4];
+      menuKey.value += 1;
       menuVisible.value = true;
       nextTick(() => {
         if (!contextMenuRef.value) return;
@@ -112242,17 +112335,18 @@ const _sfc_main$21 = /* @__PURE__ */ defineComponent({
         };
       });
     };
-    const container2 = document.querySelector(".render-container");
+    let scrollContainer = null;
     const hide = () => {
       menuVisible.value = false;
     };
     onMounted(() => {
+      scrollContainer = document.querySelector(".render-container");
       window.addEventListener("click", hide);
-      container2?.addEventListener("scroll", hide);
+      scrollContainer?.addEventListener("scroll", hide);
     });
     onBeforeUnmount(() => {
       window.removeEventListener("click", hide);
-      container2?.removeEventListener("scroll", hide);
+      scrollContainer?.removeEventListener("scroll", hide);
     });
     __expose({
       show,
@@ -112266,7 +112360,7 @@ const _sfc_main$21 = /* @__PURE__ */ defineComponent({
         class: "context-menu",
         style: normalizeStyle({ left: pos.value.x + "px", top: pos.value.y + "px" })
       }, [
-        (openBlock(), createBlock(resolveDynamicComponent(menuComponent.value), normalizeProps(guardReactiveProps(menuProps.value)), null, 16))
+        (openBlock(), createBlock(resolveDynamicComponent(menuComponent.value), mergeProps({ key: menuKey.value }, menuProps.value), null, 16))
       ], 4)) : createCommentVNode("", true);
     };
   }

package/dist/runtime/canvas/__common__/context-menu/resolve-table-menu-index.d.ts

@@ -0,0 +1,9 @@
+/** 从布局元数据解析表格模型 id */
+export declare function resolveTableModelId(table?: any): string | undefined;
+/**
+ * 解析表格模型行索引。
+ * 分页后 pathIndex / line.tableRowIndex 仅为当前页片段索引，需优先使用 realRowIndex。
+ */
+export declare function resolveTableRowModelIndex(tableRow?: any): number | undefined;
+/** 解析表格模型列索引 */
+export declare function resolveTableColModelIndex(tableCell?: any): number | undefined;

package/dist/word.css

@@ -9202,7 +9202,7 @@ ul li .widget-icon[data-v-393cb2aa] {
   line-height: 22px;
 }
 
-[data-v-8bfe3f32] .gct-input-number {
+[data-v-243eee50] .gct-input-number {
     text-align: center;
     width: 48px;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.47-beta.4",
+  "version": "0.1.47-beta.5",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",