@gct-paas/word 0.1.63-beta.6 → 0.1.63-beta.8

package/dist/core/data/enrichers/hyperlink-enricher.d.ts

@@ -1,6 +1,11 @@
 import { Doc } from '../../view/Doc';
 import { WidgetMeta } from '../../widget';
 import { DataEnricherRegistration } from '../types';
+/**
+ * 用批次号调用 biz_judge_jump，判断是否可超链接。
+ * 不可链时返回 null；可链时返回非空字符串（供弹框/跳转使用）。
+ */
+export declare function resolveHyperlinkHrefByMaterialNo(materialNo: unknown): Promise<string | null>;
 type HyperlinkEnricherOptions = Omit<DataEnricherRegistration, 'enrich'> & {
     doc: Doc;
     widgetMeta: WidgetMeta;

package/dist/domain/table/business/shared/production-container-hyperlink-enricher.d.ts

@@ -0,0 +1,7 @@
+import { Doc } from '../../../../core';
+import { DataEnricherRegistration } from '../../../../core/data';
+import { BusinessSubTableType } from '../../types';
+/**
+ * 按业务表类型，仅为该表内的「生产批次号」补全 _href_
+ */
+export declare function createProductionContainerHyperlinkEnricher(doc: Doc, tableType: BusinessSubTableType): DataEnricherRegistration;

package/dist/index.es.js

@@ -83937,6 +83937,10 @@ function getSelectStrategy(fieldType) {
   if (strategy) return strategy;
   return selectStrategyMap[FIELD_TYPE.REF];
 }
+const EXCLUDE_FROM_FIELD_TYPES = /* @__PURE__ */ new Set([FIELD_TYPE.BOOLEAN]);
+function isSelectableFromField(field) {
+  return !EXCLUDE_FROM_FIELD_TYPES.has(field.type);
+}
 function buildFromFieldTree(currentField, refModelFieldList) {
   return [
     {
@@ -83945,7 +83949,7 @@ function buildFromFieldTree(currentField, refModelFieldList) {
       icon: currentField.icon,
       iconVersion: currentField.version,
       iconColor: "#026ac8",
-      children: refModelFieldList.map((item) => ({
+      children: refModelFieldList.filter(isSelectableFromField).map((item) => ({
         label: item.name,
         value: item.key,
         icon: item.icon,
@@ -83976,8 +83980,22 @@ function isSubTableAutofillRule(rule) {
 function isAutofillSubTableTarget(rule, templatePath) {
   return isSubTableAutofillRule(rule) || parseValuePath(templatePath).isSubTable;
 }
+function resolveLegacyToSubFieldKey(rule, opts) {
+  if (rule.toSubFieldKey) return rule.toSubFieldKey;
+  if (!isSubTableAutofillRule(rule)) return void 0;
+  if (opts?.sourceValuePath) {
+    const parentFieldKey = parseValuePath(opts.sourceValuePath).parentFieldKey;
+    if (parentFieldKey) return parentFieldKey;
+  }
+  return void 0;
+}
+function normalizeAutofillRule(rule, opts) {
+  const toSubFieldKey = resolveLegacyToSubFieldKey(rule, opts);
+  if (!toSubFieldKey || toSubFieldKey === rule.toSubFieldKey) return rule;
+  return { ...rule, toSubFieldKey };
+}
 function buildAutofillTargetTemplatePath(rule) {
-  const { toField, toSubFieldKey, toSubModel } = rule;
+  const { toField, toSubFieldKey } = rule;
   if (!toField) return void 0;
   if (isSubTableAutofillRule(rule) && !toSubFieldKey) return void 0;
   return generateValuePath(toField, isSubTableAutofillRule(rule) ? toSubFieldKey : "");
@@ -84022,10 +84040,15 @@ function applyAutofillRules(record, autofillRules, opts) {
   for (const ruleItem of autofillRules) {
     const { fromField } = ruleItem;
     if (!fromField) continue;
-    const templatePath = buildAutofillTargetTemplatePath(ruleItem);
+    const normalizedRule = normalizeAutofillRule(ruleItem, opts);
+    const templatePath = buildAutofillTargetTemplatePath(normalizedRule);
     if (!templatePath) continue;
     const value = resolveAutofillSourceValue(record, fromField);
-    for (const runtimeValuePath of resolveAutofillRuntimeValuePaths(templatePath, ruleItem, opts)) {
+    for (const runtimeValuePath of resolveAutofillRuntimeValuePaths(
+      templatePath,
+      normalizedRule,
+      opts
+    )) {
       result[runtimeValuePath] = value;
     }
   }
@@ -84417,8 +84440,8 @@ function createCompanionEnricher(reg, config) {
     }
   };
 }
-async function resolveHyperlinkHref(_path, value) {
-  if (value == null || value === "") return null;
+async function resolveHyperlinkHrefByMaterialNo(materialNo) {
+  if (!isPresent(materialNo)) return null;
   try {
     const bool = await api.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey(
       {
@@ -84426,10 +84449,10 @@ async function resolveHyperlinkHref(_path, value) {
         modelKey: "gct_edhr_instance",
         modelCategory: "entity"
       },
-      { materialNo: value },
+      { materialNo },
       {}
     );
-    return bool ? String(value) : null;
+    return bool ? String(materialNo) : null;
   } catch {
     return null;
   }
@@ -84440,7 +84463,7 @@ function createHyperlinkEnricher(reg) {
     defaultIdPrefix: "hyperlink:",
     getCompanionPath: getHrefPath,
     buildCacheKey: (path, value) => ({ path, value }),
-    resolveCompanion: (path, value) => resolveHyperlinkHref(path, value)
+    resolveCompanion: (_path, value) => resolveHyperlinkHrefByMaterialNo(value)
   });
 }
 function resolveProductId(doc, path) {
@@ -89372,6 +89395,37 @@ const profile$1 = {
     labelBjColor: "rgba(33, 33, 213, 0.8)"
   }
 };
+const PRODUCTION_CONTAINER_FIELD_KEY = "production_container_id_";
+function createProductionContainerHyperlinkEnricher(doc, tableType) {
+  const subFieldKeys = new Set(
+    TableRuntimeContext.collectAll(doc).filter((ctx) => ctx.profile.type === tableType).map((ctx) => ctx.subFieldKey)
+  );
+  return createCompanionEnricher(
+    {
+      id: `hyperlink:${tableType}:production-container`,
+      valuePathTemplate: `*.${PRODUCTION_CONTAINER_FIELD_KEY}`,
+      match: (path) => {
+        const parsed = parseSubtableFieldPath(path);
+        if (!parsed || parsed.fieldKey !== PRODUCTION_CONTAINER_FIELD_KEY) return false;
+        return subFieldKeys.has(parsed.subFieldKey);
+      },
+      doc
+    },
+    {
+      cacheNamespace: "hyperlink_enrich_resolve",
+      defaultIdPrefix: "hyperlink:",
+      getCompanionPath: getHrefPath,
+      buildCacheKey: (path, value, currentDoc) => ({
+        path,
+        value,
+        // 生产批次号存的是 id，biz_judge_jump 需用展示批次号（_lb_）
+        // 注意：不要用 dataManager.getLabel（无 _lb_ 时会回落到 id）
+        materialNo: currentDoc.dataManager.get(getLabelPath(path))
+      }),
+      resolveCompanion: (path, _value, currentDoc) => resolveHyperlinkHrefByMaterialNo(currentDoc.dataManager.get(getLabelPath(path)))
+    }
+  );
+}
 function handleProductionContainerChange$1(doc, subFieldKey, rowIndex) {
   const ctx = getRowChangeCtx(doc, subFieldKey, rowIndex);
   if (!ctx) return;
@@ -89421,81 +89475,12 @@ function resolvePretreatmentListRemoteSync(records, ctx) {
     }
   };
 }
+registerStaticLabelEnricher((doc) => createProductionContainerHyperlinkEnricher(doc, TABLE_TYPE$1));
 registerRowHandler(TABLE_TYPE$1, "on-production-container-change", handleProductionContainerChange$1);
 registerRowHandler(TABLE_TYPE$1, "on-mfg-order-change", handleMfgOrderChange);
 registerRowHandler(TABLE_TYPE$1, "on-material-container-no-change", handleMaterialContainerNoChange);
 registerRowHandler(TABLE_TYPE$1, "on-product-change", handleProductChange);
 registerRemoteSyncApplyResolver(TABLE_TYPE$1, "remote-sync", resolvePretreatmentListRemoteSync);
-async function openPretreatmentListScan(options) {
-  const { doc, subRenderer, subFieldKey } = options;
-  const regionProps = subRenderer.widgetMeta?.props;
-  await openScanWithParseRule({
-    regionId: subRenderer.id,
-    barcodeParsingRulesId: regionProps?.barcode_parsing_rules_id_,
-    modalEvent: "OPEN_PRETREATMENT_LIST_TABLE_SCAN_MODAL",
-    title: subRenderer.tableName || "操作",
-    onScan: async (scanInput, { parseRuleProps, scanRuleInfo }) => {
-      const ctx = TableRuntimeContext.find(doc, subFieldKey);
-      const remoteSync = ctx?.profile.remoteSync;
-      if (!ctx || !remoteSync) return;
-      const parsed = getParseRuleValue$1(scanInput.str, scanRuleInfo.rules_);
-      if (!parsed.lot) {
-        GctMessage.error("条码中未解析到批次号");
-        return;
-      }
-      const remoteSyncEngine = new RemoteSyncEngine(doc);
-      const requestBody = remoteSyncEngine.buildBody(
-        {
-          name_: parsed.lot
-        },
-        remoteSync
-      );
-      if (!requestBody) {
-        GctMessage.error("扫描的物料批次不存在");
-        return;
-      }
-      const { queryData: typeQueryData, exp: typeExp } = buildLikeQuery(
-        [],
-        "",
-        {
-          "production_identification_type_.eq": "MATERIAL",
-          "production_identification_type_.isNull": null
-        },
-        {
-          filterCombine: "or"
-        }
-      );
-      const queryData = {
-        ...typeQueryData,
-        ...requestBody
-      };
-      const nameKeys = Object.keys(requestBody);
-      const nameExp = nameKeys.length <= 1 ? nameKeys[0] ?? "" : `AND(${nameKeys.join(",")})`;
-      const exp = typeExp && nameExp ? `AND(${nameExp},${typeExp})` : nameExp || typeExp;
-      const result = await callBizService(remoteSync.api, {
-        query: queryData,
-        exp
-      });
-      const records = unwrapBizServiceList(result);
-      if (!records.length) {
-        GctMessage.error("扫描的物料批次不存在");
-        return;
-      }
-      const fillData = parseRuleProps?.fillMapArr?.length ? calcFillData(parsed, parseRuleProps.fillMapArr) : {};
-      const rows = doc.dataManager.getRawData()[subFieldKey] || [];
-      remoteSyncEngine.applySyncResult(ctx, rows.length, remoteSync, records, "", {
-        qty_: parsed.qty,
-        ...fillData
-      });
-    }
-  });
-}
-async function changePretreatmentListParseRule(options) {
-  return changeBarcodeParseRule({
-    ...options,
-    modalEvent: "OPEN_PRETREATMENT_LIST_TABLE_PARSE_RULE_MODAL"
-  });
-}
 const F$1 = {
   /** 产品 */
   product: "product_id_",
@@ -89667,71 +89652,9 @@ function handleProductionContainerChange(doc, subFieldKey, rowIndex) {
   if (!isBlank(ctx.row[F$1.productionContainer])) return;
   applyRowClears(ctx, CLEAR_ON_PROD_CONTAINER_EMPTY);
 }
+registerStaticLabelEnricher((doc) => createProductionContainerHyperlinkEnricher(doc, TABLE_TYPE));
 registerRowHandler(TABLE_TYPE, "on-production-container-change", handleProductionContainerChange);
 registerRemoteSyncApplyResolver(TABLE_TYPE, "remote-sync", resolveEntrustSterilBatchListRemoteSync);
-async function openEntrustSterilBatchListScan(options) {
-  const { doc, subRenderer, subFieldKey } = options;
-  const regionProps = subRenderer.widgetMeta?.props;
-  await openScanWithParseRule({
-    regionId: subRenderer.id,
-    barcodeParsingRulesId: regionProps?.barcode_parsing_rules_id_,
-    modalEvent: "OPEN_ENTRUST_STERIL_BATCH_LIST_TABLE_SCAN_MODAL",
-    title: subRenderer.tableName || "操作",
-    onScan: async (scanInput, { parseRuleProps, scanRuleInfo }) => {
-      const ctx = TableRuntimeContext.find(doc, subFieldKey);
-      const remoteSync = ctx?.profile.remoteSync;
-      if (!ctx || !remoteSync) return;
-      const parsed = getParseRuleValue$1(scanInput.str, scanRuleInfo.rules_);
-      if (!parsed.lot) {
-        GctMessage.error("条码中未解析到批次号");
-        return;
-      }
-      const remoteSyncEngine = new RemoteSyncEngine(doc);
-      const requestBody = remoteSyncEngine.buildBody(
-        {
-          name_: parsed.lot
-        },
-        remoteSync
-      );
-      if (!requestBody) {
-        GctMessage.error("扫描的物料批次不存在");
-        return;
-      }
-      const { queryData: typeQueryData, exp: typeExp } = buildLikeQuery([], "", {
-        "production_identification_type_.in": ["LOT", "SN"],
-        is_rework_: 0
-      });
-      const queryData = {
-        ...typeQueryData,
-        ...requestBody
-      };
-      const nameKeys = Object.keys(requestBody);
-      const nameExp = nameKeys.length <= 1 ? nameKeys[0] ?? "" : `AND(${nameKeys.join(",")})`;
-      const exp = typeExp && nameExp ? `AND(${nameExp},${typeExp})` : nameExp || typeExp;
-      const result = await callBizService(remoteSync.api, {
-        query: queryData,
-        exp
-      });
-      const records = unwrapBizServiceList(result);
-      if (!records.length) {
-        GctMessage.error("扫描的物料批次不存在");
-        return;
-      }
-      const fillData = parseRuleProps?.fillMapArr?.length ? calcFillData(parsed, parseRuleProps.fillMapArr) : {};
-      const rows = doc.dataManager.getRawData()[subFieldKey] || [];
-      remoteSyncEngine.applySyncResult(ctx, rows.length, remoteSync, records, "", {
-        qty_: parsed.qty,
-        ...fillData
-      });
-    }
-  });
-}
-async function changeEntrustSterilBatchListParseRule(options) {
-  return changeBarcodeParseRule({
-    ...options,
-    modalEvent: "OPEN_ENTRUST_STERIL_BATCH_LIST_TABLE_PARSE_RULE_MODAL"
-  });
-}
 const ALL_TABLE_PROFILES = [
   profile$a,
   profile$9,
@@ -91821,6 +91744,7 @@ class WsecPr extends ModelNode {
    * 从原始 XML JSON 转换为 WsecPr 实例
    */
   static fromXmlJson(json) {
+    const { paperSize } = json;
     const pgSzRaw = pickElement(json, "w:pgSz");
     const pageSize = pgSzRaw ? {
       width: pgSzRaw["@attrs"]?.["w:w"] ? parseInt(pgSzRaw["@attrs"]["w:w"]) : void 0,
@@ -91849,6 +91773,7 @@ class WsecPr extends ModelNode {
     const titlePg = pickElement(json, "w:titlePg");
     return new WsecPr({
       attrs: json["@attrs"],
+      paperSize,
       pageSize,
       margins,
       columns: columns2,
@@ -102527,9 +102452,9 @@ class Section {
     return { ...res, paperSize };
   }
   getPaperSize() {
-    const ps = this.wsecPr?.pageSize;
-    const mmWidth = UnitConverter.twipToMm(ps.width);
-    const mmHeight = UnitConverter.twipToMm(ps.height);
+    const twipPageSize = this.wsecPr?.pageSize;
+    const mmWidth = UnitConverter.twipToMm(twipPageSize.width);
+    const mmHeight = UnitConverter.twipToMm(twipPageSize.height);
     const w2 = Math.min(mmWidth, mmHeight);
     const h2 = Math.max(mmWidth, mmHeight);
     const tolerance = 3;
@@ -102766,6 +102691,10 @@ class LayoutManager {
     while (remainingTable) {
       const page = this.pageContext.page;
       const pageRemainingSize = page.getRemainingSize();
+      const firstRowHeight = remainingTable?.children?.[0]?._height;
+      if (firstRowHeight && firstRowHeight > pageRemainingSize) {
+        break;
+      }
       const { cur, next } = splitTableByHeight(remainingTable, pageRemainingSize);
       const newRowIds = [];
       const trModelIds = cur?.getChildren().map((item) => item.modelRef?.id) || [];
@@ -108073,6 +108002,34 @@ const DefaultDocxJson = {
   fontTable,
   footers
 };
+const updatePgSzElInfo = (pgSz, paperSize, options) => {
+  const direction = options?.direction ?? "portrait";
+  let width = 11906;
+  let height = 16838;
+  switch (paperSize) {
+    case PaperSizeConst.A3:
+      width = 16838;
+      height = 23811;
+      break;
+    case PaperSizeConst.A5:
+      width = 8391;
+      height = 11906;
+      break;
+    case PaperSizeConst.CUSTOM:
+      width = Number(UnitConverter.mmToTwip(options.width));
+      height = Number(UnitConverter.mmToTwip(options.height));
+      break;
+    default:
+      width = 11906;
+      height = 16838;
+      break;
+  }
+  if (direction === "landscape") {
+    [width, height] = [height, width];
+  }
+  pgSz["@attrs"]["w:w"] = String(width);
+  pgSz["@attrs"]["w:h"] = String(height);
+};
 class RuntimeJsonBuilder {
   json;
   constructor(base) {
@@ -108097,32 +108054,7 @@ class RuntimeJsonBuilder {
   setPageSize(paperSize, options) {
     const pgSz = this.findNode(this.json.document, "w:pgSz");
     if (!pgSz) return this;
-    const direction = options?.direction ?? "portrait";
-    let width = 11906;
-    let height = 16838;
-    switch (paperSize) {
-      case PaperSizeConst.A3:
-        width = 16838;
-        height = 23811;
-        break;
-      case PaperSizeConst.A5:
-        width = 8391;
-        height = 11906;
-        break;
-      case PaperSizeConst.CUSTOM:
-        width = Number(UnitConverter.mmToTwip(options.width));
-        height = Number(UnitConverter.mmToTwip(options.height));
-        break;
-      default:
-        width = 11906;
-        height = 16838;
-        break;
-    }
-    if (direction === "landscape") {
-      [width, height] = [height, width];
-    }
-    pgSz["@attrs"]["w:w"] = String(width);
-    pgSz["@attrs"]["w:h"] = String(height);
+    updatePgSzElInfo(pgSz, paperSize, options);
     return this;
   }
   /**
@@ -108841,7 +108773,17 @@ class MCDataUtil {
    * @param rowPath $.f_sub[n] n 必须为数字
    */
   static updateConfirmableFieldsDisablement(option) {
-    const fields2 = ["product_id_", "material_no_", "qty_", "routing_operation_id_"];
+    const fields2 = [
+      "product_id_",
+      "material_no_",
+      "qty_",
+      "routing_operation_id_",
+      "qty_required_uom_id_",
+      "qty_uom_id_",
+      "qty_transfer_",
+      "qty_transfer_uom_id_",
+      "transfer_formula_"
+    ];
     this._updateDisablement({ ...option, fields: fields2 });
   }
   /**
@@ -109738,6 +109680,27 @@ class SingleTemplateStrategy extends DocRequestStrategy {
         direction: requestInfo.direction
       }).build();
       requestInfo.runtimeJson = JSON.stringify(json);
+    } else {
+      const jsonObj = JSON.parse(requestInfo.runtimeJson);
+      const wSec = jsonObj.document.elements[0]?.elements?.find((el) => el.name === "w:sectPr");
+      if (wSec) {
+        wSec.paperSize = requestInfo.paperSize;
+        const pgSzEl = wSec.elements?.find((el) => el.name === "w:pgSz");
+        if (pgSzEl) {
+          const { paperSize, width: w2, height: h2, direction } = requestInfo;
+          const [width, height] = [w2, h2].sort();
+          updatePgSzElInfo(
+            pgSzEl,
+            paperSize,
+            {
+              width,
+              height,
+              direction
+            }
+          );
+        }
+        requestInfo.runtimeJson = JSON.stringify(jsonObj);
+      }
     }
     return {
       id,
@@ -114136,6 +114099,43 @@ async function openESopViewModal(doc, widgetMeta, runtimeValuePath) {
   if (!options) return;
   await triggerUtil.handle("OPEN_E_SOP_VIEW_MODAL", options);
 }
+function resolveFieldKey(widgetMeta, runtimeValuePath) {
+  const sub = parseSubtableFieldPath(runtimeValuePath);
+  if (sub?.fieldKey) return sub.fieldKey;
+  const fromPath = parseValuePath(runtimeValuePath).fieldKey;
+  if (fromPath) return fromPath;
+  return getLastSegment(widgetMeta.field?.fieldLink) || "";
+}
+function resolveOpenFieldHyperlinkModalOptions(doc, widgetMeta, runtimeValuePath) {
+  const raw = doc.dataManager.getLabel(runtimeValuePath);
+  const sub = parseSubtableFieldPath(runtimeValuePath);
+  const subFieldKey = sub?.subFieldKey || widgetMeta.field?.subFieldKey;
+  const tableType = subFieldKey ? TableRuntimeContext.find(doc, subFieldKey)?.profile.type : void 0;
+  console.log("TJ::", {
+    materialNo: getValue$1(raw, false),
+    fieldType: widgetMeta.field?.fieldType,
+    href: doc.dataManager.getHref(runtimeValuePath) ?? void 0,
+    fieldKey: resolveFieldKey(widgetMeta, runtimeValuePath) || void 0,
+    tableType,
+    subFieldKey: subFieldKey || void 0,
+    rowIndex: sub?.rowIndex,
+    valuePath: runtimeValuePath
+  });
+  return {
+    materialNo: getValue$1(raw, false),
+    fieldType: widgetMeta.field?.fieldType,
+    href: doc.dataManager.getHref(runtimeValuePath) ?? void 0,
+    fieldKey: resolveFieldKey(widgetMeta, runtimeValuePath) || void 0,
+    tableType,
+    subFieldKey: subFieldKey || void 0,
+    rowIndex: sub?.rowIndex,
+    valuePath: runtimeValuePath
+  };
+}
+async function openFieldHyperlinkModal(doc, widgetMeta, runtimeValuePath) {
+  const options = resolveOpenFieldHyperlinkModalOptions(doc, widgetMeta, runtimeValuePath);
+  await triggerUtil.handle("OPEN_FIELD_HYPERLINK_MODAL", options);
+}
 const _sfc_main$38 = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -114274,11 +114274,7 @@ const _sfc_main$38 = /* @__PURE__ */ defineComponent({
           void openESopViewModal(props.doc, w2.widgetMeta, runtimeValuePath);
           return;
         }
-        const raw = props.doc.dataManager.getLabel(runtimeValuePath);
-        void triggerUtil.handle("OPEN_FIELD_HYPERLINK_MODAL", {
-          materialNo: getValue$1(raw, false),
-          fieldType: w2.widgetMeta?.field?.fieldType
-        });
+        void openFieldHyperlinkModal(props.doc, w2.widgetMeta, runtimeValuePath);
         return;
       }
       const isShowMark = interCtx.annotationIds && interCtx.annotationIds.length !== 0 && interCtx.annotationIds.includes(runtimeValuePath);
@@ -116314,31 +116310,19 @@ const _hoisted_8$e = {
 };
 const _hoisted_9$a = { class: "item-icon" };
 const _hoisted_10$8 = { class: "item-icon scale-large" };
-const _hoisted_11$6 = {
-  key: 2,
-  class: "action-menu"
-};
+const _hoisted_11$6 = { class: "action-menu" };
 const _hoisted_12$5 = { class: "item-icon" };
-const _hoisted_13$4 = { class: "item-icon scale-large" };
-const _hoisted_14$3 = {
-  key: 3,
-  class: "action-menu"
-};
-const _hoisted_15$2 = { class: "item-icon" };
+const _hoisted_13$4 = { class: "item-icon" };
+const _hoisted_14$3 = { class: "item-icon scale-large" };
+const _hoisted_15$2 = { class: "item-label flex-between-center" };
 const _hoisted_16$1 = { class: "item-icon scale-large" };
-const _hoisted_17 = { class: "action-menu" };
-const _hoisted_18 = { class: "item-icon" };
-const _hoisted_19 = { class: "item-icon" };
-const _hoisted_20 = { class: "item-icon scale-large" };
-const _hoisted_21 = { class: "item-label flex-between-center" };
-const _hoisted_22 = { class: "item-icon scale-large" };
-const _hoisted_23 = { class: "item-label flex-between-center" };
-const _hoisted_24 = {
-  key: 4,
+const _hoisted_17 = { class: "item-label flex-between-center" };
+const _hoisted_18 = {
+  key: 2,
   class: "action-menu"
 };
-const _hoisted_25 = { class: "item-icon" };
-const _hoisted_26 = { class: "more-btn" };
+const _hoisted_19 = { class: "item-icon" };
+const _hoisted_20 = { class: "more-btn" };
 const _sfc_main$2T = /* @__PURE__ */ defineComponent({
   __name: "sub-table-action",
   props: {
@@ -116468,30 +116452,6 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
         await changeWarehouseInventoryParseRule({ doc, subRenderer, subModelKey });
       }
     };
-    const handleEntrustSterilBatchListAction = async (val) => {
-      const { doc } = props;
-      const { subRenderer, valuePath, subFieldKey, subModelKey } = getCtx();
-      if (!valuePath || !subFieldKey) return;
-      if (val === "scan") {
-        checkTargetRowThen(() => {
-          openEntrustSterilBatchListScan({ doc, subRenderer, subFieldKey });
-        });
-      } else if (val === "change-rule") {
-        await changeEntrustSterilBatchListParseRule({ doc, subRenderer, subModelKey });
-      }
-    };
-    const handlePretreatmentListAction = async (val) => {
-      const { doc } = props;
-      const { subRenderer, valuePath, subFieldKey, subModelKey } = getCtx();
-      if (!valuePath || !subFieldKey) return;
-      if (val === "scan") {
-        checkTargetRowThen(() => {
-          openPretreatmentListScan({ doc, subRenderer, subFieldKey });
-        });
-      } else if (val === "change-rule") {
-        await changePretreatmentListParseRule({ doc, subRenderer, subModelKey });
-      }
-    };
     const getIsAddable = () => {
       if (subTableType.value.isMaterialConsume) {
         const { subFieldKey } = getCtx();
@@ -116585,7 +116545,7 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
               popper: withCtx(() => [
                 createElementVNode("div", _hoisted_2$1e, [
                   subTableType.value.isMaterialConsume ? (openBlock(), createElementBlock("div", _hoisted_3$V, [
-                    _cache[24] || (_cache[24] = createElementVNode("div", { class: "menu-title" }, "业务操作", -1)),
+                    _cache[20] || (_cache[20] = createElementVNode("div", { class: "menu-title" }, "业务操作", -1)),
                     actionInfo.value.canEdit ? (openBlock(), createElementBlock("div", {
                       key: 0,
                       class: "menu-item",
@@ -116594,7 +116554,7 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
                       createElementVNode("div", _hoisted_4$I, [
                         createVNode(unref(GctIcon), { icon: "icon-bianji" })
                       ]),
-                      _cache[20] || (_cache[20] = createElementVNode("div", { class: "item-label" }, "编辑行", -1))
+                      _cache[16] || (_cache[16] = createElementVNode("div", { class: "item-label" }, "编辑行", -1))
                     ])) : createCommentVNode("", true),
                     __props.isLastRow ? (openBlock(), createElementBlock("div", {
                       key: 1,
@@ -116604,7 +116564,7 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
                       createElementVNode("div", _hoisted_5$y, [
                         createVNode(unref(GctIcon), { icon: "icon-saoyisao" })
                       ]),
-                      _cache[21] || (_cache[21] = createElementVNode("div", { class: "item-label" }, "条码扫描", -1))
+                      _cache[17] || (_cache[17] = createElementVNode("div", { class: "item-label" }, "条码扫描", -1))
                     ])) : createCommentVNode("", true),
                     __props.isLastRow ? (openBlock(), createElementBlock("div", {
                       key: 2,
@@ -116614,7 +116574,7 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
                       createElementVNode("div", _hoisted_6$m, [
                         createVNode(unref(GctIcon), { icon: "icon-a-bom11" })
                       ]),
-                      _cache[22] || (_cache[22] = createElementVNode("div", { class: "item-label" }, "BOM", -1))
+                      _cache[18] || (_cache[18] = createElementVNode("div", { class: "item-label" }, "BOM", -1))
                     ])) : createCommentVNode("", true),
                     __props.isLastRow ? (openBlock(), createElementBlock("div", {
                       key: 3,
@@ -116624,11 +116584,11 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
                       createElementVNode("div", _hoisted_7$h, [
                         createVNode(unref(GctIcon), { icon: "icon-tiaomajiexi" })
                       ]),
-                      _cache[23] || (_cache[23] = createElementVNode("div", { class: "item-label" }, "条码解析规则变更", -1))
+                      _cache[19] || (_cache[19] = createElementVNode("div", { class: "item-label" }, "条码解析规则变更", -1))
                     ])) : createCommentVNode("", true)
                   ])) : createCommentVNode("", true),
                   subTableType.value.isWarehouseInventory ? (openBlock(), createElementBlock("div", _hoisted_8$e, [
-                    _cache[27] || (_cache[27] = createElementVNode("div", { class: "menu-title" }, "业务操作", -1)),
+                    _cache[23] || (_cache[23] = createElementVNode("div", { class: "menu-title" }, "业务操作", -1)),
                     createElementVNode("div", {
                       class: "menu-item",
                       onClick: _cache[4] || (_cache[4] = ($event) => handleWarehouseInventoryAction("scan"))
@@ -116636,7 +116596,7 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
                       createElementVNode("div", _hoisted_9$a, [
                         createVNode(unref(GctIcon), { icon: "icon-saoyisao" })
                       ]),
-                      _cache[25] || (_cache[25] = createElementVNode("div", { class: "item-label" }, " 条码扫描 ", -1))
+                      _cache[21] || (_cache[21] = createElementVNode("div", { class: "item-label" }, " 条码扫描 ", -1))
                     ]),
                     createElementVNode("div", {
                       class: "menu-item",
@@ -116645,89 +116605,47 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
                       createElementVNode("div", _hoisted_10$8, [
                         createVNode(unref(GctIcon), { icon: "icon-tiaomajiexi" })
                       ]),
-                      _cache[26] || (_cache[26] = createElementVNode("div", { class: "item-label" }, " 条码解析规则变更 ", -1))
+                      _cache[22] || (_cache[22] = createElementVNode("div", { class: "item-label" }, " 条码解析规则变更 ", -1))
                     ])
                   ])) : createCommentVNode("", true),
-                  subTableType.value.isEntrustSterilBatchList ? (openBlock(), createElementBlock("div", _hoisted_11$6, [
-                    _cache[30] || (_cache[30] = createElementVNode("div", { class: "menu-title" }, "业务操作", -1)),
+                  createElementVNode("div", _hoisted_11$6, [
+                    _cache[28] || (_cache[28] = createElementVNode("div", { class: "menu-title" }, "行编辑", -1)),
                     createElementVNode("div", {
                       class: "menu-item",
-                      onClick: _cache[6] || (_cache[6] = ($event) => handleEntrustSterilBatchListAction("scan"))
+                      onClick: _cache[6] || (_cache[6] = ($event) => handleAction("insertRowAfter"))
                     }, [
                       createElementVNode("div", _hoisted_12$5, [
-                        createVNode(unref(GctIcon), { icon: "icon-saoyisao" })
-                      ]),
-                      _cache[28] || (_cache[28] = createElementVNode("div", { class: "item-label" }, " 条码扫描 ", -1))
-                    ]),
-                    createElementVNode("div", {
-                      class: "menu-item",
-                      onClick: _cache[7] || (_cache[7] = ($event) => handleEntrustSterilBatchListAction("change-rule"))
-                    }, [
-                      createElementVNode("div", _hoisted_13$4, [
-                        createVNode(unref(GctIcon), { icon: "icon-tiaomajiexi" })
-                      ]),
-                      _cache[29] || (_cache[29] = createElementVNode("div", { class: "item-label" }, " 条码解析规则变更 ", -1))
-                    ])
-                  ])) : createCommentVNode("", true),
-                  subTableType.value.isPretreatmentList ? (openBlock(), createElementBlock("div", _hoisted_14$3, [
-                    _cache[33] || (_cache[33] = createElementVNode("div", { class: "menu-title" }, "业务操作", -1)),
-                    createElementVNode("div", {
-                      class: "menu-item",
-                      onClick: _cache[8] || (_cache[8] = ($event) => handlePretreatmentListAction("scan"))
-                    }, [
-                      createElementVNode("div", _hoisted_15$2, [
-                        createVNode(unref(GctIcon), { icon: "icon-saoyisao" })
-                      ]),
-                      _cache[31] || (_cache[31] = createElementVNode("div", { class: "item-label" }, " 条码扫描 ", -1))
-                    ]),
-                    createElementVNode("div", {
-                      class: "menu-item",
-                      onClick: _cache[9] || (_cache[9] = ($event) => handlePretreatmentListAction("change-rule"))
-                    }, [
-                      createElementVNode("div", _hoisted_16$1, [
-                        createVNode(unref(GctIcon), { icon: "icon-tiaomajiexi" })
-                      ]),
-                      _cache[32] || (_cache[32] = createElementVNode("div", { class: "item-label" }, " 条码解析规则变更 ", -1))
-                    ])
-                  ])) : createCommentVNode("", true),
-                  createElementVNode("div", _hoisted_17, [
-                    _cache[38] || (_cache[38] = createElementVNode("div", { class: "menu-title" }, "行编辑", -1)),
-                    createElementVNode("div", {
-                      class: "menu-item",
-                      onClick: _cache[10] || (_cache[10] = ($event) => handleAction("insertRowAfter"))
-                    }, [
-                      createElementVNode("div", _hoisted_18, [
                         createVNode(unref(GctIcon), { icon: "icon-tianjia" })
                       ]),
-                      _cache[34] || (_cache[34] = createElementVNode("div", { class: "item-label" }, " 加一行 ", -1))
+                      _cache[24] || (_cache[24] = createElementVNode("div", { class: "item-label" }, " 加一行 ", -1))
                     ]),
                     actionInfo.value.canCopy ? (openBlock(), createElementBlock("div", {
                       key: 0,
                       class: "menu-item",
-                      onClick: _cache[11] || (_cache[11] = ($event) => handleAction("copyCurrentRow"))
+                      onClick: _cache[7] || (_cache[7] = ($event) => handleAction("copyCurrentRow"))
                     }, [
-                      createElementVNode("div", _hoisted_19, [
+                      createElementVNode("div", _hoisted_13$4, [
                         createVNode(unref(GctIcon), { icon: "icon-fuzhihang" })
                       ]),
-                      _cache[35] || (_cache[35] = createElementVNode("div", { class: "item-label" }, " 复制行 ", -1))
+                      _cache[25] || (_cache[25] = createElementVNode("div", { class: "item-label" }, " 复制行 ", -1))
                     ])) : createCommentVNode("", true),
                     actionInfo.value.canInsertMulti ? (openBlock(), createElementBlock("div", {
                       key: 1,
                       class: "menu-item",
-                      onClick: _cache[14] || (_cache[14] = ($event) => handleAction("insertRowBeforeMore"))
+                      onClick: _cache[10] || (_cache[10] = ($event) => handleAction("insertRowBeforeMore"))
                     }, [
-                      createElementVNode("div", _hoisted_20, [
+                      createElementVNode("div", _hoisted_14$3, [
                         createVNode(unref(GctIcon), { icon: "icon-shangfangcharuhang" })
                       ]),
-                      createElementVNode("div", _hoisted_21, [
-                        _cache[36] || (_cache[36] = createElementVNode("div", null, " 在上方插入行 ", -1)),
+                      createElementVNode("div", _hoisted_15$2, [
+                        _cache[26] || (_cache[26] = createElementVNode("div", null, " 在上方插入行 ", -1)),
                         createVNode(unref(GctInputNumber), {
                           modelValue: formState.upRowNum,
-                          "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => formState.upRowNum = $event),
+                          "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => formState.upRowNum = $event),
                           min: 1,
                           integer: "",
                           style: { "width": "68px" },
-                          onClick: _cache[13] || (_cache[13] = withModifiers(() => {
+                          onClick: _cache[9] || (_cache[9] = withModifiers(() => {
                           }, ["stop"]))
                         }, null, 8, ["modelValue"])
                       ])
@@ -116735,40 +116653,40 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
                     actionInfo.value.canInsertMulti ? (openBlock(), createElementBlock("div", {
                       key: 2,
                       class: "menu-item",
-                      onClick: _cache[17] || (_cache[17] = ($event) => handleAction("insertRowAfterMore"))
+                      onClick: _cache[13] || (_cache[13] = ($event) => handleAction("insertRowAfterMore"))
                     }, [
-                      createElementVNode("div", _hoisted_22, [
+                      createElementVNode("div", _hoisted_16$1, [
                         createVNode(unref(GctIcon), { icon: "icon-xiafangcharuhang" })
                       ]),
-                      createElementVNode("div", _hoisted_23, [
-                        _cache[37] || (_cache[37] = createElementVNode("div", null, " 在下方插入行 ", -1)),
+                      createElementVNode("div", _hoisted_17, [
+                        _cache[27] || (_cache[27] = createElementVNode("div", null, " 在下方插入行 ", -1)),
                         createVNode(unref(GctInputNumber), {
                           modelValue: formState.downRowNum,
-                          "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => formState.downRowNum = $event),
+                          "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => formState.downRowNum = $event),
                           min: 1,
                           integer: "",
                           style: { "width": "68px" },
-                          onClick: _cache[16] || (_cache[16] = withModifiers(() => {
+                          onClick: _cache[12] || (_cache[12] = withModifiers(() => {
                           }, ["stop"]))
                         }, null, 8, ["modelValue"])
                       ])
                     ])) : createCommentVNode("", true)
                   ]),
-                  actionInfo.value.canDelete ? (openBlock(), createElementBlock("div", _hoisted_24, [
+                  actionInfo.value.canDelete ? (openBlock(), createElementBlock("div", _hoisted_18, [
                     createElementVNode("div", {
                       class: "menu-item",
-                      onClick: _cache[18] || (_cache[18] = ($event) => handleAction("deleteRowCurrent"))
+                      onClick: _cache[14] || (_cache[14] = ($event) => handleAction("deleteRowCurrent"))
                     }, [
-                      createElementVNode("div", _hoisted_25, [
+                      createElementVNode("div", _hoisted_19, [
                         createVNode(unref(GctIcon), { icon: "icon-shanchu1" })
                       ]),
-                      _cache[39] || (_cache[39] = createElementVNode("div", { class: "item-label" }, " 删除行 ", -1))
+                      _cache[29] || (_cache[29] = createElementVNode("div", { class: "item-label" }, " 删除行 ", -1))
                     ])
                   ])) : createCommentVNode("", true)
                 ])
               ]),
               default: withCtx(() => [
-                createElementVNode("div", _hoisted_26, [
+                createElementVNode("div", _hoisted_20, [
                   createVNode(unref(GctIcon), {
                     icon: "icon-gengduo1",
                     color: "#fff"
@@ -116780,7 +116698,7 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
             subTableType.value.isMaterialConsume && __props.isLastRow && actionInfo.value.canConfirm ? (openBlock(), createElementBlock("div", {
               key: 2,
               class: "confirm-btn",
-              onClick: _cache[19] || (_cache[19] = ($event) => handleMaterialConsumeAction("confirm"))
+              onClick: _cache[15] || (_cache[15] = ($event) => handleMaterialConsumeAction("confirm"))
             }, [
               createVNode(unref(GctIcon), {
                 icon: "icon-tijiao1",
@@ -116793,7 +116711,7 @@ const _sfc_main$2T = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2T, [["__scopeId", "data-v-527a94cf"]]);
+const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$2T, [["__scopeId", "data-v-ce0d6ea2"]]);
 const _sfc_main$2S = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -117383,21 +117301,28 @@ const TABLE_VALIDATION_RULES = [
     invalid: (region) => !region.widgetMeta.props.barcode_parsing_rules_id_,
     code: "barcode-parsing-rules-required",
     message: "请给库存盘点表设置条码解析规则"
-  },
-  {
-    hasTable: (tbl) => tbl.hasRepeating && tbl.repeating.some((r) => r.layoutType === "entrust-steril-batch-list-table"),
-    getRegions: (tbl) => tbl.repeating.filter((r) => r.layoutType === "entrust-steril-batch-list-table"),
-    invalid: (region) => !region.widgetMeta.props.barcode_parsing_rules_id_,
-    code: "barcode-parsing-rules-required",
-    message: "请给委托灭菌生产批次表设置条码解析规则"
-  },
-  {
-    hasTable: (tbl) => tbl.hasRepeating && tbl.repeating.some((r) => r.layoutType === "pretreatment-list-table"),
-    getRegions: (tbl) => tbl.repeating.filter((r) => r.layoutType === "pretreatment-list-table"),
-    invalid: (region) => !region.widgetMeta.props.barcode_parsing_rules_id_,
-    code: "barcode-parsing-rules-required",
-    message: "请给预处理表设置条码解析规则"
   }
+  // {
+  //   hasTable: (tbl: Wtbl) =>
+  //     tbl.hasRepeating &&
+  //     tbl.repeating.some((r) => r.layoutType === 'entrust-steril-batch-list-table'),
+  //   getRegions: (tbl: Wtbl) =>
+  //     tbl.repeating.filter((r) => r.layoutType === 'entrust-steril-batch-list-table'),
+  //   invalid: (region: Wtbl['repeating'][number]) =>
+  //     !(region.widgetMeta.props as WarehouseInventoryTableProps).barcode_parsing_rules_id_,
+  //   code: 'barcode-parsing-rules-required' as const,
+  //   message: '请给委托灭菌生产批次表设置条码解析规则',
+  // },
+  // {
+  //   hasTable: (tbl: Wtbl) =>
+  //     tbl.hasRepeating && tbl.repeating.some((r) => r.layoutType === 'pretreatment-list-table'),
+  //   getRegions: (tbl: Wtbl) =>
+  //     tbl.repeating.filter((r) => r.layoutType === 'pretreatment-list-table'),
+  //   invalid: (region: Wtbl['repeating'][number]) =>
+  //     !(region.widgetMeta.props as WarehouseInventoryTableProps).barcode_parsing_rules_id_,
+  //   code: 'barcode-parsing-rules-required' as const,
+  //   message: '请给预处理表设置条码解析规则',
+  // },
 ];
 function validateDocDesigner(doc) {
   if (!doc?.model) {
@@ -128549,8 +128474,8 @@ const _sfc_main$1N = /* @__PURE__ */ defineComponent({
     const showQuickFill = computed(() => !NO_QUICK_FILL_TYPES.includes(layoutType.value));
     const showBarcodeParsingRules = computed(
       () => [
-        "pretreatment-list-table",
-        "entrust-steril-batch-list-table",
+        // 'pretreatment-list-table',
+        // 'entrust-steril-batch-list-table',
         "warehouse-inventory-table"
       ].includes(layoutType.value)
     );
@@ -128655,7 +128580,7 @@ const _sfc_main$1N = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const RepeatingSubTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1N, [["__scopeId", "data-v-afa04296"]]);
+const RepeatingSubTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1N, [["__scopeId", "data-v-b48fc893"]]);
 function createTablePanelSchema(schemaKey, render2, title) {
   const layoutType = schemaKey.replace(/\.basic$/, "");
   return {
@@ -132376,7 +132301,7 @@ function isModelAssociationField(field) {
   const manifestType = resolveFieldManifestType(field);
   return MODEL_ASSOCIATION_TYPES.has(storageType) || MODEL_ASSOCIATION_TYPES.has(manifestType);
 }
-function matchAutofillTargetField(fromMeta, toMeta, options) {
+function matchAutofillTargetField(fromMeta, toMeta) {
   if (isModelAssociationField(fromMeta)) {
     return isModelAssociationField(toMeta) && fromMeta.bindInfo === toMeta.bindInfo;
   }
@@ -132388,9 +132313,6 @@ function matchAutofillTargetField(fromMeta, toMeta, options) {
       matched = false;
     }
   }
-  if (options?.isSubTable && !matched && isModelAssociationField(toMeta)) {
-    matched = true;
-  }
   return matched;
 }
 function encodeToFieldValue(meta) {
@@ -132461,8 +132383,7 @@ function filterToFieldTreeBySource(nodes, fromMeta) {
   return nodes.reduce((acc, node) => {
     const children = (node.children ?? []).filter((child) => {
       const field = child._targetMeta?.field;
-      const isSubTable = child._targetMeta?.subModel === 1;
-      return field ? matchAutofillTargetField(fromMeta, field, { isSubTable }) : false;
+      return field ? matchAutofillTargetField(fromMeta, field) : false;
     });
     if (children.length) {
       acc.push({ ...node, children });
@@ -132623,9 +132544,7 @@ function resolveParamFieldTree(doc) {
   const mainModelKey = doc.mainModelKey;
   const mainModel = doc.fieldModelQuery.getModel(mainModelKey);
   const mainFields = doc.fieldModelQuery.getFieldList(mainModelKey).filter(
-    (field) => field.createType !== "SYSTEM" && [FIELD_TYPE.TEXT, FIELD_TYPE.DOUBLE, FIELD_TYPE.INTEGER, FIELD_TYPE.DECIMAL].includes(
-      field.type
-    )
+    (field) => field.createType !== "SYSTEM" && [FIELD_TYPE.DOUBLE, FIELD_TYPE.INTEGER, FIELD_TYPE.DECIMAL].includes(field.type)
   );
   const nodes = [];
   if (mainFields.length) {
@@ -132648,9 +132567,7 @@ function resolveParamFieldTree(doc) {
     const modelKey = sub.bindInfo;
     const modelName = doc.fieldModelQuery.getModel(modelKey)?.modelName ?? sub.name;
     const fields2 = doc.fieldModelQuery.getFieldList(modelKey).filter(
-      (field) => field.createType !== "SYSTEM" && [FIELD_TYPE.TEXT, FIELD_TYPE.DOUBLE, FIELD_TYPE.INTEGER, FIELD_TYPE.DECIMAL].includes(
-        field.type
-      )
+      (field) => field.createType !== "SYSTEM" && [FIELD_TYPE.DOUBLE, FIELD_TYPE.INTEGER, FIELD_TYPE.DECIMAL].includes(field.type)
     );
     if (!fields2.length) continue;
     nodes.push({
@@ -135392,23 +135309,56 @@ const _sfc_main$V = /* @__PURE__ */ defineComponent({
       );
       return contexts.filter((ctx) => ctx.fields.length > 0);
     }
-    async function openFilterModal() {
+    async function loadCurrentSubTableContext(subFieldKey) {
       const mainModelKey = docInst.value?.mainModelKey ?? modelKey.value;
-      const isSubTableSource = Boolean(props.subFieldKey);
-      const toModelKey = isSubTableSource ? mainModelKey : modelKey.value;
-      const [refRes, mainFieldList, toModelInfo] = await Promise.all([
-        loadFieldList(refModelKey.value),
-        loadFieldList(toModelKey),
-        loadModelInfo(toModelKey)
+      const [subFieldList, subModelInfo, mainFieldList, mainModelInfo] = await Promise.all([
+        loadFieldList(modelKey.value),
+        loadModelInfo(modelKey.value),
+        loadFieldList(mainModelKey),
+        loadModelInfo(mainModelKey)
       ]);
-      const toSubTables = await loadSubTableContexts(mainFieldList || []);
+      const subFieldMeta = (mainFieldList || []).find((field) => field.key === subFieldKey);
+      return {
+        toModelInfo: mainModelInfo,
+        toSubTables: [
+          {
+            subFieldKey,
+            subFieldName: subFieldMeta?.name ?? subModelInfo?.modelName ?? subFieldKey,
+            subModelKey: modelKey.value,
+            subModelName: subModelInfo?.modelName ?? subFieldMeta?.name ?? subFieldKey,
+            fields: filterNonSystemFields(subFieldList || [])
+          }
+        ]
+      };
+    }
+    async function openFilterModal() {
+      const isSubTableSource = Boolean(props.subFieldKey);
+      const refRes = await loadFieldList(refModelKey.value);
+      let toFieldList = [];
+      let toSubTables = [];
+      let toModelInfo;
+      if (isSubTableSource) {
+        const subFieldKey = props.subFieldKey.replace(/^\$\./, "");
+        const currentSub = await loadCurrentSubTableContext(subFieldKey);
+        toModelInfo = currentSub.toModelInfo;
+        toSubTables = currentSub.toSubTables;
+        toFieldList = [];
+      } else {
+        const [mainFieldList, modelInfo] = await Promise.all([
+          loadFieldList(modelKey.value),
+          loadModelInfo(modelKey.value)
+        ]);
+        toModelInfo = modelInfo;
+        toFieldList = filterNonSystemFields(mainFieldList || []);
+        toSubTables = await loadSubTableContexts(mainFieldList || []);
+      }
       GctModal.open({
         title: "添加规则",
         body: AutofillRulesModel,
         bodyProps: {
           currentField: props.currentField,
           refModelFieldList: filterNonSystemFields(refRes || []),
-          toFieldList: filterNonSystemFields(mainFieldList || []),
+          toFieldList,
           toSubTables,
           toModelInfo,
           rules: _autofillRules.value
@@ -135449,7 +135399,7 @@ const _sfc_main$V = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const RefAutofillEditor = /* @__PURE__ */ _export_sfc(_sfc_main$V, [["__scopeId", "data-v-0f198b3d"]]);
+const RefAutofillEditor = /* @__PURE__ */ _export_sfc(_sfc_main$V, [["__scopeId", "data-v-449fd707"]]);
 const ONLINE_FORM_TMPL_MODULE_TYPE = "online_form_module";
 function buildFormTmplRefId(item) {
   if (!item.id) return "";

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

@@ -21,7 +21,7 @@ export interface UpdateRowOption {
  * - [需求数量、已消耗数量] 始终只读
  * - [有效期、唯一标识、自定义字段] 始终可填（不做控制）
  * - 选择的物料类型是[查看物料]时 [批次、上料数量、工序] 只读
- * - 单行校验通过后（包括暂存后再次编辑）[物料、批次、上料数量、工序] 只读
+ * - 单行校验通过后（包括暂存后再次编辑）[物料、批次、上料数量、工序、需求数量单位、数量单位、转换后数量、转换数量单位ID、单位转化公式] 只读
  */
 export declare class MCDataUtil {
     /**

package/dist/runtime/renderer/dialogs/field-hyperlink/open-field-hyperlink.d.ts

@@ -0,0 +1,24 @@
+import { Doc, WidgetMeta } from '../../../../core';
+import { BusinessSubTableType } from '../../../../domain/table/types';
+/** 填报只读超链接字段点击 → 宿主打开追溯弹框 */
+interface OpenFieldHyperlinkModalOptions {
+    /** 展示值（批次号等） */
+    materialNo?: string;
+    /** 字段 manifest 类型（如 material_no）；同类型可能对应不同业务弹框，需配合 fieldKey/tableType */
+    fieldType?: string;
+    /** enrich 写入的 _href_（可能为空，如 newHrefSuffix 静态链） */
+    href?: string | null;
+    /** 业务字段 key，如 production_container_id_ / material_container_no_ */
+    fieldKey?: string;
+    /** 业务表类型，如 pretreatment-list；主表字段为空 */
+    tableType?: BusinessSubTableType;
+    /** 子表字段 key（子模型挂载点） */
+    subFieldKey?: string;
+    /** 子表行号 */
+    rowIndex?: number;
+    /** 运行时 valuePath */
+    valuePath?: string;
+}
+export declare function resolveOpenFieldHyperlinkModalOptions(doc: Doc, widgetMeta: WidgetMeta, runtimeValuePath: string): OpenFieldHyperlinkModalOptions;
+export declare function openFieldHyperlinkModal(doc: Doc, widgetMeta: WidgetMeta, runtimeValuePath: string): Promise<void>;
+export {};

package/dist/sdk/doc-runtime/factories/runtime-json-builder.d.ts

@@ -1,4 +1,10 @@
 import { PaperSize } from '../../../core/constants';
+interface IPageSizeOptions {
+    width: number;
+    height: number;
+    direction?: 'portrait' | 'landscape';
+}
+export declare const updatePgSzElInfo: (pgSz: any, paperSize: PaperSize, options: IPageSizeOptions) => void;
 export declare class RuntimeJsonBuilder {
     private json;
     constructor(base: any);
@@ -6,13 +12,10 @@ export declare class RuntimeJsonBuilder {
     /**
      * 页面设置
      */
-    setPageSize(paperSize: PaperSize, options: {
-        width: number;
-        height: number;
-        direction?: 'portrait' | 'landscape';
-    }): this;
+    setPageSize(paperSize: PaperSize, options: IPageSizeOptions): this;
     /**
      * 构建
      */
     build(): any;
 }
+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-527a94cf] {
+.sub-table-action-container[data-v-ce0d6ea2] {
   position: absolute;
   z-index: 999;
 }
-.sub-table-action-bar[data-v-527a94cf],
-.sub-table-action-popper[data-v-527a94cf] {
+.sub-table-action-bar[data-v-ce0d6ea2],
+.sub-table-action-popper[data-v-ce0d6ea2] {
   pointer-events: auto;
   user-select: none;
 }
-.sub-table-action-bar[data-v-527a94cf] {
+.sub-table-action-bar[data-v-ce0d6ea2] {
   display: flex;
 }
-.sub-table-action-bar .more-btn[data-v-527a94cf],
-.sub-table-action-bar .confirm-btn[data-v-527a94cf] {
+.sub-table-action-bar .more-btn[data-v-ce0d6ea2],
+.sub-table-action-bar .confirm-btn[data-v-ce0d6ea2] {
   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-527a94cf] {
+.sub-table-action-bar .more-btn[data-v-ce0d6ea2] {
   width: 10px;
   background: #026ac8;
   border-radius: 0 4px 4px 0;
 }
-.sub-table-action-bar .confirm-btn[data-v-527a94cf] {
+.sub-table-action-bar .confirm-btn[data-v-ce0d6ea2] {
   margin-left: 4px;
   border-radius: 4px;
   border: 1px solid #4ec262;
 }
-.sub-table-action-popper[data-v-527a94cf] {
+.sub-table-action-popper[data-v-ce0d6ea2] {
   padding: 2px 8px;
 }
-.sub-table-action-popper .action-menu[data-v-527a94cf] {
+.sub-table-action-popper .action-menu[data-v-ce0d6ea2] {
   padding: 4px 0;
   width: 220px;
   user-select: none;
 }
-.sub-table-action-popper .action-menu + .action-menu[data-v-527a94cf] {
+.sub-table-action-popper .action-menu + .action-menu[data-v-ce0d6ea2] {
   margin-top: 4px;
   padding-top: 4px;
   border-top: 1px solid #efefef;
 }
-.sub-table-action-popper .action-menu .menu-title[data-v-527a94cf] {
+.sub-table-action-popper .action-menu .menu-title[data-v-ce0d6ea2] {
   color: #bcbcbc;
   margin: 4px 0;
 }
-.sub-table-action-popper .action-menu .menu-item[data-v-527a94cf] {
+.sub-table-action-popper .action-menu .menu-item[data-v-ce0d6ea2] {
   display: flex;
   align-items: center;
   padding: 8px 10px;
   border-radius: 4px;
 }
-.sub-table-action-popper .action-menu .menu-item[data-v-527a94cf]:hover {
+.sub-table-action-popper .action-menu .menu-item[data-v-ce0d6ea2]:hover {
   cursor: pointer;
   background-color: #f2f5f8;
 }
-.sub-table-action-popper .action-menu .menu-item .item-icon[data-v-527a94cf] {
+.sub-table-action-popper .action-menu .menu-item .item-icon[data-v-ce0d6ea2] {
   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-527a94cf] {
+.sub-table-action-popper .action-menu .menu-item .item-icon.scale-large[data-v-ce0d6ea2] {
   transform: scale(1.5);
 }
-.sub-table-action-popper .action-menu .menu-item .item-label[data-v-527a94cf] {
+.sub-table-action-popper .action-menu .menu-item .item-label[data-v-ce0d6ea2] {
   flex-grow: 1;
   margin-left: 8px;
 }
-.sub-table-action-popper .action-menu .menu-item .item-label.flex-between-center[data-v-527a94cf] {
+.sub-table-action-popper .action-menu .menu-item .item-label.flex-between-center[data-v-ce0d6ea2] {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -10675,22 +10675,22 @@ svg.portrait-icon[data-v-8bdb451e] {
 .sub-table-basic-info .delete-title[data-v-5a638f72]:hover {
   opacity: 0.7;
 }
-.panel-repeating-sub-table[data-v-afa04296] {
+.panel-repeating-sub-table[data-v-b48fc893] {
   position: relative;
 }
-.panel-repeating-sub-table .container[data-v-afa04296] {
+.panel-repeating-sub-table .container[data-v-b48fc893] {
   padding: 16px;
 }
-.panel-repeating-sub-table .form-custom-label[data-v-afa04296] {
+.panel-repeating-sub-table .form-custom-label[data-v-b48fc893] {
   display: inline-flex;
   align-items: center;
   gap: 4px;
 }
-.panel-repeating-sub-table .form-custom-label .icon[data-v-afa04296] {
+.panel-repeating-sub-table .form-custom-label .icon[data-v-b48fc893] {
   cursor: pointer;
   vertical-align: text-top;
 }
-.panel-repeating-sub-table .content[data-v-afa04296] {
+.panel-repeating-sub-table .content[data-v-b48fc893] {
   display: flex;
   align-items: center;
   justify-content: flex-end;
@@ -12246,14 +12246,14 @@ svg.portrait-icon[data-v-8bdb451e] {
   line-height: 20px;
   margin-top: 4px;
 }
-.form-item.default.ref-autofill-editor.is-content-hidden[data-v-0f198b3d] .form-item__label {
+.form-item.default.ref-autofill-editor.is-content-hidden[data-v-449fd707] .form-item__label {
   margin-bottom: 0 !important ;
 }
-.ref-autofill-editor__extra[data-v-0f198b3d] {
+.ref-autofill-editor__extra[data-v-449fd707] {
   display: inline-flex;
   align-items: center;
 }
-.data-filter-button[data-v-0f198b3d] {
+.data-filter-button[data-v-449fd707] {
   height: 32px;
   border: 1px solid #d9d9d9;
   color: #333;
@@ -12264,11 +12264,11 @@ svg.portrait-icon[data-v-8bdb451e] {
   cursor: pointer;
   box-sizing: border-box;
 }
-.data-filter-button[data-v-0f198b3d]:hover {
+.data-filter-button[data-v-449fd707]:hover {
   border-color: #026ac8;
   color: #026ac8;
 }
-.data-filter-button.primary[data-v-0f198b3d] {
+.data-filter-button.primary[data-v-449fd707] {
   border-color: #026ac8;
   background-color: #026ac8;
   color: #fff;

package/package.json

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