@gct-paas/word 0.1.62-patch.2 → 0.1.62-patch.3

package/dist/index.es.js

@@ -38289,10 +38289,10 @@ async function readApiLabel(strategy, value, fieldBinding, loadFieldByKey) {
 		refModelKey: fieldInfo?.bindInfo
 	};
 	try {
-		const isSingle = strategy.fetcher === "rdo2ref" || strategy.fetcher === "ref2lot2sn";
-		const idList = isSingle ? [String(value)] : getValue$1(value, true);
-		const result = isSingle ? await fetcher.getOptionById(idList[0], params) : await fetcher.getOptionByIds(idList, params);
-		const labelByValue = new Map((Array.isArray(result) ? result : result ? [result] : []).filter((item) => item?.value != null && item?.label != null).map((item) => [String(item.value), String(item.label)]));
+		if (strategy.fetcher === "rdo2ref" || strategy.fetcher === "ref2lot2sn") return (await fetcher.getOptionById(String(value), params))?.label || strategy.fallback;
+		const idList = getValue$1(value, true);
+		const list = await fetcher.getOptionByIds(idList, params);
+		const labelByValue = new Map(list.filter((item) => item?.value != null && item?.label != null).map((item) => [String(item.value), String(item.label)]));
 		const labels = idList.map((id) => labelByValue.get(String(id))).filter(Boolean);
 		if (labels.length) return labels.join(",");
 		return strategy.fallback;
@@ -123316,6 +123316,251 @@ var init_TextUtil = __esmMin((() => {
 	};
 }));
 //#endregion
+//#region src/runtime/designer/ribbon/constant/font.ts
+var FontFamilyEnum, FontFamilyOptions, FontSizeOptions;
+var init_font = __esmMin((() => {
+	FontFamilyEnum = /* @__PURE__ */ function(FontFamilyEnum) {
+		FontFamilyEnum["Serif"] = "Roboto,RobotoDraft,Helvetica,Arial,sans-serif";
+		/** 宋体 */
+		FontFamilyEnum["SimSun"] = "\"SimSun\", \"宋体\", \"华文宋体\", STSong, STSongti-SC-Light, sans-serif";
+		/** 黑体 */
+		FontFamilyEnum["SimHei"] = "\"SimHei\", \"黑体\", \"华文黑体\", STHeiti, sans-serif";
+		/** 楷体 */
+		FontFamilyEnum["KaiTi"] = "\"Kai\", \"STKai\", \"楷体\", \"KaiTi\", \"华文楷体\", sans-serif";
+		return FontFamilyEnum;
+	}({});
+	FontFamilyOptions = [
+		{
+			label: "默认",
+			value: "Roboto,RobotoDraft,Helvetica,Arial,sans-serif"
+		},
+		{
+			label: "宋体",
+			value: "\"SimSun\", \"宋体\", \"华文宋体\", STSong, STSongti-SC-Light, sans-serif"
+		},
+		{
+			label: "黑体",
+			value: "\"SimHei\", \"黑体\", \"华文黑体\", STHeiti, sans-serif"
+		},
+		{
+			label: "楷体",
+			value: "\"Kai\", \"STKai\", \"楷体\", \"KaiTi\", \"华文楷体\", sans-serif"
+		}
+	];
+	FontSizeOptions = [
+		{
+			label: "初号",
+			value: "42"
+		},
+		{
+			label: "小初",
+			value: "36"
+		},
+		{
+			label: "一号",
+			value: "26"
+		},
+		{
+			label: "小一",
+			value: "24"
+		},
+		{
+			label: "二号",
+			value: "22"
+		},
+		{
+			label: "小二",
+			value: "18"
+		},
+		{
+			label: "三号",
+			value: "16"
+		},
+		{
+			label: "小三",
+			value: "15"
+		},
+		{
+			label: "四号",
+			value: "14"
+		},
+		{
+			label: "小四",
+			value: "12"
+		},
+		{
+			label: "五号",
+			value: "10.5"
+		},
+		{
+			label: "小五",
+			value: "9"
+		},
+		{
+			label: "六号",
+			value: "7.5"
+		},
+		{
+			label: "小六",
+			value: "6.5"
+		},
+		{
+			label: "七号",
+			value: "5.5"
+		},
+		{
+			label: "八号",
+			value: "5"
+		},
+		{
+			label: "5",
+			value: 5
+		},
+		{
+			label: "5.5",
+			value: 5.5
+		},
+		{
+			label: "6.5",
+			value: 6.5
+		},
+		{
+			label: "7.5",
+			value: 7.5
+		},
+		{
+			label: "8",
+			value: 8
+		},
+		{
+			label: "9",
+			value: 9
+		},
+		{
+			label: "10",
+			value: 10
+		},
+		{
+			label: "10.5",
+			value: 10.5
+		},
+		{
+			label: "11",
+			value: 11
+		},
+		{
+			label: "12",
+			value: 12
+		},
+		{
+			label: "14",
+			value: 14
+		},
+		{
+			label: "16",
+			value: 16
+		},
+		{
+			label: "18",
+			value: 18
+		},
+		{
+			label: "20",
+			value: 20
+		},
+		{
+			label: "22",
+			value: 22
+		},
+		{
+			label: "24",
+			value: 24
+		},
+		{
+			label: "26",
+			value: 26
+		},
+		{
+			label: "28",
+			value: 28
+		},
+		{
+			label: "30",
+			value: 30
+		},
+		{
+			label: "36",
+			value: 36
+		},
+		{
+			label: "48",
+			value: 48
+		},
+		{
+			label: "56",
+			value: 56
+		},
+		{
+			label: "72",
+			value: 72
+		},
+		{
+			label: "96",
+			value: 96
+		}
+	];
+}));
+//#endregion
+//#region src/utils/fonts/normalize-document-font.ts
+/**
+* 从 OOXML rFonts 取展示用字体名。
+* 中文 Word 常把字体写在 eastAsia，优先于 ascii。
+*/
+function pickDocumentFontName(rFonts) {
+	if (!rFonts) return void 0;
+	return rFonts.eastAsia || rFonts.ascii || rFonts.hAnsi || rFonts.cs || void 0;
+}
+/**
+* 识别是否为产品支持的黑 / 宋 / 楷（含常见别名）。
+* 无法识别时返回 null（应回落默认字体）。
+* 注意：不能用裸 includes('serif')，否则会误伤 "sans-serif"。
+*/
+function detectSupportedCjkKind(fontFamily) {
+	if (!fontFamily) return null;
+	const name = fontFamily.toLowerCase();
+	const isKai = /lxgw|wenkai|kaiti|楷/.test(name) || /(^|[,\"\s])kai([,\"\s]|$)/.test(name) || name.includes("stkai");
+	const isSong = /noto\s*serif|notoserif|simsun|华文宋|stsong|songti|宋体/.test(name) || /(^|[,\"\s])song([,\"\s]|$)/.test(name);
+	const isHei = /noto\s*sans|notosans|simhei|华文黑|stheiti|黑体/.test(name) || name.includes("heiti");
+	if (isKai) return "kai";
+	if (isSong && !isHei) return "song";
+	if (isHei) return "hei";
+	return null;
+}
+/**
+* 将任意字体名归一到产品支持的黑 / 宋 / 楷。
+* 无法识别（如 Arial、微软雅黑）时回落默认字体。
+*/
+function normalizeSupportedFontFamily(fontFamily) {
+	if (!fontFamily) return DEFAULT_FONT_FAMILY;
+	if (fontFamily === "Roboto,RobotoDraft,Helvetica,Arial,sans-serif" || fontFamily === FontFamilyEnum.Serif) return fontFamily;
+	for (const stack of SUPPORTED_DOCUMENT_FONT_FAMILIES) if (fontFamily === stack) return fontFamily;
+	const kind = detectSupportedCjkKind(fontFamily);
+	if (kind === "kai") return FontFamilyEnum.KaiTi;
+	if (kind === "song") return FontFamilyEnum.SimSun;
+	if (kind === "hei") return FontFamilyEnum.SimHei;
+	return DEFAULT_FONT_FAMILY;
+}
+var SUPPORTED_DOCUMENT_FONT_FAMILIES;
+var init_normalize_document_font = __esmMin((() => {
+	init_constants();
+	init_font();
+	SUPPORTED_DOCUMENT_FONT_FAMILIES = [
+		FontFamilyEnum.SimHei,
+		FontFamilyEnum.SimSun,
+		FontFamilyEnum.KaiTi
+	];
+}));
+//#endregion
 //#region src/core/view/runs/TextRun.ts
 var TextRun;
 var init_TextRun = __esmMin((() => {
@@ -123323,6 +123568,7 @@ var init_TextRun = __esmMin((() => {
 	init_constants();
 	init_utils$2();
 	init_TextUtil();
+	init_normalize_document_font();
 	TextRun = class TextRun extends LayoutNode {
 		component = BuiltinComponentTypeConst.Text;
 		/** 文本内容 */
@@ -123447,7 +123693,8 @@ var init_TextRun = __esmMin((() => {
 			if (!textStyle) return {};
 			const layoutStyle = {};
 			if (textStyle.sz !== void 0) layoutStyle.fontSize = textStyle.sz / 2 * 96 / 72;
-			if (textStyle.rFonts?.ascii) layoutStyle.fontFamily = textStyle.rFonts.ascii;
+			const rawFontFamily = pickDocumentFontName(textStyle.rFonts);
+			if (rawFontFamily) layoutStyle.fontFamily = normalizeSupportedFontFamily(rawFontFamily);
 			if (textStyle.highlight) layoutStyle.highlight = normalizeColor(textStyle.highlight, "none");
 			if (textStyle.color) layoutStyle.color = normalizeColor(textStyle.color, DEFAULT_TEXT_COLOR);
 			if (textStyle.b !== void 0) layoutStyle.bold = textStyle.b;
@@ -157749,204 +157996,12 @@ var table_ribbon_group_vue_vue_type_script_setup_true_name_table_ribbon_group_la
 init__plugin_vue_export_helper();
 var table_ribbon_group_default = /*#__PURE__*/ _plugin_vue_export_helper_default(table_ribbon_group_vue_vue_type_script_setup_true_name_table_ribbon_group_lang_default, [["__scopeId", "data-v-0fb21d1a"]]);
 //#endregion
-//#region src/runtime/designer/ribbon/constant/font.ts
-/** 字重 */
-var FontFamilyEnum = /* @__PURE__ */ function(FontFamilyEnum) {
-	FontFamilyEnum["Serif"] = "Roboto,RobotoDraft,Helvetica,Arial,sans-serif";
-	/** 宋体 */
-	FontFamilyEnum["SimSun"] = "\"SimSun\", \"宋体\", \"华文宋体\", STSong, STSongti-SC-Light, sans-serif";
-	/** 黑体 */
-	FontFamilyEnum["SimHei"] = "\"SimHei\", \"黑体\", \"华文黑体\", STHeiti, sans-serif";
-	/** 楷体 */
-	FontFamilyEnum["KaiTi"] = "\"Kai\", \"STKai\", \"楷体\", \"KaiTi\", \"华文楷体\", sans-serif";
-	return FontFamilyEnum;
-}({});
-var FontFamilyOptions = [
-	{
-		label: "默认",
-		value: "Roboto,RobotoDraft,Helvetica,Arial,sans-serif"
-	},
-	{
-		label: "宋体",
-		value: "\"SimSun\", \"宋体\", \"华文宋体\", STSong, STSongti-SC-Light, sans-serif"
-	},
-	{
-		label: "黑体",
-		value: "\"SimHei\", \"黑体\", \"华文黑体\", STHeiti, sans-serif"
-	},
-	{
-		label: "楷体",
-		value: "\"Kai\", \"STKai\", \"楷体\", \"KaiTi\", \"华文楷体\", sans-serif"
-	}
-];
-var FontSizeOptions = [
-	{
-		label: "初号",
-		value: "42"
-	},
-	{
-		label: "小初",
-		value: "36"
-	},
-	{
-		label: "一号",
-		value: "26"
-	},
-	{
-		label: "小一",
-		value: "24"
-	},
-	{
-		label: "二号",
-		value: "22"
-	},
-	{
-		label: "小二",
-		value: "18"
-	},
-	{
-		label: "三号",
-		value: "16"
-	},
-	{
-		label: "小三",
-		value: "15"
-	},
-	{
-		label: "四号",
-		value: "14"
-	},
-	{
-		label: "小四",
-		value: "12"
-	},
-	{
-		label: "五号",
-		value: "10.5"
-	},
-	{
-		label: "小五",
-		value: "9"
-	},
-	{
-		label: "六号",
-		value: "7.5"
-	},
-	{
-		label: "小六",
-		value: "6.5"
-	},
-	{
-		label: "七号",
-		value: "5.5"
-	},
-	{
-		label: "八号",
-		value: "5"
-	},
-	{
-		label: "5",
-		value: 5
-	},
-	{
-		label: "5.5",
-		value: 5.5
-	},
-	{
-		label: "6.5",
-		value: 6.5
-	},
-	{
-		label: "7.5",
-		value: 7.5
-	},
-	{
-		label: "8",
-		value: 8
-	},
-	{
-		label: "9",
-		value: 9
-	},
-	{
-		label: "10",
-		value: 10
-	},
-	{
-		label: "10.5",
-		value: 10.5
-	},
-	{
-		label: "11",
-		value: 11
-	},
-	{
-		label: "12",
-		value: 12
-	},
-	{
-		label: "14",
-		value: 14
-	},
-	{
-		label: "16",
-		value: 16
-	},
-	{
-		label: "18",
-		value: 18
-	},
-	{
-		label: "20",
-		value: 20
-	},
-	{
-		label: "22",
-		value: 22
-	},
-	{
-		label: "24",
-		value: 24
-	},
-	{
-		label: "26",
-		value: 26
-	},
-	{
-		label: "28",
-		value: 28
-	},
-	{
-		label: "30",
-		value: 30
-	},
-	{
-		label: "36",
-		value: 36
-	},
-	{
-		label: "48",
-		value: 48
-	},
-	{
-		label: "56",
-		value: 56
-	},
-	{
-		label: "72",
-		value: 72
-	},
-	{
-		label: "96",
-		value: 96
-	}
-];
-//#endregion
 //#region src/runtime/designer/ribbon/tabs/word-tab.vue?vue&type=script&setup=true&name=home-tab&lang.ts
 init_dist();
 init_base$2();
 init_core();
 init_asset_helper_util();
+init_font();
 init_logic$1();
 init_lodash();
 init_constants();
@@ -162782,6 +162837,7 @@ var manifest$7 = {
 //#endregion
 //#region src/suites/edhr/manifest/paper-widget/_common_/basic.ts
 init_constants();
+init_font();
 var DEFAULT_WIDGET_TEXT_STYLE = {
 	fontFamily: FontFamilyEnum.Serif,
 	fontSize: 13,
@@ -175041,6 +175097,7 @@ var widget_barcode_config_default = /*#__PURE__*/ _plugin_vue_export_helper_defa
 //#endregion
 //#region src/suites/shared/panel/config/editor/font-editor/font-editor.vue?vue&type=script&setup=true&lang.ts
 init_base$2();
+init_font();
 var _hoisted_1$8 = { class: "content" };
 var _hoisted_2$4 = { class: "value" };
 var font_editor_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({

package/dist/utils/fonts/normalize-document-font.d.ts

@@ -0,0 +1,16 @@
+export type DocRFonts = {
+    ascii?: string;
+    hAnsi?: string;
+    eastAsia?: string;
+    cs?: string;
+};
+/**
+ * 从 OOXML rFonts 取展示用字体名。
+ * 中文 Word 常把字体写在 eastAsia，优先于 ascii。
+ */
+export declare function pickDocumentFontName(rFonts?: DocRFonts | null): string | undefined;
+/**
+ * 将任意字体名归一到产品支持的黑 / 宋 / 楷。
+ * 无法识别（如 Arial、微软雅黑）时回落默认字体。
+ */
+export declare function normalizeSupportedFontFamily(fontFamily?: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.62-patch.2",
+  "version": "0.1.62-patch.3",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",