@gct-paas/word 0.1.64 → 0.1.65

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

@@ -74,6 +74,11 @@ export declare class DataManager {
     private shiftFieldRuntimeConfigAfterRowInsert;
     /** 子表删行后：移除该行配置，其后行配置下标 -1 */
     private shiftFieldRuntimeConfigAfterRowRemove;
+    private getSubFieldConfigMap;
+    /** 插行后同步 _subFieldConfig 下标 +1 */
+    private shiftSubFieldConfigAfterRowInsert;
+    /** 硬删后同步 _subFieldConfig：删该行并对其后行 -1 */
+    private shiftSubFieldConfigAfterRowRemove;
     private parseSubtableFieldPath;
     /** 收集 depGraph 中所有 DepNode（按 key 去重） */
     private collectDepNodes;
@@ -110,8 +115,6 @@ export declare class DataManager {
      * 检验表纵向轴配置只进 defaults，rawData 可能尚未物化多行。
      */
     countDefaultsIndexedRows(subFieldKey: string): number;
-    /** 版面可见行下标 → rawData 数组实际下标 */
-    resolveSubtableVisibleIndex(arrayPath: JsonPath, visibleIndex: number): number;
     private assignField;
     /**
      * 根据 jsonpath 设置数据

package/dist/core/data/paths/subtable-path.d.ts

@@ -26,10 +26,11 @@ export type BusinessFieldChange = {
 export declare function parseSubtableFieldPath(path: string): SubtableFieldPath | null;
 /** 统一解析数据路径，区分主表 / 子表字段变更结构 */
 export declare function parseBusinessFieldChange(changedPath: string): BusinessFieldChange | null;
-/** 子表在 rawData 中的行数（含接口 { data: [] } 形态，未转数组时返回 0） */
+/** 子表在 rawData 中的未软删行数（含接口 { data: [] } 形态，未转数组时返回 0） */
 export declare function countSubTableDataRows(rawData: Record<string, unknown>, subFieldKey: string): number;
 /** 子表应展开的行数：已有数据行与版面槽位取较大值（动态表无数据时至少 1 行） */
 export declare function resolveSubTableRowCount(doc: Doc | undefined, subFieldKey: string, rawData: Record<string, unknown>): number;
+/** 返回应参与展开的存储下标；有数据时跳过 deleted_，指定 rowIndexes 时原样返回 */
 export declare function resolveSubTableRowIndexes(doc: Doc | undefined, subFieldKey: string, rawData: Record<string, unknown>, rowIndexes?: number[]): number[];
 export declare function mapTemplateToRowPaths(templatePath: string, rowIndexes: number[]): string[];
 interface ExpandSubTableWidgetPathsOptions {

package/dist/core/data/subtable/row.d.ts

@@ -1,4 +1,4 @@
-/** 子表行软删 / 可见下标与存储下标映射（与后端 deleted_ 约定一致） */
+/** 子表行软删（与后端 deleted_ 约定一致；活跃行密排在前、软删行仅在后缀） */
 export type AxisType = 'x' | 'y';
 type PersistedSubtableRowContext = {
     rawData?: Record<string, any>;
@@ -6,14 +6,10 @@ type PersistedSubtableRowContext = {
     tableKey?: string;
     axis?: AxisType;
 };
-/** 是否应软删（打 deleted_）而非 splice */
+/** 是否应软删（打 deleted_ 并移到后缀）而非物理删除 */
 export declare function isPersistedSubtableRow(row: Record<string, any> | undefined | null, ctx?: PersistedSubtableRowContext): boolean;
 /** 未软删的行数；空数组返回 0 */
 export declare function countActiveSubtableRows(rows: unknown): number;
-/** 版面可见行下标 → rawData 数组中的实际下标 */
-export declare function resolveSubtableStorageIndex(rows: any[], visibleIndex: number): number;
-/** 在可见下标处插入时对应的 splice 位置 */
-export declare function resolveSubtableInsertIndex(rows: any[], visibleIndex: number): number;
 /** 按字段列表拼接行分组/合并 key，空值视为 '' */
 export declare function buildRowGroupKey(row: Record<string, unknown>, fieldKeys: readonly string[], separator?: string): string;
 export {};

package/dist/core/layout/LayoutContext.d.ts

@@ -48,8 +48,6 @@ export declare class LayoutContext {
      */
     getParagraphRemainingSize(): number;
     addRun(run: LayoutNode): void;
-    /** 子表可见行下标 → rawData 存储下标（跳过 deleted_ 行） */
-    private mapSubtableVisibleIndex;
     /**
      * 根据 dataIndex 替换 path 中的 [n] 为实际值
      * @param path 包含 [n] 的路径，如 "$.items[n].name"

package/dist/domain/table/business/material/types.d.ts

@@ -125,6 +125,8 @@ export interface IMaterialConsumeData {
     /** 后端需要的bom明细id */
     bom_entry_id_?: string;
     product_id__lb_?: string;
+    /** 扫码未回填 product_id_ 的兜底行标记（记录模式内部瞬态，行生命周期内持久，不向后端提交） */
+    _scanFallback?: boolean;
 }
 /**
  * 条码解析规则配置参数

package/dist/domain/table/runtime/engines/row-runtime-engine.d.ts

@@ -7,7 +7,7 @@ export declare class RowRuntimeEngine {
     hasRowInit(ctx: TableRuntimeContext): boolean;
     /** 对单行执行行初始化 */
     applyRowInit(ctx: TableRuntimeContext, rowIndex: number, rowSource?: string): void;
-    /** 初始化时对所有行执行行初始化 */
+    /** 初始化时对所有未软删行执行行初始化 */
     applyRowInitForAllRows(ctx: TableRuntimeContext): void;
     /** 字段变更时执行 when=onFieldChange 的行处理器（按 watch 过滤） */
     applyRowHandlersOnFieldChange(ctx: TableRuntimeContext, change: SubtableFieldPath, fieldChange?: FieldChangeDetail): void;

package/dist/domain/table/runtime/table-runtime-context.d.ts

@@ -20,15 +20,25 @@ export declare class TableRuntimeContext {
     get refModelType(): string;
     /** 子表数组路径 $.subFieldKey */
     get arrayPath(): string;
-    /** 指定行路径 $.subFieldKey[rowIndex] */
+    /** 指定行路径 $.subFieldKey[rowIndex]；rowIndex 为存储下标 */
     rowPath(rowIndex: number): string;
-    /** 读取指定行数据 */
+    /** 读取指定行数据；rowIndex 为存储下标 */
     getRow(rowIndex: number): Record<string, unknown> | undefined;
-    /** 子表总行数，无数据默认返回 1 */
+    /**
+     * 子表存储行数（含软删），无数据默认返回 1
+     */
     getRowCount(): number;
-    /** 构建单行规则执行上下文 */
+    /**
+     * 未软删行的存储下标。无数据时返回 [0]（与版面默认空行一致）；
+     * 仅剩软删行时返回 []。
+     */
+    getActiveRowIndexes(): number[];
+    /** 构建单行规则执行上下文；rowIndex 为存储下标 */
     buildRuleContext(rowIndex: number, changedFieldKey?: string): RuleContext;
-    /** 遍历子表数据行，支持指定单行或全量遍历，逐行注入 RuleContext */
+    /**
+     * 遍历子表数据行，支持指定单行或全量遍历，逐行注入 RuleContext。
+     * rowIndex / 全量遍历均使用存储下标；全量时跳过 deleted_ 行。
+     */
     eachRow(options: EachRowOptions, iteratee: (ctx: RuleContext) => void): void;
     /** 在子表字段配置列表中查找指定字段配置（支持 match.fieldKey 为数组） */
     findFieldProfile(fieldKey: string): BusinessFieldProfile | undefined;

package/dist/index.es.js

@@ -84171,7 +84171,7 @@ async function applyAutofillOnSubTableRowInit(doc, subFieldKey, rowIndex, fetchS
   if (!bindings.length) return;
   const updates = await buildAutofillUpdatesFromBindings(doc, bindings, {
     rawData: doc.dataManager.getRawData(),
-    rowIndexes: [doc.dataManager.resolveSubtableVisibleIndex(`$.${subFieldKey}`, rowIndex)],
+    rowIndexes: [rowIndex],
     fetchSource
   });
   if (Object.keys(updates).length) {
@@ -85085,31 +85085,13 @@ function countActiveSubtableRows(rows) {
   if (!Array.isArray(rows)) return 0;
   return rows.filter((row) => !row?.deleted_).length;
 }
-function resolveSubtableStorageIndex(rows, visibleIndex) {
-  if (!Array.isArray(rows) || visibleIndex < 0) return visibleIndex;
-  let seen = -1;
-  for (let i = 0; i < rows.length; i++) {
-    if (!rows[i]?.deleted_) {
-      seen++;
-      if (seen === visibleIndex) return i;
-    }
-  }
-  return visibleIndex;
-}
-function resolveSubtableInsertIndex(rows, visibleIndex) {
-  if (!Array.isArray(rows)) return 0;
-  let seen = -1;
-  for (let i = 0; i < rows.length; i++) {
-    if (!rows[i]?.deleted_) {
-      seen++;
-      if (seen === visibleIndex) return i;
-    }
-  }
-  return rows.length;
-}
 function buildRowGroupKey(row, fieldKeys, separator = "|") {
   return fieldKeys.map((key) => String(row[key] ?? "")).join(separator);
 }
+function activeRowIndexes(rows) {
+  const count = countActiveSubtableRows(rows);
+  return Array.from({ length: count }, (_2, index2) => index2);
+}
 function expandInitPathTemplates(templatePath, rawData) {
   const parsed = parseValuePath(templatePath);
   const hasCrossPlaceholder = templatePath.includes("[n_y]") || templatePath.includes("[n_x]");
@@ -85117,11 +85099,11 @@ function expandInitPathTemplates(templatePath, rawData) {
   if (hasCrossPlaceholder) {
     const yKey = parsed.parentFieldKey || "";
     const xKey = parsed.linkFieldKey || "";
-    const yRows = Array.isArray(get(rawData, yKey)) ? get(rawData, yKey).length : 0;
-    const xRows = Array.isArray(get(rawData, xKey)) ? get(rawData, xKey).length : 0;
+    const yIndexes = activeRowIndexes(get(rawData, yKey));
+    const xIndexes = activeRowIndexes(get(rawData, xKey));
     const paths = [];
-    for (let y2 = 0; y2 < yRows; y2++) {
-      for (let x2 = 0; x2 < xRows; x2++) {
+    for (const y2 of yIndexes) {
+      for (const x2 of xIndexes) {
         paths.push(replacePathIndexPlaceholders({ templatePath, y: y2, x: x2, n: y2 }));
       }
     }
@@ -85129,12 +85111,9 @@ function expandInitPathTemplates(templatePath, rawData) {
   }
   if (hasSinglePlaceholder) {
     const tableKey = parsed.parentFieldKey || "";
-    const rows = Array.isArray(get(rawData, tableKey)) ? get(rawData, tableKey).length : 0;
-    const paths = [];
-    for (let i = 0; i < rows; i++) {
-      paths.push(replacePathIndexPlaceholders({ templatePath, n: i, y: i, x: i }));
-    }
-    return paths;
+    return activeRowIndexes(get(rawData, tableKey)).map(
+      (i) => replacePathIndexPlaceholders({ templatePath, n: i, y: i, x: i })
+    );
   }
   return [templatePath];
 }
@@ -85172,9 +85151,9 @@ function parseBusinessFieldChange(changedPath) {
 }
 function countSubTableDataRows(rawData, subFieldKey) {
   const existing = get(rawData, subFieldKey);
-  if (Array.isArray(existing)) return existing.length;
+  if (Array.isArray(existing)) return countActiveSubtableRows(existing);
   if (existing && typeof existing === "object" && Array.isArray(existing.data)) {
-    return existing.data.length;
+    return countActiveSubtableRows(existing.data);
   }
   return 0;
 }
@@ -85185,6 +85164,18 @@ function resolveSubTableRowCount(doc, subFieldKey, rawData) {
 }
 function resolveSubTableRowIndexes(doc, subFieldKey, rawData, rowIndexes) {
   if (rowIndexes?.length) return rowIndexes;
+  const existing = get(rawData, subFieldKey);
+  if (Array.isArray(existing) && existing.length > 0) {
+    const count2 = countActiveSubtableRows(existing);
+    return Array.from({ length: count2 }, (_2, index2) => index2);
+  }
+  if (existing && typeof existing === "object" && Array.isArray(existing.data)) {
+    const data = existing.data;
+    if (data.length > 0) {
+      const count2 = countActiveSubtableRows(data);
+      return Array.from({ length: count2 }, (_2, index2) => index2);
+    }
+  }
   const count = resolveSubTableRowCount(doc, subFieldKey, rawData);
   return Array.from({ length: count }, (_2, index2) => index2);
 }
@@ -85429,6 +85420,51 @@ class DataManager {
       this.doc?.eventManager?.eventBus.emit("field-runtime-config-changed", { path });
     }
   }
+  getSubFieldConfigMap() {
+    const key = "_subFieldConfig";
+    const params = this.doc?.paramsConfig;
+    const cfg = params?.[key];
+    if (!cfg || typeof cfg !== "object") return void 0;
+    return cfg;
+  }
+  /** 插行后同步 _subFieldConfig 下标 +1 */
+  shiftSubFieldConfigAfterRowInsert(arrayPath, insertIndex) {
+    const cfg = this.getSubFieldConfigMap();
+    if (!cfg) return;
+    const updates = {};
+    const toDelete = [];
+    for (const [path, value] of Object.entries(cfg)) {
+      const parsed = this.parseSubtableFieldPath(path, arrayPath);
+      if (!parsed) continue;
+      const { rowIndex, suffix } = parsed;
+      if (rowIndex >= insertIndex) {
+        toDelete.push(path);
+        updates[`${arrayPath}[${rowIndex + 1}]${suffix}`] = value;
+      }
+    }
+    for (const path of toDelete) delete cfg[path];
+    Object.assign(cfg, updates);
+  }
+  /** 硬删后同步 _subFieldConfig：删该行并对其后行 -1 */
+  shiftSubFieldConfigAfterRowRemove(arrayPath, removeIndex) {
+    const cfg = this.getSubFieldConfigMap();
+    if (!cfg) return;
+    const updates = {};
+    const toDelete = [];
+    for (const [path, value] of Object.entries(cfg)) {
+      const parsed = this.parseSubtableFieldPath(path, arrayPath);
+      if (!parsed) continue;
+      const { rowIndex, suffix } = parsed;
+      if (rowIndex === removeIndex) {
+        toDelete.push(path);
+      } else if (rowIndex > removeIndex) {
+        toDelete.push(path);
+        updates[`${arrayPath}[${rowIndex - 1}]${suffix}`] = value;
+      }
+    }
+    for (const path of toDelete) delete cfg[path];
+    Object.assign(cfg, updates);
+  }
   parseSubtableFieldPath(fullPath, arrayPath) {
     const head = `${arrayPath}[`;
     if (!fullPath.startsWith(head)) return null;
@@ -85581,12 +85617,6 @@ class DataManager {
     }
     return maxIndex + 1;
   }
-  /** 版面可见行下标 → rawData 数组实际下标 */
-  resolveSubtableVisibleIndex(arrayPath, visibleIndex) {
-    const rows = this.getByPath(this.rawData, arrayPath);
-    if (!Array.isArray(rows)) return visibleIndex;
-    return resolveSubtableStorageIndex(rows, visibleIndex);
-  }
   assignField(target, fieldPath, value) {
     if (!fieldPath.includes(".") && !fieldPath.includes("[")) {
       target[fieldPath] = value;
@@ -86007,10 +86037,11 @@ class DataManager {
         arr = [{ ...DEFAULT_EMPTY_ITEM }];
         this.set(path, arr, "parent");
       }
-      const storageIndex = resolveSubtableInsertIndex(arr, index2);
-      if (storageIndex < 0 || storageIndex > arr.length) {
+      const activeCount = countActiveSubtableRows(arr);
+      if (index2 < 0 || index2 > activeCount) {
         throw new Error(`Index ${index2} out of bounds for array of length ${arr.length}`);
       }
+      const storageIndex = index2;
       const oldValue = [...arr];
       const tableKey = path.replace(/^\$\./, "").replace(/\[(n|\d+)\]/g, "");
       const axisInfo = this.resolveAxisByTableKey(tableKey);
@@ -86026,6 +86057,7 @@ class DataManager {
       this.emit(path, arr, oldValue);
       this.shiftFieldRuntimeConfigAfterRowInsert(path, storageIndex);
       this.shiftDependencyGraphAfterRowInsert(path, storageIndex);
+      this.shiftSubFieldConfigAfterRowInsert(path, storageIndex);
       return true;
     } catch (error) {
       console.error(`Failed to insert value at path "${path}":`, error);
@@ -86044,10 +86076,11 @@ class DataManager {
       if (!Array.isArray(arr)) {
         throw new Error(`Path "${path}" is not an array`);
       }
-      const storageIndex = resolveSubtableStorageIndex(arr, index2);
-      if (storageIndex < 0 || storageIndex >= arr.length) {
+      const activeCount = countActiveSubtableRows(arr);
+      if (index2 < 0 || index2 >= activeCount) {
         throw new Error(`Index ${index2} out of bounds for array of length ${arr.length}`);
       }
+      const storageIndex = index2;
       const tableKey = path.replace(/^\$\./, "").replace(/\[(n|\d+)\]/g, "");
       const axisInfo = this.resolveAxisByTableKey(tableKey);
       const row = arr[storageIndex];
@@ -86057,15 +86090,21 @@ class DataManager {
         axis: axisInfo?.axis
       })) {
         const oldValue2 = this.deepClone(arr);
-        row.deleted_ = true;
+        const [removedRow] = arr.splice(storageIndex, 1);
+        removedRow.deleted_ = true;
+        arr.push(removedRow);
+        this.shiftFieldRuntimeConfigAfterRowRemove(path, storageIndex);
+        this.shiftDependencyGraphAfterRowRemove(path, storageIndex);
+        this.shiftSubFieldConfigAfterRowRemove(path, storageIndex);
         this.emit(path, arr, oldValue2);
-        return row;
+        return removedRow;
       }
       const oldValue = [...arr];
       const removedValue = arr.splice(storageIndex, 1)[0];
       this.emit(path, arr, oldValue);
       this.shiftFieldRuntimeConfigAfterRowRemove(path, storageIndex);
       this.shiftDependencyGraphAfterRowRemove(path, storageIndex);
+      this.shiftSubFieldConfigAfterRowRemove(path, storageIndex);
       if (axisInfo) {
         const uidField = axisInfo.axis === "y" ? "__gw_y_uid" : "__gw_x_uid";
         this.cleanupCrossByAxisUid(tableKey, axisInfo.axis, removedValue?.[uidField]);
@@ -87333,21 +87372,33 @@ class TableRuntimeContext {
   get arrayPath() {
     return `$.${this.subFieldKey}`;
   }
-  /** 指定行路径 $.subFieldKey[rowIndex] */
+  /** 指定行路径 $.subFieldKey[rowIndex]；rowIndex 为存储下标 */
   rowPath(rowIndex) {
     return `${this.arrayPath}[${rowIndex}]`;
   }
-  /** 读取指定行数据 */
+  /** 读取指定行数据；rowIndex 为存储下标 */
   getRow(rowIndex) {
     return this.doc.dataManager.get(this.rowPath(rowIndex));
   }
-  /** 子表总行数，无数据默认返回 1 */
+  /**
+   * 子表存储行数（含软删），无数据默认返回 1
+   */
   getRowCount() {
     const rows = this.doc.dataManager.getRawData()[this.subFieldKey];
     if (Array.isArray(rows) && rows.length > 0) return rows.length;
     return 1;
   }
-  /** 构建单行规则执行上下文 */
+  /**
+   * 未软删行的存储下标。无数据时返回 [0]（与版面默认空行一致）；
+   * 仅剩软删行时返回 []。
+   */
+  getActiveRowIndexes() {
+    const rows = this.doc.dataManager.getRawData()[this.subFieldKey];
+    if (!Array.isArray(rows) || rows.length === 0) return [0];
+    const count = countActiveSubtableRows(rows);
+    return Array.from({ length: count }, (_2, index2) => index2);
+  }
+  /** 构建单行规则执行上下文；rowIndex 为存储下标 */
   buildRuleContext(rowIndex, changedFieldKey) {
     const rowPath = this.rowPath(rowIndex);
     const rowData = this.getRow(rowIndex) ?? {};
@@ -87361,9 +87412,12 @@ class TableRuntimeContext {
       paramsConfig: this.doc.paramsConfig ?? {}
     };
   }
-  /** 遍历子表数据行，支持指定单行或全量遍历，逐行注入 RuleContext */
+  /**
+   * 遍历子表数据行，支持指定单行或全量遍历，逐行注入 RuleContext。
+   * rowIndex / 全量遍历均使用存储下标；全量时跳过 deleted_ 行。
+   */
   eachRow(options, iteratee) {
-    const rowIndexes = options.rowIndex !== void 0 ? [options.rowIndex] : Array.from({ length: this.getRowCount() }, (_2, index2) => index2);
+    const rowIndexes = options.rowIndex !== void 0 ? [options.rowIndex] : this.getActiveRowIndexes();
     for (const rowIndex of rowIndexes) {
       iteratee(this.buildRuleContext(rowIndex, options.changedFieldKey));
     }
@@ -88027,8 +88081,7 @@ class RemoteSyncEngine {
     const config = ctx.profile.remoteSync;
     const missingKeys = config?.resyncOnInitWhenMissing;
     if (!config || !missingKeys?.length) return;
-    const rowCount = ctx.getRowCount();
-    for (let rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+    for (const rowIndex of ctx.getActiveRowIndexes()) {
       const row = ctx.getRow(rowIndex);
       if (!row) continue;
       if (config.requireAllOf?.some((key) => !isPresent(row[key]))) continue;
@@ -88210,11 +88263,10 @@ class RowRuntimeEngine {
       runRowHandler(ctx.profile.type, handler.handler, this.doc, ctx.subFieldKey, rowIndex);
     }
   }
-  /** 初始化时对所有行执行行初始化 */
+  /** 初始化时对所有未软删行执行行初始化 */
   applyRowInitForAllRows(ctx) {
     if (!this.hasRowInit(ctx)) return;
-    const rowCount = ctx.getRowCount();
-    for (let rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+    for (const rowIndex of ctx.getActiveRowIndexes()) {
       this.applyRowInit(ctx, rowIndex);
     }
   }
@@ -88897,7 +88949,14 @@ const profile$3 = {
     fieldType: "master_slave",
     refModelType: "MATERIAL_CONSUME"
   },
-  rowHandlers: [{ when: "onFieldChange", watch: ["qty_"], handler: "on-qty-change" }],
+  rowHandlers: [{ when: "onFieldChange", watch: ["qty_", "product_id_", "material_no_"], handler: "on-qty-change" }],
+  runtimeRules: [
+    {
+      when: "always",
+      fields: ["qty_consumed_"],
+      effect: { disabled: true }
+    }
+  ],
   theme: {
     color: "#4891B3",
     background: "rgba(72,145,179,0.2)",
@@ -99439,22 +99498,6 @@ class LayoutContext {
     this.paragraph?.addChild(run);
     this.layoutRun = run;
   }
-  /** 子表可见行下标 → rawData 存储下标（跳过 deleted_ 行） */
-  mapSubtableVisibleIndex(templatePath, visibleIndex, axis) {
-    if (visibleIndex === void 0) return void 0;
-    const parsed = parseValuePath(templatePath);
-    const dm = this.doc.dataManager;
-    if (axis === "n_y" && parsed.parentFieldPath) {
-      return dm.resolveSubtableVisibleIndex(parsed.parentFieldPath, visibleIndex);
-    }
-    if (axis === "n_x" && parsed.linkFieldPath) {
-      return dm.resolveSubtableVisibleIndex(parsed.linkFieldPath, visibleIndex);
-    }
-    if (parsed.isSubTable && parsed.parentFieldPath) {
-      return dm.resolveSubtableVisibleIndex(parsed.parentFieldPath, visibleIndex);
-    }
-    return visibleIndex;
-  }
   /**
    * 根据 dataIndex 替换 path 中的 [n] 为实际值
    * @param path 包含 [n] 的路径，如 "$.items[n].name"
@@ -99465,8 +99508,8 @@ class LayoutContext {
     const { type: type4, dataIndex, xDataIndex, yDataIndex, cellZone } = this.cell?.subRenderer || {};
     if (isLinkSubTableType(type4) && cellZone === "cross") {
       return replacePathIndexPlaceholders({
-        x: this.mapSubtableVisibleIndex(path, xDataIndex, "n_x"),
-        y: this.mapSubtableVisibleIndex(path, yDataIndex, "n_y"),
+        x: xDataIndex,
+        y: yDataIndex,
         templatePath: path
       });
     }
@@ -99476,10 +99519,6 @@ class LayoutContext {
     let n = dataIndex;
     if (isLinkSubTableType(type4)) {
       n = cellZone === "horizontal" ? yDataIndex : xDataIndex;
-      const axis = cellZone === "horizontal" ? "n_y" : "n_x";
-      n = this.mapSubtableVisibleIndex(path, n, axis);
-    } else {
-      n = this.mapSubtableVisibleIndex(path, n, "n");
     }
     if (n === void 0) return path;
     return replacePathIndexPlaceholder(n, path);
@@ -108450,6 +108489,9 @@ class BomEntriesValidator {
    * @param row 单行的数据
    */
   validateInBom(row) {
+    if (this.mcPattern === MaterialConsumptionPatternEnum.RECORD) {
+      return;
+    }
     if (!row.product_id_) {
       throw new Error(
         "物料不能为空"
@@ -108578,9 +108620,7 @@ class BomEntriesValidator {
    * @return {*}
    */
   mergeRowInArr(row, arr) {
-    if (this.mcPattern !== MaterialConsumptionPatternEnum.RECORD) {
-      this.validateInBom(row);
-    }
+    this.validateInBom(row);
     const newArr = cloneDeep(arr).filter((i) => i.product_id_);
     const util = this.findUtilByProductId(row.product_id_);
     const sameIndex = findLastIndex(newArr, (i) => {
@@ -108732,12 +108772,12 @@ class MCDataUtil {
     });
   }
   /**
-   * [需求数量、已消耗数量]一直禁用
+   * 物料消耗模式 BOM 模式需要禁用[需求数量]
    * 参顶部[物料消耗表字段控制]
    * @param rowPath $.f_sub[n] n 必须为数字
    */
-  static disableQtyFields(dataManager, rowPath) {
-    const fields2 = ["qty_consumed_", "qty_required_"];
+  static disableQtyRequired(dataManager, rowPath) {
+    const fields2 = ["qty_required_"];
     this._updateDisablement({ dataManager, rowPath, fields: fields2, disabled: true });
   }
   /**
@@ -108775,6 +108815,7 @@ class MCDataUtil {
     const { dataManager, subFieldKey, rowIndex } = option;
     const rows = dataManager.getRawData()[subFieldKey] ?? [];
     const row = rows[rowIndex];
+    if (!row) return;
     row.is_confirmed_ = isConfirmed;
     rows[rowIndex] = row;
     dataManager.set(subFieldKey, rows, "user");
@@ -108865,7 +108906,7 @@ class MaterialConsumeTableController {
     return this.tableDataRef.value.filter((i) => !i.deleted_);
   }
   /**
-   * 修改表格数据（保留打deleted_标签的数据）
+   * 修改表格数据（保留软删行在后缀）
    */
   set actualTableData(value) {
     const deletedArr = this.tableDataRef.value.filter((i) => i.deleted_);
@@ -108979,9 +109020,9 @@ class MaterialConsumeTableController {
       qty_: data.qty,
       validate_: data.expiration,
       // 记录模式传null，后台就不校验了
-      bom_entries_bom: isRecordPattern ? null : this.actualBomEntries,
+      bom_entries_: isRecordPattern ? null : this.actualBomEntries,
       operation_id_: this.tmplBomController.operationId
-    });
+    }) || (isRecordPattern ? [{ productionIdentificationName: data.lot }] : null);
     if (!arr) {
       this.error(
         "扫描的物料不存在或不在bom中"
@@ -108990,7 +109031,7 @@ class MaterialConsumeTableController {
       return;
     }
     let materialData = arr[0];
-    if (arr.length > 1) {
+    if (arr.length > 1 && !isRecordPattern) {
       const ids = this.actualTableData.map((i) => i.product_id_);
       const find = arr.find((j2) => ids.includes(j2.materialId));
       if (!find) {
@@ -109006,6 +109047,9 @@ class MaterialConsumeTableController {
       qty_: data.qty,
       is_confirmed_: false
     };
+    if (isRecordPattern && !row.product_id_) {
+      row._scanFallback = true;
+    }
     if (this.scanRuleProps?.fillMapArr?.length) {
       const fillData = calcFillData(data, this.scanRuleProps.fillMapArr);
       console.log("fillData", fillData);
@@ -109018,14 +109062,14 @@ class MaterialConsumeTableController {
     try {
       const newArr = this.bomEntriesValidator.mergeRowInArr(row, this.actualTableData);
       await this.bomEntriesValidator.validateScanCanInsert(newArr);
-      this.tableDataRef.value = newArr;
+      this.actualTableData = newArr;
       setTimeout(async () => {
         const row2 = this.actualTableData.find((i) => !i.is_confirmed_);
         const rowIndex = this.actualTableData.findIndex((i) => !i.is_confirmed_);
         const { doc, subFieldKey, subModelKey } = option;
         await doc.dataManager.whenEmitSettled();
         await hydrateSubtableRowLabels(doc, subFieldKey, [rowIndex]);
-        if (row2) {
+        if (row2 && row2.product_id_) {
           this.confirm({ dataManager: doc.dataManager, subFieldKey, rowIndex }, subModelKey, doc);
         }
       });
@@ -109109,6 +109153,9 @@ class MaterialConsumeTableController {
         const { dataManager, rowIndex, subFieldKey } = option;
         const rows = dataManager.getRawData()[subFieldKey] ?? [];
         const row = rows[rowIndex];
+        if (!row.product_id_) {
+          throw new Error("物料不能为空");
+        }
         this.validateExpiration(row);
       } else {
         await this.bomEntriesValidator.validate(this.actualTableData);
@@ -109226,15 +109273,15 @@ class MaterialConsumeTableController {
    *   - 删除行
    */
   updateRowConsumed(doc) {
-    const modifySingleRow = (index2) => {
-      const row = this.actualTableData[index2];
+    const modifySingleRow = (row, rowIndex) => {
+      const fieldKey = `${this.subTableInfo.valuePath}[${rowIndex}].qty_consumed_`;
       if (!row.product_id_) {
-        row.qty_consumed_ = 0 + (Number(row.qty_) ?? 0);
+        doc.dataManager.set(fieldKey, row.qty_ ? Number(row.qty_) : "", "user");
         return;
       }
       let total = 0;
       const util = this.bomEntriesValidator.findUtilByProductId(row.product_id_);
-      const beforeArr = this.actualTableData.slice(0, index2 + 1);
+      const beforeArr = this.actualTableData.slice(0, rowIndex + 1);
       if (util) {
         total += util.hasConsumed;
         console.log("total", total);
@@ -109242,14 +109289,13 @@ class MaterialConsumeTableController {
         filterGroupData.forEach((i) => {
           total += Number(i.qty_ || 0) ?? 0;
         });
-        const fieldKey = `${this.subTableInfo.valuePath}[${index2}].qty_consumed_`;
         doc.dataManager.set(fieldKey, total, "user");
       }
     };
     setTimeout(() => {
-      for (let index2 = 0; index2 < this.actualTableData.length; index2++) {
-        modifySingleRow(index2);
-      }
+      this.actualTableData.forEach((row, rowIndex) => {
+        modifySingleRow(row, rowIndex);
+      });
     });
   }
   /**
@@ -109299,6 +109345,10 @@ class MaterialConsumeTableController {
     if (["product_id_", "material_no_"].includes(fieldKey)) {
       const rowPath = `${parentFieldPath}[${dataIndex}]`;
       if (fieldKey === "product_id_") {
+        const row = doc.dataManager.get(rowPath);
+        if (row._scanFallback) {
+          return;
+        }
         const product_id_ = changedData[`${rowPath}.product_id_`];
         const versionId = product_id_?.split(":").pop();
         if (versionId) {
@@ -109492,6 +109542,9 @@ const initMaterialConsumeTableConfig = (doc, subConfig, tmplBomC) => {
     ({ personal_bom_enabled_, entries_, table_key_ }) => {
       const tableController = tmplBomC?.findTableControllerByField(table_key_);
       const useBomMode = tableController?.mcPattern === MaterialConsumptionPatternEnum.BOM;
+      const subFieldKey = table_key_.replace("$.", "");
+      const rows = doc.dataManager.getRawData()[subFieldKey] || [];
+      const activeCount = rows.filter((row) => !row?.deleted_).length;
       if (useBomMode) {
         const entries = personal_bom_enabled_ ? entries_ : tmplBomC.bomEntries;
         const includedIds = [];
@@ -109502,14 +109555,12 @@ const initMaterialConsumeTableConfig = (doc, subConfig, tmplBomC) => {
           });
         });
         subConfig[`${table_key_}[n].product_id_`] = { "id_.in": includedIds };
+        repeat(activeCount || 1, (index2) => {
+          MCDataUtil.disableQtyRequired(doc.dataManager, `${table_key_}[${index2}]`);
+        });
       }
-      const subFieldKey = table_key_.replace("$.", "");
-      const rows = doc.dataManager.getRawData()[subFieldKey] || [];
-      const rowCount = rows.length;
-      repeat(rowCount || 1, (index2) => {
-        MCDataUtil.disableQtyFields(doc.dataManager, `${table_key_}[${index2}]`);
-      });
       rows.forEach((row, rowIndex) => {
+        if (row?.deleted_) return;
         const rowPath = `${table_key_}[${rowIndex}]`;
         if (row.product_id_) {
           const versionId = row.product_id_.split(":").pop();
@@ -110128,7 +110179,8 @@ class InitLoadEngine {
     if (config.rowPatch) {
       rows = rows.map((row) => ({ ...row, ...config.rowPatch }));
     }
-    this.doc.dataManager.set(subFieldKey, rows, "hydrate");
+    const deletedRows = this.readExistingRows(subFieldKey).filter((row) => row.deleted_);
+    this.doc.dataManager.set(subFieldKey, [...rows, ...deletedRows], "hydrate");
   }
   isEnabled(config, regionProps) {
     if (config.enabled === true) return true;
@@ -110144,7 +110196,7 @@ class InitLoadEngine {
    * @returns true-跳过，false-不跳过
    */
   shouldSkip(subFieldKey, config) {
-    const existingRows = this.readExistingRows(subFieldKey);
+    const existingRows = this.readExistingRows(subFieldKey).filter((row) => !row.deleted_);
     if (existingRows.length === 0) return false;
     if (config.skipWhenNonemptyRows && this.hasNonemptyRow(existingRows)) {
       return true;
@@ -116347,18 +116399,15 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
     };
     const getTableRows = (subFieldKey, visible) => {
       const rows = docInst.value.dataManager.getRawData()[subFieldKey] ?? [];
-      if (visible) {
+      {
         return rows.filter((row) => !row.deleted_);
       }
-      return rows;
     };
     const checkTargetRowThen = (cb) => {
       const { dataManager } = docInst.value;
-      const { subFieldKey, index: index2 } = getCtx();
-      const allRows = getTableRows(subFieldKey);
-      if (!allRows[index2]) {
-        allRows.splice(index2, 0, {});
-        dataManager.set(subFieldKey, allRows, "user");
+      const { path, index: index2 } = getCtx();
+      if (!dataManager.get(`${path}[${index2}]`)) {
+        dataManager.insertAt(path, index2, {});
       }
       setTimeout(cb);
     };
@@ -116383,7 +116432,7 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
     });
     const actionInfo = computed(() => {
       const { subFieldKey, index: index2 } = getCtx();
-      const visibleRows = getTableRows(subFieldKey, true);
+      const visibleRows = getTableRows(subFieldKey);
       const { isMaterialConsume, isWarehouseInventory, isWarehouseAllocate } = subTableType.value;
       const canCopy = !isWarehouseInventory && !isWarehouseAllocate;
       const canInsertMulti = !isMaterialConsume && !isWarehouseInventory && !isWarehouseAllocate;
@@ -116438,10 +116487,10 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
         await changeWarehouseInventoryParseRule({ doc, subRenderer, subModelKey });
       }
     };
-    const getIsAddable = () => {
+    const getIsIncreasable = () => {
       if (subTableType.value.isMaterialConsume) {
         const { subFieldKey } = getCtx();
-        const visibleRows = getTableRows(subFieldKey, true);
+        const visibleRows = getTableRows(subFieldKey);
         const isAllConfirmed = visibleRows.length && visibleRows.every((row) => row.is_confirmed_);
         if (!isAllConfirmed) {
           GctMessage.error("同时只能有一条数据开启编辑状态");
@@ -116450,34 +116499,35 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
       }
       return true;
     };
-    const handleAddRowAfter = (subFieldKey, rowIndex) => {
+    const handleRowIncreased = (subFieldKey, rowIndex) => {
       if (subTableType.value.isMaterialConsume) {
-        MCDataUtil.disableQtyFields(props.doc.dataManager, `$.${subFieldKey}[${rowIndex}]`);
+        mcTableCtrl.value?.updateRowConsumed(props.doc);
+        if (mcTableCtrl.value?.mcPattern === MaterialConsumptionPatternEnum.BOM) {
+          MCDataUtil.disableQtyRequired(props.doc.dataManager, `$.${subFieldKey}[${rowIndex}]`);
+        }
       }
       new TableRuntime(props.doc).onRowInit(subFieldKey, rowIndex);
     };
     const insertRows = (index2, count = 1) => {
-      if (!getIsAddable()) return;
+      if (!getIsIncreasable()) return;
       const { path, subFieldKey } = getCtx();
       props.doc.dataManager.insertAt(path, index2, ...Array.from({ length: count }, () => ({})));
-      handleAddRowAfter(subFieldKey, index2);
-    };
-    const removeRow = () => {
-      const { path, index: index2 } = getCtx();
-      props.doc.dataManager.removeAt(path, index2);
-      mcTableCtrl.value?.updateRowConsumed(props.doc);
+      handleRowIncreased(subFieldKey, index2);
     };
     const copyRow = () => {
-      if (!getIsAddable()) return;
+      if (!getIsIncreasable()) return;
       const { path, index: index2, subFieldKey } = getCtx();
-      const storageIndex = props.doc.dataManager.resolveSubtableVisibleIndex(path, index2);
-      let data = props.doc.dataManager.get(`${path}[${storageIndex}]`) || {};
+      let data = props.doc.dataManager.get(`${path}[${index2}]`) || {};
       data = omit(data, "id_");
       if (subTableType.value.isMaterialConsume) {
         data = omit(data, "is_confirmed_");
       }
       props.doc.dataManager.insertAt(path, index2 + 1, data);
-      handleAddRowAfter(subFieldKey, index2 + 1);
+      handleRowIncreased(subFieldKey, index2 + 1);
+    };
+    const removeRow = () => {
+      const { path, index: index2 } = getCtx();
+      props.doc.dataManager.removeAt(path, index2);
       mcTableCtrl.value?.updateRowConsumed(props.doc);
     };
     const actionHandlers = {
@@ -116697,7 +116747,7 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2T, [["__scopeId", "data-v-ce0d6ea2"]]);
+const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2T, [["__scopeId", "data-v-923a27bd"]]);
 const _sfc_main$2S = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -140658,11 +140708,8 @@ function useTableDropdown(props, searchFilters) {
     const valuePath = fieldMeta.value?.valuePath;
     const subFieldConfig = getSubFieldConfig(docInst.value.paramsConfig);
     const extraParams = subFieldConfig.get(valuePath);
-    const dataIndex = props.widget?.dataSlotIndex?.dataIndex;
-    if (valuePath && isNumber(dataIndex)) {
-      const _valuePath = valuePath.replace("[n]", `[${dataIndex}]`);
-      const subParams = subFieldConfig.get(_valuePath);
-      Object.assign(extraParams, subParams);
+    if (runtimeValuePath.value) {
+      Object.assign(extraParams, subFieldConfig.get(runtimeValuePath.value));
     }
     const { queryData = {}, exp = "" } = buildQuery?.({
       keyword,

package/dist/runtime/canvas/table/render/material-consume/material-consume-table-controller.d.ts

@@ -22,6 +22,8 @@ export interface UpdateRowOption {
  * - [有效期、唯一标识、自定义字段] 始终可填（不做控制）
  * - 选择的物料类型是[查看物料]时 [批次、上料数量、工序] 只读
  * - 单行校验通过后（包括暂存后再次编辑）[物料、批次、上料数量、工序、需求数量单位、数量单位、转换后数量、转换数量单位ID、单位转化公式] 只读
+ * v2026.7.30
+ * - [物料消耗模式]是[记录模式]时，可以填写[需求数量](BOM 模式禁用 需求数量)
  */
 export declare class MCDataUtil {
     /**
@@ -37,11 +39,11 @@ export declare class MCDataUtil {
      */
     private static _updateDisablement;
     /**
-     * [需求数量、已消耗数量]一直禁用
+     * 物料消耗模式 BOM 模式需要禁用[需求数量]
      * 参顶部[物料消耗表字段控制]
      * @param rowPath $.f_sub[n] n 必须为数字
      */
-    static disableQtyFields(dataManager: DataManager, rowPath: string): void;
+    static disableQtyRequired(dataManager: DataManager, rowPath: string): void;
     /**
      * 物料类型 是否选择[查看物料]时，需要更新指定字段是否禁用
      * 参顶部[物料消耗表字段控制]
@@ -112,7 +114,7 @@ export declare class MaterialConsumeTableController {
      */
     get actualTableData(): IMaterialConsumeData[];
     /**
-     * 修改表格数据（保留打deleted_标签的数据）
+     * 修改表格数据（保留软删行在后缀）
      */
     set actualTableData(value: IMaterialConsumeData[]);
     constructor(tmplBomController: FormTmplBomController, tmplBom: IFormTmplBom);

package/dist/runtime/canvas/table/render/material-consume/service.d.ts

@@ -15,7 +15,7 @@ export declare function materialCheck(params: {
     /** 有效期 */
     validate_?: any;
     /** bom明细 */
-    bom_entries_bom: any;
+    bom_entries_: any;
     /** 工序id */
     operation_id_: string;
 }): Promise<{

package/dist/suites/shared/panel/config/editor/ref-autofill-editor/autofill-runtime.d.ts

@@ -10,6 +10,8 @@ type AutofillApplyOptions = {
     rowIndexes?: number[];
 };
 export declare function applyAutofillRules(record: Record<string, unknown>, autofillRules: AutofillRule[], opts?: AutofillApplyOptions): Record<string, unknown>;
-/** 子表插行 / 行初始化：从主表规则补默认值 */
+/**
+ * 子表插行 / 行初始化：从主表规则补默认值
+ */
 export declare function applyAutofillOnSubTableRowInit(doc: Doc, subFieldKey: string, rowIndex: number, fetchSource?: (field: FieldDataBindingMeta, context: Record<string, unknown>) => Promise<unknown>): Promise<void>;
 export {};

package/dist/word.css

@@ -9124,20 +9124,20 @@ textarea[data-v-2de31883]::placeholder {
 .table-action .row-headers .row-header:last-child .row-add-btn[data-v-c40eef9f] .gct-icon.bottom {
   transform: translateY(-100%);
 }
-.sub-table-action-container[data-v-ce0d6ea2] {
+.sub-table-action-container[data-v-923a27bd] {
   position: absolute;
   z-index: 999;
 }
-.sub-table-action-bar[data-v-ce0d6ea2],
-.sub-table-action-popper[data-v-ce0d6ea2] {
+.sub-table-action-bar[data-v-923a27bd],
+.sub-table-action-popper[data-v-923a27bd] {
   pointer-events: auto;
   user-select: none;
 }
-.sub-table-action-bar[data-v-ce0d6ea2] {
+.sub-table-action-bar[data-v-923a27bd] {
   display: flex;
 }
-.sub-table-action-bar .more-btn[data-v-ce0d6ea2],
-.sub-table-action-bar .confirm-btn[data-v-ce0d6ea2] {
+.sub-table-action-bar .more-btn[data-v-923a27bd],
+.sub-table-action-bar .confirm-btn[data-v-923a27bd] {
   display: flex;
   justify-content: center;
   align-items: center;
@@ -9146,44 +9146,44 @@ textarea[data-v-2de31883]::placeholder {
   cursor: pointer;
   box-sizing: border-box;
 }
-.sub-table-action-bar .more-btn[data-v-ce0d6ea2] {
+.sub-table-action-bar .more-btn[data-v-923a27bd] {
   width: 10px;
   background: #026ac8;
   border-radius: 0 4px 4px 0;
 }
-.sub-table-action-bar .confirm-btn[data-v-ce0d6ea2] {
+.sub-table-action-bar .confirm-btn[data-v-923a27bd] {
   margin-left: 4px;
   border-radius: 4px;
   border: 1px solid #4ec262;
 }
-.sub-table-action-popper[data-v-ce0d6ea2] {
+.sub-table-action-popper[data-v-923a27bd] {
   padding: 2px 8px;
 }
-.sub-table-action-popper .action-menu[data-v-ce0d6ea2] {
+.sub-table-action-popper .action-menu[data-v-923a27bd] {
   padding: 4px 0;
   width: 220px;
   user-select: none;
 }
-.sub-table-action-popper .action-menu + .action-menu[data-v-ce0d6ea2] {
+.sub-table-action-popper .action-menu + .action-menu[data-v-923a27bd] {
   margin-top: 4px;
   padding-top: 4px;
   border-top: 1px solid #efefef;
 }
-.sub-table-action-popper .action-menu .menu-title[data-v-ce0d6ea2] {
+.sub-table-action-popper .action-menu .menu-title[data-v-923a27bd] {
   color: #bcbcbc;
   margin: 4px 0;
 }
-.sub-table-action-popper .action-menu .menu-item[data-v-ce0d6ea2] {
+.sub-table-action-popper .action-menu .menu-item[data-v-923a27bd] {
   display: flex;
   align-items: center;
   padding: 8px 10px;
   border-radius: 4px;
 }
-.sub-table-action-popper .action-menu .menu-item[data-v-ce0d6ea2]:hover {
+.sub-table-action-popper .action-menu .menu-item[data-v-923a27bd]:hover {
   cursor: pointer;
   background-color: #f2f5f8;
 }
-.sub-table-action-popper .action-menu .menu-item .item-icon[data-v-ce0d6ea2] {
+.sub-table-action-popper .action-menu .menu-item .item-icon[data-v-923a27bd] {
   display: flex;
   align-items: center;
   justify-content: start;
@@ -9191,14 +9191,14 @@ textarea[data-v-2de31883]::placeholder {
   width: 20px;
   height: 20px;
 }
-.sub-table-action-popper .action-menu .menu-item .item-icon.scale-large[data-v-ce0d6ea2] {
+.sub-table-action-popper .action-menu .menu-item .item-icon.scale-large[data-v-923a27bd] {
   transform: scale(1.5);
 }
-.sub-table-action-popper .action-menu .menu-item .item-label[data-v-ce0d6ea2] {
+.sub-table-action-popper .action-menu .menu-item .item-label[data-v-923a27bd] {
   flex-grow: 1;
   margin-left: 8px;
 }
-.sub-table-action-popper .action-menu .menu-item .item-label.flex-between-center[data-v-ce0d6ea2] {
+.sub-table-action-popper .action-menu .menu-item .item-label.flex-between-center[data-v-923a27bd] {
   display: flex;
   justify-content: space-between;
   align-items: center;

package/package.json

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