@gct-paas/word 0.1.23 → 0.1.24

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

@@ -60,6 +60,7 @@ 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/view/utils/TextUtil.d.ts

@@ -2,7 +2,7 @@ import { default as Konva } from 'konva';
 export declare class TextUtil {
     /** 字体度量缓存限制 */
     private static readonly FONT_METRICS_CACHE_LIMIT;
-    /** 布局大小缓存限制 */
+    /** 布局大小缓存限制（按「样式 + 单段文本」键，长文档可提高命中率） */
     private static readonly LAYOUT_SIZE_CACHE_LIMIT;
     /** 东亚常见全宽字符块 */
     private static readonly EAST_ASIAN_FULL_WIDTH_REGEX;
@@ -21,6 +21,11 @@ export declare class TextUtil {
     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
@@ -52,13 +57,31 @@ export declare class TextUtil {
      * @returns
      */
     static getVisualSpacing(char: string, fontSize: number): number;
+    /** 与度量路径一致：lineHeight 固定为 1 的样式副本 */
+    private static measureBase;
     /**
-     * 生成文本度量缓存键
-     * @param payload
-     * @param includeText
-     * @returns
+     * 字体级缓存键（不含 text），与 getFontMetrics 语义一致
+     */
+    private static measureStyleKey;
+    /**
+     * 布局缓存键：样式签名 + 编码后的文本
+     */
+    private static layoutCacheKey;
+    private static touchLru;
+    private static evictOldestIfFull;
+    /**
+     * 单次 Konva.Text 计算 width / height（advance width 含视觉间距）
      */
-    private static getMeasureCacheKey;
+    private static computeLayoutSizeUncached;
+    /**
+     * 一次度量：布局宽高 + 字体 ascent/descent（双缓存均未命中时只创建一个 Konva.Text）
+     */
+    static measureTextComplete(payload: Konva.TextConfig): {
+        width: number;
+        height: number;
+        ascent: number;
+        descent: number;
+    };
     /**
      * 计算字体度量
      * ascent / descent

package/dist/index.es.js

@@ -26676,9 +26676,9 @@ const mainData2WordData = (data) => {
 };
 class TextUtil {
   /** 字体度量缓存限制 */
-  static FONT_METRICS_CACHE_LIMIT = 50;
-  /** 布局大小缓存限制 */
-  static LAYOUT_SIZE_CACHE_LIMIT = 100;
+  static FONT_METRICS_CACHE_LIMIT = 80;
+  /** 布局大小缓存限制（按「样式 + 单段文本」键，长文档可提高命中率） */
+  static LAYOUT_SIZE_CACHE_LIMIT = 500;
   /** 东亚常见全宽字符块 */
   static EAST_ASIAN_FULL_WIDTH_REGEX = /[\u3000-\u303F\u3040-\u30FF\u31F0-\u31FF\uFF01-\uFF60\uFFE0-\uFFE6]/u;
   /** 表单/文档中常见的几何符号 */
@@ -26704,6 +26704,20 @@ class TextUtil {
   };
   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
@@ -26748,23 +26762,112 @@ class TextUtil {
     }
     return fontSize2 * ratio;
   }
+  /** 与度量路径一致：lineHeight 固定为 1 的样式副本 */
+  static measureBase(payload) {
+    return Object.assign({}, payload, { lineHeight: 1 });
+  }
   /**
-   * 生成文本度量缓存键
-   * @param payload
-   * @param includeText
-   * @returns
+   * 字体级缓存键（不含 text），与 getFontMetrics 语义一致
    */
-  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 ?? ""
-    });
+  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);
+    }
+  }
+  /**
+   * 单次 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）
+   */
+  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 };
   }
   /**
    * 计算字体度量
@@ -26779,11 +26882,10 @@ class TextUtil {
       text: targetText,
       lineHeight: 1
     });
-    const cacheKey = this.getMeasureCacheKey(config, false);
+    const cacheKey = this.measureStyleKey(config);
     if (this.fontMetricsCache.has(cacheKey)) {
       const result2 = this.fontMetricsCache.get(cacheKey);
-      this.fontMetricsCache.delete(cacheKey);
-      this.fontMetricsCache.set(cacheKey, result2);
+      this.touchLru(this.fontMetricsCache, cacheKey, result2);
       return result2;
     }
     const text = new Konva.Text(config);
@@ -26792,10 +26894,7 @@ class TextUtil {
       ascent: size.actualBoundingBoxAscent,
       descent: size.actualBoundingBoxDescent
     };
-    if (this.fontMetricsCache.size >= this.FONT_METRICS_CACHE_LIMIT) {
-      const firstKey = this.fontMetricsCache.keys().next().value;
-      this.fontMetricsCache.delete(firstKey);
-    }
+    this.evictOldestIfFull(this.fontMetricsCache, this.FONT_METRICS_CACHE_LIMIT);
     this.fontMetricsCache.set(cacheKey, result);
     return result;
   }
@@ -26824,13 +26923,7 @@ class TextUtil {
     if (this.isFullWidthChar(char)) {
       return fontSize2;
     }
-    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;
+    return this.getLayoutSize(payload).width;
   }
   /**
    * 计算单字符布局大小
@@ -26842,27 +26935,16 @@ class TextUtil {
    * @returns
    */
   static getLayoutSize(payload) {
-    const config = Object.assign({}, payload, {
-      lineHeight: 1
-    });
-    const cacheKey = this.getMeasureCacheKey(config);
+    const cacheKey = this.layoutCacheKey(payload);
     if (this.layoutSizeCache.has(cacheKey)) {
       const result2 = this.layoutSizeCache.get(cacheKey);
-      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);
+      this.touchLru(this.layoutSizeCache, cacheKey, result2);
+      return { width: result2.width, height: result2.height };
     }
+    const result = this.computeLayoutSizeUncached(payload);
+    this.evictOldestIfFull(this.layoutSizeCache, this.LAYOUT_SIZE_CACHE_LIMIT);
     this.layoutSizeCache.set(cacheKey, result);
-    return result;
+    return { width: result.width, height: result.height };
   }
   /**
    * 清除度量缓存
@@ -26942,14 +27024,7 @@ class TextRun extends LayoutNode {
    * @returns
    */
   static measureText(payload) {
-    const { width, height } = TextUtil.getLayoutSize(payload);
-    const { ascent, descent } = TextUtil.getFontMetrics(payload);
-    return {
-      width,
-      height,
-      ascent,
-      descent
-    };
+    return TextUtil.measureTextComplete(payload);
   }
   /**
    * 计算文字大小 度量
@@ -51257,6 +51332,8 @@ 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,
@@ -56994,6 +57071,12 @@ function useDocController(factory2, ops) {
         rawData() {
           return doc.dataManager.getRawData();
         },
+        setRawData(data, defaultDataMap) {
+          doc.dataManager.setRawData(data, defaultDataMap);
+        },
+        setMultiple(updates) {
+          return doc.dataManager.setMultiple(updates);
+        },
         getSubTableInfoList() {
           return doc.model?.getSubTableInfoList() ?? [];
         },

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

@@ -54,6 +54,10 @@ export interface DocControllerMethods extends DocOperations {
     setModel(model: DocModel): void;
     /** 获取当前文档原始填报数据快照 */
     rawData(): Recordable<any>;
+    /** 设置当前文档整个原始数据 */
+    setRawData(data: Record<string, any>, defaultDataMap?: Record<string, any>): void;
+    /** 根据 jsonpath 批量设置文档数据 */
+    setMultiple(updates: Record<string, any>): boolean;
     /** 获取当前文档的所有子表信息 */
     getSubTableInfoList(): Array<{
         field: string;

package/package.json

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