@gct-paas/word 0.1.63-beta.7 → 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/index.es.js

@@ -84440,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(
       {
@@ -84449,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;
   }
@@ -84463,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) {
@@ -89396,24 +89396,6 @@ const profile$1 = {
   }
 };
 const PRODUCTION_CONTAINER_FIELD_KEY = "production_container_id_";
-async function resolveHrefByLabel(path, doc) {
-  const materialNo = doc.dataManager.get(getLabelPath(path));
-  if (!isPresent(materialNo)) return null;
-  try {
-    const bool = await api.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey(
-      {
-        bsKey: "biz_judge_jump",
-        modelKey: "gct_edhr_instance",
-        modelCategory: "entity"
-      },
-      { materialNo },
-      {}
-    );
-    return bool ? String(materialNo) : null;
-  } catch {
-    return null;
-  }
-}
 function createProductionContainerHyperlinkEnricher(doc, tableType) {
   const subFieldKeys = new Set(
     TableRuntimeContext.collectAll(doc).filter((ctx) => ctx.profile.type === tableType).map((ctx) => ctx.subFieldKey)
@@ -89436,9 +89418,11 @@ function createProductionContainerHyperlinkEnricher(doc, tableType) {
       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) => resolveHrefByLabel(path, currentDoc)
+      resolveCompanion: (path, _value, currentDoc) => resolveHyperlinkHrefByMaterialNo(currentDoc.dataManager.get(getLabelPath(path)))
     }
   );
 }
@@ -91760,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,
@@ -91788,6 +91773,7 @@ class WsecPr extends ModelNode {
     const titlePg = pickElement(json, "w:titlePg");
     return new WsecPr({
       attrs: json["@attrs"],
+      paperSize,
       pageSize,
       margins,
       columns: columns2,
@@ -102466,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;
@@ -109696,19 +109682,25 @@ class SingleTemplateStrategy extends DocRequestStrategy {
       requestInfo.runtimeJson = JSON.stringify(json);
     } else {
       const jsonObj = JSON.parse(requestInfo.runtimeJson);
-      const pgSzEl = jsonObj.document.elements[0].elements.find((el) => el.name === "w:sectPr")?.elements.find((el) => el.name === "w:pgSz");
-      if (pgSzEl) {
-        updatePgSzElInfo(
-          pgSzEl,
-          requestInfo.paperSize || PaperSizeConst.A4,
-          {
-            width: requestInfo.width,
-            height: requestInfo.height,
-            direction: requestInfo.direction
-          }
-        );
+      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);
       }
-      requestInfo.runtimeJson = JSON.stringify(jsonObj);
     }
     return {
       id,
@@ -114107,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: {
@@ -114245,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);
@@ -132542,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({

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/package.json

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