@gct-paas/word 0.1.24 → 0.1.25

package/dist/core/constants/index.d.ts

@@ -60,7 +60,6 @@ export declare const DEFAULT_PAGE_SIZE: {
 export declare const DEFAULT_PAGE_PADDING: [number, number, number, number];
 export declare const DEFAULT_CELL_PADDING: [number, number, number, number];
 export declare const DEFAULT_FONT_SIZE = 16;
-/** 回退链在不同 OS 上可能命中不同实体字体；跨平台一致布局请配合 Web 字体加载与 TextUtil.awaitDocumentFonts() */
 export declare const DEFAULT_FONT_FAMILY = "Roboto,RobotoDraft,Helvetica,Arial,sans-serif";
 export declare const DEFAULT_TEXT_COLOR = "black";
 export declare const ZERO_WIDTH_SPACE = "\u200B";

package/dist/core/layout/handlers/fields/FieldBaseHandler.d.ts

@@ -1,5 +1,6 @@
 import { WrText } from '../../../model/document';
 import { LayoutContext } from '../../LayoutContext';
+import { TextRun } from '../../../view/runs/TextRun';
 import { TextWidget } from '../../../view/runs/TextWidget';
 import { HandlerContext } from '../../types';
 type ValueType = string | number | undefined | null;
@@ -50,6 +51,7 @@ export declare class FieldBaseHandler {
         ctx: HandlerContext;
         fontSize: number;
         label: string;
+        layoutStyle?: Partial<TextRun>;
         extra?: Partial<TextWidget>;
     }): void;
     /**

package/dist/core/view/runs/TextRun.d.ts

@@ -97,6 +97,12 @@ export declare class TextRun extends LayoutNode implements ITextRun {
     descent: number;
     style?: TextStyle;
     constructor(options: TextRunOptions);
+    /**
+     * 构建与 Konva 渲染一致的度量参数。
+     * 须与段落 layout 使用的 TextRun 样式一致；若只传 fontSize 会按默认字体度量，
+     * 加粗/自定义字体后 advance 偏窄，易出现字母叠画。
+     */
+    static measurePayload(text: string, layoutStyle?: Partial<TextRun>): Konva.TextConfig;
     /**
      * 计算文字大小 度量
      * 优化版本

package/dist/core/view/utils/TextUtil.d.ts

@@ -18,14 +18,14 @@ export declare class TextUtil {
      * - kg·m²
      * 等符号贴太近的问题
      */
+    /**
+     * 中间点类：CoreText / DirectWrite 下 advance 常偏窄，仅靠较小 ratio 仍可能与字母叠画；
+     * 在 getVisualSpacing 内另有 em 下限（与平台无关）。
+     */
+    private static readonly MIDDLE_DOT_EXTRA_FLOOR_EM;
     private static readonly VISUAL_SPACING_MAP;
     private static fontMetricsCache;
     private static layoutSizeCache;
-    /**
-     * 等待文档字体就绪后再做 Canvas 度量，可减轻 Mac/Windows 因 Web 字体未加载导致的度量差异。
-     * 无 Font Loading API 时立即 resolve。
-     */
-    static awaitDocumentFonts(): Promise<void>;
     /**
      * 验证中文字符
      * @param char
@@ -56,32 +56,16 @@ export declare class TextUtil {
      * @param fontSize
      * @returns
      */
+    /** 数学/单位中间的点号（不含列表圆点 •） */
+    private static isMiddleDotSpacingChar;
     static getVisualSpacing(char: string, fontSize: number): number;
-    /** 与度量路径一致：lineHeight 固定为 1 的样式副本 */
-    private static measureBase;
     /**
-     * 字体级缓存键（不含 text），与 getFontMetrics 语义一致
-     */
-    private static measureStyleKey;
-    /**
-     * 布局缓存键：样式签名 + 编码后的文本
-     */
-    private static layoutCacheKey;
-    private static touchLru;
-    private static evictOldestIfFull;
-    /**
-     * 单次 Konva.Text 计算 width / height（advance width 含视觉间距）
-     */
-    private static computeLayoutSizeUncached;
-    /**
-     * 一次度量：布局宽高 + 字体 ascent/descent（双缓存均未命中时只创建一个 Konva.Text）
+     * 生成文本度量缓存键
+     * @param payload
+     * @param includeText
+     * @returns
      */
-    static measureTextComplete(payload: Konva.TextConfig): {
-        width: number;
-        height: number;
-        ascent: number;
-        descent: number;
-    };
+    private static getMeasureCacheKey;
     /**
      * 计算字体度量
      * ascent / descent

package/dist/index.es.js

@@ -26693,31 +26693,28 @@ class TextUtil {
    * - kg·m²
    * 等符号贴太近的问题
    */
+  /**
+   * 中间点类：CoreText / DirectWrite 下 advance 常偏窄，仅靠较小 ratio 仍可能与字母叠画；
+   * 在 getVisualSpacing 内另有 em 下限（与平台无关）。
+   */
+  static MIDDLE_DOT_EXTRA_FLOOR_EM = 0.24;
   static VISUAL_SPACING_MAP = {
     "·": 0.24,
     "•": 0.24,
-    "/": 0.16,
-    "／": 0.16,
-    "|": 0.12,
-    ":": 0.06,
-    "：": 0.08
+    "⋅": 0.24,
+    // ⋅ DOT OPERATOR（常见于 N⋅m 等）
+    "∙": 0.24,
+    // ∙ BULLET OPERATOR
+    "·": 0.24,
+    // · GREEK ANO TELEIA，易与 · 混用
+    "/": 0.2,
+    "／": 0.2,
+    "|": 0.16,
+    ":": 0.12,
+    "：": 0.12
   };
   static fontMetricsCache = /* @__PURE__ */ new Map();
   static layoutSizeCache = /* @__PURE__ */ new Map();
-  /**
-   * 等待文档字体就绪后再做 Canvas 度量，可减轻 Mac/Windows 因 Web 字体未加载导致的度量差异。
-   * 无 Font Loading API 时立即 resolve。
-   */
-  static awaitDocumentFonts() {
-    if (typeof document === "undefined") {
-      return Promise.resolve();
-    }
-    const fonts = document.fonts;
-    if (!fonts || typeof fonts.ready?.then !== "function") {
-      return Promise.resolve();
-    }
-    return fonts.ready;
-  }
   /**
    * 验证中文字符
    * @param char
@@ -26755,119 +26752,41 @@ class TextUtil {
    * @param fontSize
    * @returns
    */
+  /** 数学/单位中间的点号（不含列表圆点 •） */
+  static isMiddleDotSpacingChar(char) {
+    return char === "·" || // · MIDDLE DOT
+    char === "⋅" || // ⋅ DOT OPERATOR
+    char === "∙" || // ∙ BULLET OPERATOR
+    char === "·";
+  }
   static getVisualSpacing(char, fontSize2) {
     const ratio = this.VISUAL_SPACING_MAP[char];
     if (!ratio) {
       return 0;
     }
-    return fontSize2 * ratio;
-  }
-  /** 与度量路径一致：lineHeight 固定为 1 的样式副本 */
-  static measureBase(payload) {
-    return Object.assign({}, payload, { lineHeight: 1 });
-  }
-  /**
-   * 字体级缓存键（不含 text），与 getFontMetrics 语义一致
-   */
-  static measureStyleKey(payload) {
-    const c2 = this.measureBase(payload);
-    return [
-      c2.fontSize ?? "",
-      c2.fontFamily ?? "",
-      c2.fontStyle ?? "",
-      c2.fontVariant ?? "",
-      c2.lineHeight ?? "",
-      c2.padding ?? "",
-      c2.letterSpacing ?? ""
-    ].join("");
-  }
-  /**
-   * 布局缓存键：样式签名 + 编码后的文本
-   */
-  static layoutCacheKey(payload) {
-    const c2 = this.measureBase(payload);
-    return `${this.measureStyleKey(payload)}${encodeURIComponent(c2.text ?? "")}`;
-  }
-  static touchLru(map2, key, value) {
-    map2.delete(key);
-    map2.set(key, value);
-  }
-  static evictOldestIfFull(map2, limit) {
-    if (map2.size >= limit) {
-      const firstKey = map2.keys().next().value;
-      map2.delete(firstKey);
+    let space = fontSize2 * ratio;
+    if (this.isMiddleDotSpacingChar(char)) {
+      space = Math.max(space, fontSize2 * this.MIDDLE_DOT_EXTRA_FLOOR_EM);
     }
+    return space;
   }
   /**
-   * 单次 Konva.Text 计算 width / height（advance width 含视觉间距）
-   */
-  static computeLayoutSizeUncached(payload) {
-    const config = this.measureBase(payload);
-    const text = new Konva.Text(config);
-    const char = payload.text ?? "";
-    const fontSize2 = payload.fontSize ?? 0;
-    const width = this.isFullWidthChar(char) ? fontSize2 : text.width() + this.getVisualSpacing(char, fontSize2);
-    return {
-      width,
-      height: text.height()
-    };
-  }
-  /**
-   * 一次度量：布局宽高 + 字体 ascent/descent（双缓存均未命中时只创建一个 Konva.Text）
+   * 生成文本度量缓存键
+   * @param payload
+   * @param includeText
+   * @returns
    */
-  static measureTextComplete(payload) {
-    const layoutKey = this.layoutCacheKey(payload);
-    const fontKey = this.measureStyleKey(payload);
-    const layoutCached = this.layoutSizeCache.get(layoutKey);
-    const fontCached = this.fontMetricsCache.get(fontKey);
-    if (layoutCached && fontCached) {
-      this.touchLru(this.layoutSizeCache, layoutKey, layoutCached);
-      this.touchLru(this.fontMetricsCache, fontKey, fontCached);
-      return {
-        width: layoutCached.width,
-        height: layoutCached.height,
-        ascent: fontCached.ascent,
-        descent: fontCached.descent
-      };
-    }
-    if (layoutCached && !fontCached) {
-      this.touchLru(this.layoutSizeCache, layoutKey, layoutCached);
-      const { ascent: ascent2, descent: descent2 } = this.getFontMetrics(payload);
-      return {
-        width: layoutCached.width,
-        height: layoutCached.height,
-        ascent: ascent2,
-        descent: descent2
-      };
-    }
-    if (!layoutCached && fontCached) {
-      const layout2 = this.computeLayoutSizeUncached(payload);
-      this.evictOldestIfFull(this.layoutSizeCache, this.LAYOUT_SIZE_CACHE_LIMIT);
-      this.layoutSizeCache.set(layoutKey, layout2);
-      this.touchLru(this.fontMetricsCache, fontKey, fontCached);
-      return {
-        width: layout2.width,
-        height: layout2.height,
-        ascent: fontCached.ascent,
-        descent: fontCached.descent
-      };
-    }
-    const config = this.measureBase(payload);
-    const text = new Konva.Text(config);
-    const char = payload.text ?? "";
-    const fontSize2 = payload.fontSize ?? 0;
-    const width = this.isFullWidthChar(char) ? fontSize2 : text.width() + this.getVisualSpacing(char, fontSize2);
-    const height = text.height();
-    const sizeHg = text.measureSize("Hg");
-    const ascent = sizeHg.actualBoundingBoxAscent;
-    const descent = sizeHg.actualBoundingBoxDescent;
-    const layout = { width, height };
-    const font = { ascent, descent };
-    this.evictOldestIfFull(this.layoutSizeCache, this.LAYOUT_SIZE_CACHE_LIMIT);
-    this.evictOldestIfFull(this.fontMetricsCache, this.FONT_METRICS_CACHE_LIMIT);
-    this.layoutSizeCache.set(layoutKey, layout);
-    this.fontMetricsCache.set(fontKey, font);
-    return { width, height, ascent, descent };
+  static getMeasureCacheKey(payload, includeText = true) {
+    return JSON.stringify({
+      text: includeText ? payload.text ?? "" : "",
+      fontSize: payload.fontSize ?? "",
+      fontFamily: payload.fontFamily ?? "",
+      fontStyle: payload.fontStyle ?? "",
+      fontVariant: payload.fontVariant ?? "",
+      lineHeight: payload.lineHeight ?? "",
+      padding: payload.padding ?? "",
+      letterSpacing: payload.letterSpacing ?? ""
+    });
   }
   /**
    * 计算字体度量
@@ -26882,10 +26801,11 @@ class TextUtil {
       text: targetText,
       lineHeight: 1
     });
-    const cacheKey = this.measureStyleKey(config);
+    const cacheKey = this.getMeasureCacheKey(config, false);
     if (this.fontMetricsCache.has(cacheKey)) {
       const result2 = this.fontMetricsCache.get(cacheKey);
-      this.touchLru(this.fontMetricsCache, cacheKey, result2);
+      this.fontMetricsCache.delete(cacheKey);
+      this.fontMetricsCache.set(cacheKey, result2);
       return result2;
     }
     const text = new Konva.Text(config);
@@ -26894,7 +26814,10 @@ class TextUtil {
       ascent: size.actualBoundingBoxAscent,
       descent: size.actualBoundingBoxDescent
     };
-    this.evictOldestIfFull(this.fontMetricsCache, this.FONT_METRICS_CACHE_LIMIT);
+    if (this.fontMetricsCache.size >= this.FONT_METRICS_CACHE_LIMIT) {
+      const firstKey = this.fontMetricsCache.keys().next().value;
+      this.fontMetricsCache.delete(firstKey);
+    }
     this.fontMetricsCache.set(cacheKey, result);
     return result;
   }
@@ -26923,7 +26846,13 @@ class TextUtil {
     if (this.isFullWidthChar(char)) {
       return fontSize2;
     }
-    return this.getLayoutSize(payload).width;
+    const config = Object.assign({}, payload, {
+      lineHeight: 1
+    });
+    const text = new Konva.Text(config);
+    const glyphWidth = text.width();
+    const visualSpacing = this.getVisualSpacing(char, fontSize2);
+    return glyphWidth + visualSpacing;
   }
   /**
    * 计算单字符布局大小
@@ -26935,16 +26864,27 @@ class TextUtil {
    * @returns
    */
   static getLayoutSize(payload) {
-    const cacheKey = this.layoutCacheKey(payload);
+    const config = Object.assign({}, payload, {
+      lineHeight: 1
+    });
+    const cacheKey = this.getMeasureCacheKey(config);
     if (this.layoutSizeCache.has(cacheKey)) {
       const result2 = this.layoutSizeCache.get(cacheKey);
-      this.touchLru(this.layoutSizeCache, cacheKey, result2);
-      return { width: result2.width, height: result2.height };
+      this.layoutSizeCache.delete(cacheKey);
+      this.layoutSizeCache.set(cacheKey, result2);
+      return result2;
+    }
+    const text = new Konva.Text(config);
+    const result = {
+      width: this.getAdvanceWidth(payload),
+      height: text.height()
+    };
+    if (this.layoutSizeCache.size >= this.LAYOUT_SIZE_CACHE_LIMIT) {
+      const firstKey = this.layoutSizeCache.keys().next().value;
+      this.layoutSizeCache.delete(firstKey);
     }
-    const result = this.computeLayoutSizeUncached(payload);
-    this.evictOldestIfFull(this.layoutSizeCache, this.LAYOUT_SIZE_CACHE_LIMIT);
     this.layoutSizeCache.set(cacheKey, result);
-    return { width: result.width, height: result.height };
+    return result;
   }
   /**
    * 清除度量缓存
@@ -27017,6 +26957,37 @@ class TextRun extends LayoutNode {
       Object.assign(this, options.style);
     }
   }
+  /**
+   * 构建与 Konva 渲染一致的度量参数。
+   * 须与段落 layout 使用的 TextRun 样式一致；若只传 fontSize 会按默认字体度量，
+   * 加粗/自定义字体后 advance 偏窄，易出现字母叠画。
+   */
+  static measurePayload(text, layoutStyle) {
+    const ls = layoutStyle ?? {};
+    const fontSize2 = ls.fontSize ?? DEFAULT_FONT_SIZE;
+    const fontFamily = ls.fontFamily ?? DEFAULT_FONT_FAMILY;
+    let fontStyle;
+    if (ls.bold && ls.italic) {
+      fontStyle = "bold italic";
+    } else if (ls.bold) {
+      fontStyle = "bold";
+    } else if (ls.italic) {
+      fontStyle = "italic";
+    }
+    const payload = {
+      text,
+      fontSize: fontSize2,
+      fontFamily,
+      lineHeight: 1
+    };
+    if (fontStyle) {
+      payload.fontStyle = fontStyle;
+    }
+    if (ls.letterSpacing !== void 0 && ls.letterSpacing !== null) {
+      payload.letterSpacing = ls.letterSpacing;
+    }
+    return payload;
+  }
   /**
    * 计算文字大小 度量
    * 优化版本
@@ -27024,7 +26995,14 @@ class TextRun extends LayoutNode {
    * @returns
    */
   static measureText(payload) {
-    return TextUtil.measureTextComplete(payload);
+    const { width, height } = TextUtil.getLayoutSize(payload);
+    const { ascent, descent } = TextUtil.getFontMetrics(payload);
+    return {
+      width,
+      height,
+      ascent,
+      descent
+    };
   }
   /**
    * 计算文字大小 度量
@@ -27048,10 +27026,7 @@ class TextRun extends LayoutNode {
   }
   static createEmptyRun(doc) {
     const fontSize2 = DEFAULT_FONT_SIZE;
-    const { height, ascent, descent } = TextRun.measureText({
-      text: "0",
-      fontSize: fontSize2
-    });
+    const { height, ascent, descent } = TextRun.measureText(TextRun.measurePayload("0", { fontSize: fontSize2 }));
     const run = new TextRun({
       doc,
       width: 6,
@@ -40374,14 +40349,11 @@ class TextHandler {
     let text = wr.text;
     const textStyle = TextStyleResolver.resolve(wr.rPr, context.doc.model?.styles);
     const layoutStyle = TextRun.textStyle2LayoutStyle(textStyle);
-    const fontSize2 = layoutStyle.fontSize ?? DEFAULT_FONT_SIZE;
     const chars = text.split("");
     let doc = context.doc;
     let charMetrics = [];
     let remainingWidth = context.getParagraphRemainingSize();
-    const { ascent, descent } = TextUtil.getFontMetrics({
-      fontSize: fontSize2
-    });
+    const { ascent, descent } = TextUtil.getFontMetrics(TextRun.measurePayload("M", layoutStyle));
     const complete = () => {
       if (!charMetrics.length) return;
       const width = charMetrics.reduce((total, item) => total + item.width, 0);
@@ -40408,10 +40380,7 @@ class TextHandler {
       context.addRun(run);
     };
     chars.forEach((char, charIndex) => {
-      const { width, height } = TextRun.measureText({
-        text: char,
-        fontSize: fontSize2
-      });
+      const { width, height } = TextRun.measureText(TextRun.measurePayload(char, layoutStyle));
       if (width <= remainingWidth) {
         charMetrics.push({
           char,
@@ -40445,14 +40414,10 @@ class TextHandler {
     let text = wr.text;
     const textStyle = TextStyleResolver.resolve(wr.rPr, context.doc.model?.styles);
     const layoutStyle = TextRun.textStyle2LayoutStyle(textStyle);
-    const fontSize2 = layoutStyle.fontSize ?? DEFAULT_FONT_SIZE;
     const chars = text.split("");
     let doc = context.doc;
     chars.forEach((char, charIndex) => {
-      const { width, height, ascent, descent } = TextRun.measureText({
-        text: char,
-        fontSize: fontSize2
-      });
+      const { width, height, ascent, descent } = TextRun.measureText(TextRun.measurePayload(char, layoutStyle));
       const run = new TextRun({
         doc,
         width,
@@ -40656,10 +40621,7 @@ class FieldBaseHandler {
       position: "left"
     });
     chars.forEach((char, charIndex) => {
-      const { width, height, ascent, descent } = TextRun.measureText({
-        text: char,
-        fontSize: fontSize2
-      });
+      const { width, height, ascent, descent } = TextRun.measureText(TextRun.measurePayload(char, layoutStyle));
       const run = new TextWidget({
         doc,
         width,
@@ -40693,6 +40655,9 @@ class FieldBaseHandler {
   static layoutNoValueLabel(ctx) {
     const { context, wr } = ctx;
     let doc = context.doc;
+    const textStyle = TextStyleResolver.resolve(wr.rPr, context.doc.model?.styles);
+    const layoutStyle = TextRun.textStyle2LayoutStyle(textStyle);
+    const measureStyle = { ...layoutStyle, fontSize: 16 };
     const { label, type: type4 } = this.getNoValueLabel(ctx);
     const chars = label.split("");
     this.addFieldMarker({
@@ -40701,10 +40666,7 @@ class FieldBaseHandler {
       position: "left"
     });
     chars.forEach((char, charIndex) => {
-      const { width, height, ascent, descent } = TextRun.measureText({
-        text: char,
-        fontSize: 16
-      });
+      const { width, height, ascent, descent } = TextRun.measureText(TextRun.measurePayload(char, measureStyle));
       const run = new TextWidget({
         doc,
         width,
@@ -40773,13 +40735,12 @@ class FieldBaseHandler {
       ctx: { context, wr },
       fontSize: fontSize2,
       extra,
-      label
+      label,
+      layoutStyle
     } = payload;
+    const style = { ...layoutStyle, fontSize: fontSize2 };
     label.split("").forEach((char, charIndex) => {
-      const { width, height, ascent, descent } = TextRun.measureText({
-        text: char,
-        fontSize: fontSize2
-      });
+      const { width, height, ascent, descent } = TextRun.measureText(TextRun.measurePayload(char, style));
       const run = new TextWidget({
         doc: context.doc,
         width,
@@ -40848,16 +40809,16 @@ class FieldBaseHandler {
     if (context.doc.mode === DocModeTypeConst.Print) {
       return;
     }
+    const textStyle = TextStyleResolver.resolve(wr.rPr, context.doc.model?.styles);
+    const layoutStyle = TextRun.textStyle2LayoutStyle(textStyle);
+    const measureStyle = { ...layoutStyle, fontSize: fontSize2 };
     const label = position === "left" ? "[" : "]";
     const options = position === "left" ? {
       widgetFieldLeftMarker: true
     } : {
       widgetFieldRightMarker: true
     };
-    const { width, height, ascent, descent } = TextRun.measureText({
-      text: label,
-      fontSize: fontSize2
-    });
+    const { width, height, ascent, descent } = TextRun.measureText(TextRun.measurePayload(label, measureStyle));
     const _width = position === "left" ? width + 2 : width + 3;
     const run = new TextWidget({
       doc: context.doc,
@@ -40924,10 +40885,9 @@ class OptionHandler extends FieldBaseHandler {
     });
   }
   static layoutOptionItem(context, wr, option, optionIndex, layoutStyle) {
-    const { width, height, ascent, descent } = TextRun.measureText({
-      text: "0",
-      fontSize: 16
-    });
+    const { width, height, ascent, descent } = TextRun.measureText(
+      TextRun.measurePayload("0", { ...layoutStyle, fontSize: 16 })
+    );
     const fontSize2 = layoutStyle.fontSize ?? DEFAULT_FONT_SIZE;
     const { iconLabelSpace, labelPosition, controlEnumSpace } = wr.widgetMeta?.props;
     const isVertical = this.isVerticalLayout(wr);
@@ -40948,6 +40908,7 @@ class OptionHandler extends FieldBaseHandler {
             ctx: { context, wr },
             fontSize: fontSize2,
             label: option.label,
+            layoutStyle,
             extra: {
               widgetOption
             }
@@ -41059,10 +41020,12 @@ class SignatureHandler extends FieldBaseHandler {
       const format2 = signatureType === SignatureTypeConst.SIGNATURE_DATETIME ? "YYYY-MM-DD HH:mm" : "YYYY-MM-DD";
       const timeStr = dayjs(time).format(format2);
       let position = signDisplayStyle === SignDisplayTypeConst.VERTICAL ? "bottom" : "right";
-      const { width: textWidth, height: textHeight } = TextRun.measureText({
-        text: timeStr,
-        fontSize: DEFAULT_FONT_SIZE
-      });
+      const textStyle = TextStyleResolver.resolve(wr.rPr, ctx.context.doc.model?.styles);
+      const layoutStyle = TextRun.textStyle2LayoutStyle(textStyle);
+      const fontSize2 = layoutStyle.fontSize ?? DEFAULT_FONT_SIZE;
+      const { width: textWidth, height: textHeight } = TextRun.measureText(
+        TextRun.measurePayload(timeStr, { ...layoutStyle, fontSize: fontSize2 })
+      );
       return {
         render: render2,
         rectWidth: width + (position === "right" ? textWidth : 0),
@@ -41070,7 +41033,7 @@ class SignatureHandler extends FieldBaseHandler {
         decorations: [
           {
             text: timeStr,
-            fontSize: DEFAULT_FONT_SIZE,
+            fontSize: fontSize2,
             x: position === "right" ? width : 0,
             y: position === "right" ? (height - textHeight) / 2 : height,
             position,
@@ -41154,10 +41117,7 @@ class InputHandler extends FieldBaseHandler {
       position: "left"
     });
     chars.forEach((char, charIndex) => {
-      const { width, height, ascent, descent } = TextRun.measureText({
-        text: char,
-        fontSize: fontSize2
-      });
+      const { width, height, ascent, descent } = TextRun.measureText(TextRun.measurePayload(char, layoutStyle));
       const run = new TextWidget({
         doc,
         width,
@@ -41225,10 +41185,9 @@ class AttachmentHandler extends FieldBaseHandler {
     const { ctx, item, itemIndex, layoutStyle, itemIsLast } = payload;
     const name = getFileName(item);
     const fontSize2 = layoutStyle.fontSize ?? DEFAULT_FONT_SIZE;
-    const { width, height, ascent, descent } = TextRun.measureText({
-      text: "0",
-      fontSize: 16
-    });
+    const { width, height, ascent, descent } = TextRun.measureText(
+      TextRun.measurePayload("0", { ...layoutStyle, fontSize: 16 })
+    );
     const widgetFileItem = {
       index: itemIndex,
       value: item
@@ -41251,6 +41210,7 @@ class AttachmentHandler extends FieldBaseHandler {
       ctx,
       fontSize: fontSize2,
       label: name,
+      layoutStyle,
       extra: {
         style: layoutStyle,
         widgetFileItem
@@ -41345,10 +41305,9 @@ class SerialNumberHandler extends WidgetBaseHandler {
     const layoutStyle = this.getLayoutStyle();
     const label = (context.cell?.subRenderer?.dataIndex ?? 0) + 1 + "";
     label.split("").forEach((char, charIndex) => {
-      const { width, height, ascent, descent } = TextRun.measureText({
-        text: char,
-        fontSize: layoutStyle.fontSize
-      });
+      const { width, height, ascent, descent } = TextRun.measureText(
+        TextRun.measurePayload(char, layoutStyle)
+      );
       const run = new TextWidget({
         doc: context.doc,
         width,
@@ -41384,10 +41343,9 @@ class DefaultHandler extends WidgetBaseHandler {
     const layoutStyle = this.getLayoutStyle();
     const label = wr.pageWidgetMeta?.type ?? "default";
     label.split("").forEach((char, charIndex) => {
-      const { width, height, ascent, descent } = TextRun.measureText({
-        text: char,
-        fontSize: layoutStyle.fontSize
-      });
+      const { width, height, ascent, descent } = TextRun.measureText(
+        TextRun.measurePayload(char, layoutStyle)
+      );
       const run = new TextWidget({
         doc: context.doc,
         width,
@@ -41446,11 +41404,11 @@ class BarcodeHandler extends WidgetBaseHandler {
     const render2 = showValue;
     if (render2) {
       let codeLabel = label ?? "";
-      let fontSize2 = DEFAULT_FONT_SIZE;
-      const { width: textWidth, height: textHeight } = TextRun.measureText({
-        text: codeLabel,
-        fontSize: fontSize2
-      });
+      const layoutStyle = this.getLayoutStyle();
+      const fontSize2 = layoutStyle.fontSize ?? DEFAULT_FONT_SIZE;
+      const { width: textWidth, height: textHeight } = TextRun.measureText(
+        TextRun.measurePayload(codeLabel, layoutStyle)
+      );
       return {
         render: render2,
         rectWidth: width,
@@ -41573,10 +41531,9 @@ class PaginationHandler extends WidgetBaseHandler {
       total: context.doc.pages.length
     });
     label.split("").forEach((char, charIndex) => {
-      const { width, height, ascent, descent } = TextRun.measureText({
-        text: char,
-        fontSize: layoutStyle.fontSize
-      });
+      const { width, height, ascent, descent } = TextRun.measureText(
+        TextRun.measurePayload(char, layoutStyle)
+      );
       const run = new TextWidget({
         doc: context.doc,
         width,
@@ -51332,8 +51289,6 @@ async function initializeDocumentEngine(props, payload, result) {
       initDocModelJson: JSON.stringify(docModel.toXmlJson())
     }
   };
-  console.log("rawData", rawData);
-  await TextUtil.awaitDocumentFonts();
   const doc = new Doc({
     model: docModel,
     mode: fillModeType,
@@ -51348,6 +51303,7 @@ async function initializeDocumentEngine(props, payload, result) {
     ...defaultDataMap,
     ...dataInitMap
   });
+  doc.docRuntimeMeta.handleInfo.initRawDataSnapshot = cloneDeep(doc.dataManager.getRawData());
   const docInfo = snapshotDocInfo(doc);
   return {
     doc,
@@ -51407,6 +51363,7 @@ function useDocumentFactory(props, payload) {
       docInfo.value = snapshotDocInfo(ins);
     };
     docInfo.value = initialized.docInfo;
+    payload.onDocumentLoadSuccess?.(result);
   }
   const hasData = computed(() => docIns.value !== null);
   function clear() {
@@ -57003,7 +56960,7 @@ function useDocOperations(docRef) {
       focus: ids.length ? `root::${firstPage.id}` : null
     });
   }
-  function getUnsavedChanges() {
+  function getUnsavedChanges(options) {
     const currentCheckpoint = buildSaveCheckpoint();
     if (!currentCheckpoint) {
       return { dirty: false };
@@ -57012,10 +56969,26 @@ function useDocOperations(docRef) {
     if (!isEqual(currentCheckpoint.currentModel, currentCheckpoint.interfaceModel)) {
       changedScopes.push("model");
     }
+    if (options?.includeRawData) {
+      const doc = getDoc();
+      const baselineRaw = doc?.docRuntimeMeta.handleInfo.initRawDataSnapshot;
+      if (baselineRaw !== void 0 && doc) {
+        const currentRaw = doc.dataManager.getRawData();
+        if (!isEqual(currentRaw, baselineRaw)) {
+          changedScopes.push("rawData");
+        }
+      }
+    }
     return {
       dirty: changedScopes.length > 0
     };
   }
+  function markAsSaved() {
+    const doc = getDoc();
+    if (!doc) return;
+    doc.docRuntimeMeta.handleInfo.initDocModelJson = JSON.stringify(exportModel());
+    doc.docRuntimeMeta.handleInfo.initRawDataSnapshot = cloneDeep(doc.dataManager.getRawData());
+  }
   return {
     validate,
     exportModel,
@@ -57023,7 +56996,8 @@ function useDocOperations(docRef) {
     enterBaseline,
     computeBaselineChanges,
     setAnnotation,
-    getUnsavedChanges
+    getUnsavedChanges,
+    markAsSaved
   };
 }
 function useDocController(factory2, ops) {
@@ -57099,8 +57073,11 @@ function useDocController(factory2, ops) {
         computeBaselineChanges(ctx) {
           return ops.computeBaselineChanges(ctx);
         },
-        getUnsavedChanges() {
-          return ops.getUnsavedChanges();
+        getUnsavedChanges(options) {
+          return ops.getUnsavedChanges(options);
+        },
+        markAsSaved() {
+          ops.markAsSaved();
         },
         setAnnotation(ids, list) {
           ops.setAnnotation(ids, list);

package/dist/sdk/doc-runtime/composables/useDocOperations.d.ts

@@ -10,6 +10,11 @@ export interface DocUnsavedChanges {
     /** 是否存在未保存改动 */
     dirty: boolean;
 }
+/** getUnsavedChanges 可选参数 */
+export interface DocGetUnsavedChangesOptions {
+    /** 为 true 时除文档模型外，同时与初始化时的 rawData 快照比对 */
+    includeRawData?: boolean;
+}
 export interface DocOperations {
     /** 校验所有字段，返回错误映射或 null（通过） */
     validate(): Promise<Record<string, string[]> | null>;
@@ -27,7 +32,9 @@ export interface DocOperations {
     /** 设置变更批注 */
     setAnnotation(ids: string[], list: any[]): void;
     /** 获取当前未保存改动状态，供外部在退出前做拦截 */
-    getUnsavedChanges(): DocUnsavedChanges;
+    getUnsavedChanges(options?: DocGetUnsavedChangesOptions): DocUnsavedChanges;
+    /** 标记当前文档为已保存 */
+    markAsSaved(): void;
 }
 /**
  * 文档操作组合式函数

package/dist/sdk/doc-runtime/factories/useDocumentFactory.d.ts

@@ -43,6 +43,11 @@ export interface IDocPayload extends IDocTemplatePayload, IDocInstancePayload {
     /** 是否是预览模式 */
     isPreview: boolean;
     ctx: DesignSuiteContext;
+    /**
+     * 文档接口请求成功且引擎挂载完成后的回调（每轮成功加载触发一次）。
+     * 不会在 requestId 为空、请求被丢弃、或初始化抛错时调用。
+     */
+    onDocumentLoadSuccess?: (result: Execute) => void;
 }
 /** 文档加载工厂 — 只负责响应式加载与生命周期，不包含业务操作 */
 export interface DocumentFactory {

package/dist/sdk/engine/index.d.ts

@@ -4,7 +4,8 @@
  */
 export { DocModeTypeConst, PageSizeEnumConst, BuiltinComponentTypeConst } from '../../core';
 export type { DocModeType, CompleteComponentType, BuiltinComponentType } from '../../core';
-export type { DocController, DocQueryAPI, WordRuntime, DocInfo, DocRuntimeMeta, DocRuntimeMetaHandleInfo, DocUnsavedChanges, UseWordProps, UseWordOptions, FieldModelQuery, } from '../types';
+export type { DocController, DocQueryAPI, WordRuntime, DocInfo, DocRuntimeMeta, DocRuntimeMetaHandleInfo, DocUnsavedChanges, DocGetUnsavedChangesOptions, UseWordProps, UseWordOptions, FieldModelQuery, } from '../types';
+export type { Execute } from '../doc-runtime/factories/useDocumentFactory';
 export { useWord } from '../doc-runtime/useWord';
 export { useDocSuite } from '../doc-runtime/composables/useDocSuite';
 export { useDocumentFactory } from '../doc-runtime/factories/useDocumentFactory';

package/dist/sdk/types/index.d.ts

@@ -2,11 +2,12 @@ import { ComputedRef, Ref, ShallowRef } from 'vue';
 import { DocModeType } from '../../core/constants';
 import { DocModel } from '../../core/model';
 import { Page } from '../../core';
-import { DocBaselineContext, DocUnsavedChanges, DocOperations } from '../doc-runtime/composables/useDocOperations';
+import { DocBaselineContext, DocUnsavedChanges, DocOperations, DocGetUnsavedChangesOptions } from '../doc-runtime/composables/useDocOperations';
 import { OnlineFormInstanceResponse, OnlineFormTmplResponse } from '@gct-paas/api/apaas';
 import { FieldChangeItem } from '../../runtime/interface/change-diff';
 import { FormTmplConfigController } from '../../suites/edhr/panel-schema/data-load/hooks/form-tmpl-config';
-export type { DocUnsavedChanges } from '../doc-runtime/composables/useDocOperations';
+import { Execute } from '../doc-runtime/factories/useDocumentFactory';
+export type { DocUnsavedChanges, DocGetUnsavedChangesOptions } from '../doc-runtime/composables/useDocOperations';
 export type { FieldModelQuery } from './field-model-query';
 /** 字段权限信息 */
 export interface FieldPermissionInfo {
@@ -78,8 +79,10 @@ export interface DocControllerMethods extends DocOperations {
     enterBaseline(uniqueId: string): DocBaselineContext | null;
     /** 与基线做差异计算，返回字段变更列表 */
     computeBaselineChanges(ctx: DocBaselineContext): Promise<FieldChangeItem[]>;
-    /** 获取当前未保存改动状态，适合外部在退出前做校验 */
-    getUnsavedChanges(): DocUnsavedChanges;
+    /** 获取当前未保存改动状态，适合外部在退出前做校验；特定场景可传入 includeRawData 同时比对填报数据 */
+    getUnsavedChanges(options?: DocGetUnsavedChangesOptions): DocUnsavedChanges;
+    /** 标记当前文档为已保存 */
+    markAsSaved(): void;
     /** 向指定字段/组件设置批注信息 */
     setAnnotation(ids: string[], list: any[]): void;
 }
@@ -123,6 +126,8 @@ export interface DocRuntimeMetaHandleInfo {
     bpmnFieldAuthMap?: Record<string, any>;
     /** 初始化的doc model 用来比对用 */
     initDocModelJson: string;
+    /** 初始化后的填报原始数据快照，供 getUnsavedChanges({ includeRawData: true }) 比对 */
+    initRawDataSnapshot?: Record<string, any>;
 }
 /** 文档运行时元信息（接口返回字段 + 业务拼接字段） */
 export interface DocRuntimeMeta extends OnlineFormInstanceResponse, OnlineFormTmplResponse {
@@ -178,6 +183,11 @@ export interface UseWordOptions {
     isDetailPage?: boolean | (() => boolean);
     /** 指定渲染模式 */
     renderModeType?: DocModeType;
+    /**
+     * 文档接口请求成功且引擎挂载完成后的回调（每轮成功加载触发一次）。
+     * 不会在 requestId 为空、请求被丢弃、或初始化抛错时调用。
+     */
+    onDocumentLoadSuccess?: (result: Execute) => void;
     /** 扩展字段 - 兼容其他未明确定义的负载参数 */
     [key: string]: any;
 }

package/package.json

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