@gct-paas/word 0.1.74-beta.27 → 0.1.74-beta.28

package/dist/core/command/commands/UnmergeCells.d.ts

@@ -14,5 +14,9 @@ export declare class UnmergeCells extends CommandBase<'unmergeCells'> {
         pos: number;
         side: string;
         wp?: undefined;
-    } | null | undefined>;
+    } | null>;
+    /** 光标落在合并格内时，解析其 merge root */
+    private resolveRootsFromCursor;
+    /** 框选单元格时，收集选区内的 merge roots */
+    private resolveRootsFromSelection;
 }

package/dist/core/command/types.d.ts

@@ -151,6 +151,7 @@ export type CommandPayloadMap = {
     };
     setFontSize: CommandPayload & {
         fontSize: number;
+        fontSizeOption?: string;
     };
     setUnderline: CommandPayload & {
         underline?: string;

package/dist/core/model/document/WrText.d.ts

@@ -94,6 +94,8 @@ export declare class WrText extends ModelNode {
      * @param fontSize 字号大小（半磅单位）
      */
     setFontSize(fontSize: number): void;
+    /** 记录 Ribbon 选中的字号项，用于同磅值下区分「小六」与「6.5」 */
+    setFontSizeOption(fontSizeOption: string): void;
     /**
      * 在指定字符位置拆分文本节点
      * @param index 拆分位置（在此字符之前分割）

package/dist/core/model/types/style.d.ts

@@ -20,6 +20,8 @@ export type TextStyle = {
     };
     sz?: number;
     szCs?: number;
+    /** Ribbon 字号选项 id，区分同磅值的号数/数字项 */
+    fontSizeOption?: string;
     spacing?: number;
     kern?: number;
     rFonts?: {

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

@@ -30,6 +30,8 @@ export interface ITextRun {
     text: string;
     /** 字号 */
     fontSize: number;
+    /** Ribbon 字号选项 id */
+    fontSizeOption?: string;
     /** 字体 */
     fontFamily: string;
     /** 高亮 */
@@ -72,6 +74,8 @@ export declare class TextRun extends LayoutNode implements ITextRun {
     text: string;
     /** 字号 */
     fontSize: number;
+    /** Ribbon 字号选项 id */
+    fontSizeOption?: string;
     /** 字体 */
     fontFamily: string;
     /** 高亮 */

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @gct-paas/word v0.1.74-beta.27 */
+/*! @gct-paas/word v0.1.74-beta.28 */
 import { Fragment, Suspense, Teleport, Transition, TransitionGroup, cloneVNode, computed, createApp, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createStaticVNode, createTextVNode, createVNode, defineAsyncComponent, defineComponent, getCurrentInstance, getCurrentScope, guardReactiveProps, h, inject, isRef, isVNode, markRaw, mergeModels, mergeProps, nextTick, normalizeClass, normalizeProps, normalizeStyle, onBeforeMount, onBeforeUnmount, onMounted, onScopeDispose, onUnmounted, openBlock, provide, reactive, readonly, ref, render, renderList, renderSlot, resolveComponent, resolveDynamicComponent, shallowRef, toDisplayString, toHandlers, toRaw, toRef, toValue, unref, useAttrs, useCssVars, useModel, useSlots, vModelRadio, vModelText, vShow, watch, watchEffect, withCtx, withDirectives, withKeys, withModifiers } from "vue";
 import Mt, { PopperWrapper } from "floating-vue";
 import VueKonva from "vue-konva";
@@ -14545,6 +14545,11 @@ var init_WrPr = __esmMin((() => {
 				const val = (_szElem$Attrs = szElem["@attrs"]) === null || _szElem$Attrs === void 0 ? void 0 : _szElem$Attrs["w:val"];
 				style.sz = val ? parseInt(val) : void 0;
 			}
+			const fontSizeOptionElem = this.getElement("gct:fontSizeOption");
+			if (fontSizeOptionElem) {
+				var _fontSizeOptionElem$;
+				style.fontSizeOption = (_fontSizeOptionElem$ = fontSizeOptionElem["@attrs"]) === null || _fontSizeOptionElem$ === void 0 ? void 0 : _fontSizeOptionElem$["w:val"];
+			}
 			const rFontsElem = this.getElement("w:rFonts");
 			if (rFontsElem === null || rFontsElem === void 0 ? void 0 : rFontsElem["@attrs"]) {
 				const attrs = rFontsElem["@attrs"];
@@ -14830,6 +14835,10 @@ var init_WrText = __esmMin((() => {
 			rPr.setAttr("w:sz", "w:val", sizeStr);
 			rPr.setAttr("w:szCs", "w:val", sizeStr);
 		}
+		/** 记录 Ribbon 选中的字号项，用于同磅值下区分「小六」与「6.5」 */
+		setFontSizeOption(fontSizeOption) {
+			this.ensureRPr().setAttr("gct:fontSizeOption", "w:val", fontSizeOption);
+		}
 		/**
 		* 在指定字符位置拆分文本节点
 		* @param index 拆分位置（在此字符之前分割）
@@ -14888,7 +14897,7 @@ var init_WrText = __esmMin((() => {
 			let rPr;
 			const elements = [];
 			(_json$elements = json.elements) === null || _json$elements === void 0 || _json$elements.forEach((_) => {
-				let el = _;
+				const el = _;
 				if (el.name === "w:rPr") rPr = WrPr.fromXmlJson(el);
 				else if (el.name === "w:t") {
 					var _el$elements;
@@ -109017,6 +109026,7 @@ var init_TextStyleResolver = __esmMin((() => {
 			result.color = override.color ?? base.color;
 			result.highlight = override.highlight ?? base.highlight;
 			result.sz = override.sz ?? base.sz;
+			result.fontSizeOption = override.fontSizeOption;
 			result.spacing = override.spacing ?? base.spacing;
 			result.kern = override.kern ?? base.kern;
 			if (base.rFonts || override.rFonts) {
@@ -109953,6 +109963,12 @@ var init_TextRun = __esmMin((() => {
 				"fontSize",
 				16
 			);
+			_defineProperty(
+				this,
+				/** Ribbon 字号选项 id */
+				"fontSizeOption",
+				void 0
+			);
 			_defineProperty(
 				this,
 				/** 字体 */
@@ -110105,6 +110121,7 @@ var init_TextRun = __esmMin((() => {
 			if (!textStyle) return {};
 			const layoutStyle = {};
 			if (textStyle.sz !== void 0) layoutStyle.fontSize = textStyle.sz / 2 * 96 / 72;
+			if (textStyle.fontSizeOption) layoutStyle.fontSizeOption = textStyle.fontSizeOption;
 			const rawFontFamily = pickDocumentFontName(textStyle.rFonts);
 			if (rawFontFamily) layoutStyle.fontFamily = normalizeSupportedFontFamily(rawFontFamily);
 			if (textStyle.highlight) layoutStyle.highlight = normalizeColor(textStyle.highlight, "none");
@@ -111578,6 +111595,31 @@ function resolveSelectionTableScope(doc) {
 	const wtbl = doc.layoutMapper.getModelNodeById(modelId);
 	return wtbl === null || wtbl === void 0 ? void 0 : wtbl.getTableScope();
 }
+/** 从光标向上解析所在段落的 Wp（兼容 placeholder 空行） */
+function resolveWpFromCursor(doc) {
+	const cursor = doc.cursorManager.getCursor();
+	if (!(cursor === null || cursor === void 0 ? void 0 : cursor.nodeId)) return void 0;
+	const mapper = doc.layoutMapper;
+	let layoutNode = mapper.getLayoutNodeById(cursor.nodeId);
+	while (layoutNode) {
+		var _layoutNode$modelRef2, _layoutNode$modelRef3;
+		if (layoutNode.component === BuiltinComponentTypeConst.Paragraph && ((_layoutNode$modelRef2 = layoutNode.modelRef) === null || _layoutNode$modelRef2 === void 0 ? void 0 : _layoutNode$modelRef2.id)) {
+			const wp = mapper.getModelNodeById(layoutNode.modelRef.id);
+			if ((wp === null || wp === void 0 ? void 0 : wp.name) === "w:p") return wp;
+		}
+		if ((_layoutNode$modelRef3 = layoutNode.modelRef) === null || _layoutNode$modelRef3 === void 0 ? void 0 : _layoutNode$modelRef3.id) {
+			const model = mapper.getModelNodeById(layoutNode.modelRef.id);
+			if (model instanceof Wp) return model;
+			if ((model === null || model === void 0 ? void 0 : model.parent) instanceof Wp) return model.parent;
+		}
+		try {
+			const model = mapper.getModelNodeByLayoutId(layoutNode.id);
+			if (model instanceof Wp) return model;
+			if ((model === null || model === void 0 ? void 0 : model.parent) instanceof Wp) return model.parent;
+		} catch {}
+		layoutNode = layoutNode.parent;
+	}
+}
 /**
 * 当 focus 跑出 selectionTable 时，尝试从 focus 的祖先路径里
 * 找到 selectionTable 某行的某个 cell，返回该列下标。
@@ -116857,7 +116899,9 @@ var init_SetFontSize = __esmMin((() => {
 			this.needsCalculatePostCommandContext = true;
 		}
 		applyStyle(run) {
+			var _this$payload;
 			run.setFontSize(this.payload.fontSize * 2);
+			if ((_this$payload = this.payload) === null || _this$payload === void 0 ? void 0 : _this$payload.fontSizeOption) run.setFontSizeOption(this.payload.fontSizeOption);
 		}
 	};
 }));
@@ -117242,19 +117286,17 @@ var UnmergeCells_exports = /* @__PURE__ */ __exportAll({ UnmergeCells: () => Unm
 var UnmergeCells;
 var init_UnmergeCells = __esmMin((() => {
 	init_CommandBase();
+	init_document();
+	init_logic$1();
 	UnmergeCells = class extends CommandBase {
 		constructor(doc, payload) {
 			super(doc, payload);
 		}
 		async execute() {
-			var _roots$;
+			var _roots$, _cursor$getCursor;
 			const cursor = this.doc.cursorManager;
-			if (cursor.isCollapsed()) return;
-			const { mode, models } = CommandBase.getSelectionResult(this.doc, cursor.getSelection());
-			if (mode !== SelectionMode.Tds) return;
-			if (models.length === 0) return;
-			const roots = models.map(({ model }) => model).filter((cell) => cell.id === cell.mergeId && !cell.mergeFromId);
-			if (roots.length === 0) return null;
+			const roots = cursor.isCollapsed() ? this.resolveRootsFromCursor() : this.resolveRootsFromSelection();
+			if (!(roots === null || roots === void 0 ? void 0 : roots.length)) return null;
 			const table = (_roots$ = roots[0]) === null || _roots$ === void 0 ? void 0 : _roots$.table;
 			if (!table) return null;
 			table.runConsistencyMutation({ mutate: () => {
@@ -117263,8 +117305,9 @@ var init_UnmergeCells = __esmMin((() => {
 				});
 			} });
 			const mapper = this.doc.layoutMapper;
-			const normalized = this.doc.cursorManager.normalizeRange(cursor.getSelection());
-			const start = mapper.getLayoutNodeById(normalized.rangeStart.nodeId);
+			const nodeId = cursor.isCollapsed() ? (_cursor$getCursor = cursor.getCursor()) === null || _cursor$getCursor === void 0 ? void 0 : _cursor$getCursor.nodeId : this.doc.cursorManager.normalizeRange(cursor.getSelection()).rangeStart.nodeId;
+			if (!nodeId) return null;
+			const start = mapper.getLayoutNodeById(nodeId);
 			if (start === null || start === void 0 ? void 0 : start.isPlaceholderRun) return {
 				wp: mapper.getModelNodeById(start.parent.modelRef.id),
 				pos: -1,
@@ -117276,6 +117319,24 @@ var init_UnmergeCells = __esmMin((() => {
 				side: "after"
 			};
 		}
+		/** 光标落在合并格内时，解析其 merge root */
+		resolveRootsFromCursor() {
+			const wp = resolveWpFromCursor(this.doc);
+			let cell = (wp === null || wp === void 0 ? void 0 : wp.parent) instanceof Wtc ? wp.parent : void 0;
+			if (!(cell === null || cell === void 0 ? void 0 : cell.mergeId)) return null;
+			if (cell.mergeFromId) cell = this.doc.layoutMapper.getModelNodeById(cell.mergeFromId);
+			if (!(cell === null || cell === void 0 ? void 0 : cell.isMergeStart)) return null;
+			return [cell];
+		}
+		/** 框选单元格时，收集选区内的 merge roots */
+		resolveRootsFromSelection() {
+			const cursor = this.doc.cursorManager;
+			const { mode, models } = CommandBase.getSelectionResult(this.doc, cursor.getSelection());
+			if (mode !== SelectionMode.Tds) return null;
+			if (models.length === 0) return null;
+			const roots = models.map(({ model }) => model).filter((cell) => cell.id === cell.mergeId && !cell.mergeFromId);
+			return roots.length > 0 ? roots : null;
+		}
 	};
 }));
 //#endregion
@@ -149199,168 +149260,227 @@ var FontFamilyOptions = [
 		value: "\"LXGW WenKai\", \"LXGWWenKai\", \"KaiTi\", \"楷体\", \"华文楷体\", serif"
 	}
 ];
+var DEFAULT_FONT_SIZE_OPTION = "cn-12";
 var FontSizeOptions = [
 	{
 		label: "初号",
-		value: "42"
+		value: "cn-42",
+		pt: 42
 	},
 	{
 		label: "小初",
-		value: "36"
+		value: "cn-36",
+		pt: 36
 	},
 	{
 		label: "一号",
-		value: "26"
+		value: "cn-26",
+		pt: 26
 	},
 	{
 		label: "小一",
-		value: "24"
+		value: "cn-24",
+		pt: 24
 	},
 	{
 		label: "二号",
-		value: "22"
+		value: "cn-22",
+		pt: 22
 	},
 	{
 		label: "小二",
-		value: "18"
+		value: "cn-18",
+		pt: 18
 	},
 	{
 		label: "三号",
-		value: "16"
+		value: "cn-16",
+		pt: 16
 	},
 	{
 		label: "小三",
-		value: "15"
+		value: "cn-15",
+		pt: 15
 	},
 	{
 		label: "四号",
-		value: "14"
+		value: "cn-14",
+		pt: 14
 	},
 	{
 		label: "小四",
-		value: "12"
+		value: "cn-12",
+		pt: 12
 	},
 	{
 		label: "五号",
-		value: "10.5"
+		value: "cn-10.5",
+		pt: 10.5
 	},
 	{
 		label: "小五",
-		value: "9"
+		value: "cn-9",
+		pt: 9
 	},
 	{
 		label: "六号",
-		value: "7.5"
+		value: "cn-7.5",
+		pt: 7.5
 	},
 	{
 		label: "小六",
-		value: "6.5"
+		value: "cn-6.5",
+		pt: 6.5
 	},
 	{
 		label: "七号",
-		value: "5.5"
+		value: "cn-5.5",
+		pt: 5.5
 	},
 	{
 		label: "八号",
-		value: "5"
+		value: "cn-5",
+		pt: 5
 	},
 	{
 		label: "5",
-		value: 5
+		value: "pt-5",
+		pt: 5
 	},
 	{
 		label: "5.5",
-		value: 5.5
+		value: "pt-5.5",
+		pt: 5.5
 	},
 	{
 		label: "6.5",
-		value: 6.5
+		value: "pt-6.5",
+		pt: 6.5
 	},
 	{
 		label: "7.5",
-		value: 7.5
+		value: "pt-7.5",
+		pt: 7.5
 	},
 	{
 		label: "8",
-		value: 8
+		value: "pt-8",
+		pt: 8
 	},
 	{
 		label: "9",
-		value: 9
+		value: "pt-9",
+		pt: 9
 	},
 	{
 		label: "10",
-		value: 10
+		value: "pt-10",
+		pt: 10
 	},
 	{
 		label: "10.5",
-		value: 10.5
+		value: "pt-10.5",
+		pt: 10.5
 	},
 	{
 		label: "11",
-		value: 11
+		value: "pt-11",
+		pt: 11
 	},
 	{
 		label: "12",
-		value: 12
+		value: "pt-12",
+		pt: 12
 	},
 	{
 		label: "14",
-		value: 14
+		value: "pt-14",
+		pt: 14
 	},
 	{
 		label: "16",
-		value: 16
+		value: "pt-16",
+		pt: 16
 	},
 	{
 		label: "18",
-		value: 18
+		value: "pt-18",
+		pt: 18
 	},
 	{
 		label: "20",
-		value: 20
+		value: "pt-20",
+		pt: 20
 	},
 	{
 		label: "22",
-		value: 22
+		value: "pt-22",
+		pt: 22
 	},
 	{
 		label: "24",
-		value: 24
+		value: "pt-24",
+		pt: 24
 	},
 	{
 		label: "26",
-		value: 26
+		value: "pt-26",
+		pt: 26
 	},
 	{
 		label: "28",
-		value: 28
+		value: "pt-28",
+		pt: 28
 	},
 	{
 		label: "30",
-		value: 30
+		value: "pt-30",
+		pt: 30
 	},
 	{
 		label: "36",
-		value: 36
+		value: "pt-36",
+		pt: 36
 	},
 	{
 		label: "48",
-		value: 48
+		value: "pt-48",
+		pt: 48
 	},
 	{
 		label: "56",
-		value: 56
+		value: "pt-56",
+		pt: 56
 	},
 	{
 		label: "72",
-		value: 72
+		value: "pt-72",
+		pt: 72
 	},
 	{
 		label: "96",
-		value: 96
+		value: "pt-96",
+		pt: 96
 	}
 ];
+function getFontSizeOptionPt(value) {
+	var _FontSizeOptions$find;
+	return (_FontSizeOptions$find = FontSizeOptions.find((o) => o.value === value)) === null || _FontSizeOptions$find === void 0 ? void 0 : _FontSizeOptions$find.pt;
+}
+function layoutPxToPt(px) {
+	return px * 72 / 96;
+}
+/** 无存储项时，按磅值回退到号数项 */
+function resolveFontSizeOptionFromLayout(raw) {
+	if (raw.fontSizeOption && FontSizeOptions.some((o) => o.value === raw.fontSizeOption)) return raw.fontSizeOption;
+	if (typeof raw.fontSize !== "number") return DEFAULT_FONT_SIZE_OPTION;
+	const pt = layoutPxToPt(raw.fontSize);
+	const named = FontSizeOptions.find((o) => o.value.startsWith("cn-") && Math.abs(o.pt - pt) < .05);
+	if (named) return named.value;
+	const numeric = FontSizeOptions.find((o) => o.value.startsWith("pt-") && Math.abs(o.pt - pt) < .05);
+	if (numeric) return numeric.value;
+	return DEFAULT_FONT_SIZE_OPTION;
+}
 //#endregion
 //#region src/runtime/designer/ribbon/tabs/word-tab.vue?vue&type=script&setup=true&name=home-tab&lang.ts
 init_dist();
@@ -149389,7 +149509,7 @@ var word_tab_vue_vue_type_script_setup_true_name_home_tab_lang_default = /*@__PU
 		});
 		const fontFamily = ref(FontFamilyEnum.Serif);
 		const fontFamilyLabel = useSelectLabel(fontFamily, FontFamilyOptions);
-		const fontSize = ref("10.5");
+		const fontSize = ref(DEFAULT_FONT_SIZE_OPTION);
 		const fontSizeLabel = useSelectLabel(fontSize, FontSizeOptions);
 		const textBold = ref(false);
 		const textItalic = ref(false);
@@ -149418,9 +149538,15 @@ var word_tab_vue_vue_type_script_setup_true_name_home_tab_lang_default = /*@__PU
 				case "font-family":
 					docInst.value.execute("setFont", { fontFamily: options });
 					break;
-				case "font-size":
-					docInst.value.execute("setFontSize", { fontSize: +options });
+				case "font-size": {
+					const pt = getFontSizeOptionPt(options);
+					if (pt == null) break;
+					docInst.value.execute("setFontSize", {
+						fontSize: pt,
+						fontSizeOption: options
+					});
 					break;
+				}
 				case "bold":
 					const bold = !textBold.value;
 					docInst.value.execute("setBold", { bold });
@@ -149454,7 +149580,10 @@ var word_tab_vue_vue_type_script_setup_true_name_home_tab_lang_default = /*@__PU
 				case "image": handleUploadImage();
 			}
 		};
-		const getStyle = (raw) => pick(raw, "fontFamily", "fontSize", "bold", "italic", "underline", "strike", "align");
+		const getStyle = (raw) => ({
+			...pick(raw, "fontFamily", "bold", "italic", "underline", "strike", "align"),
+			fontSizeOption: resolveFontSizeOptionFromLayout(raw)
+		});
 		const getUniqueStyle = (rawList) => {
 			if (rawList.length === 0) return null;
 			else if (rawList.length === 1) return getStyle(rawList[0]);
@@ -149469,6 +149598,7 @@ var word_tab_vue_vue_type_script_setup_true_name_home_tab_lang_default = /*@__PU
 				const rawList = getCursorTextRawList(docInst.value, type);
 				const uniqueStyle = getUniqueStyle(rawList);
 				fontFamily.value = (uniqueStyle === null || uniqueStyle === void 0 ? void 0 : uniqueStyle.fontFamily) || "\"Noto Sans SC\", \"NotoSansSC\", \"黑体\", \"SimHei\", sans-serif";
+				fontSize.value = (uniqueStyle === null || uniqueStyle === void 0 ? void 0 : uniqueStyle.fontSizeOption) ?? "cn-12";
 				textBold.value = (uniqueStyle === null || uniqueStyle === void 0 ? void 0 : uniqueStyle.bold) || false;
 				textItalic.value = (uniqueStyle === null || uniqueStyle === void 0 ? void 0 : uniqueStyle.italic) || false;
 				textUnderline.value = (uniqueStyle === null || uniqueStyle === void 0 ? void 0 : uniqueStyle.underline) || false;
@@ -149590,7 +149720,7 @@ var word_tab_vue_vue_type_script_setup_true_name_home_tab_lang_default = /*@__PU
 //#endregion
 //#region src/runtime/designer/ribbon/tabs/word-tab.vue
 init__plugin_vue_export_helper();
-var word_tab_default = /*#__PURE__*/ _plugin_vue_export_helper_default(word_tab_vue_vue_type_script_setup_true_name_home_tab_lang_default, [["__scopeId", "data-v-628a3f22"]]);
+var word_tab_default = /*#__PURE__*/ _plugin_vue_export_helper_default(word_tab_vue_vue_type_script_setup_true_name_home_tab_lang_default, [["__scopeId", "data-v-a478a99a"]]);
 //#endregion
 //#region src/runtime/designer/ribbon/ribbon.vue?vue&type=script&setup=true&name=ribbon-tab&lang.ts
 var _hoisted_1$117 = { class: "ribbon" };
@@ -163836,6 +163966,8 @@ var _hoisted_5$12 = {
 	key: 0,
 	class: "field-tree-dropdown__empty"
 };
+var DROPDOWN_MAX_HEIGHT = 280;
+var DROPDOWN_GAP = 4;
 var field_tree_select_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	__name: "field-tree-select",
 	props: {
@@ -163880,22 +164012,32 @@ var field_tree_select_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*
 			if (!rootRef.value) return;
 			const rect = rootRef.value.getBoundingClientRect();
 			const width = props.popperWidth ?? rect.width;
+			const spaceBelow = window.innerHeight - rect.bottom - DROPDOWN_GAP;
+			const spaceAbove = rect.top - DROPDOWN_GAP;
+			const placeAbove = spaceBelow < DROPDOWN_MAX_HEIGHT && spaceAbove > spaceBelow;
 			dropdownStyle.value = {
 				position: "fixed",
-				top: `${rect.bottom + 4}px`,
 				left: `${rect.left}px`,
 				width: `${width}px`,
-				zIndex: "2147483647"
+				zIndex: "2147483647",
+				...placeAbove ? {
+					top: "auto",
+					bottom: `${window.innerHeight - rect.top + DROPDOWN_GAP}px`
+				} : {
+					top: `${rect.bottom + DROPDOWN_GAP}px`,
+					bottom: "auto"
+				}
 			};
 		}
 		function open() {
-			calcDropdownPosition();
 			isOpen.value = true;
 			keyword.value = "";
-			setTimeout(() => {
+			calcDropdownPosition();
+			nextTick(() => {
 				var _inputRef$value;
+				calcDropdownPosition();
 				(_inputRef$value = inputRef.value) === null || _inputRef$value === void 0 || _inputRef$value.focus();
-			}, 0);
+			});
 		}
 		function close() {
 			isOpen.value = false;
@@ -164040,7 +164182,7 @@ var field_tree_select_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*
 //#endregion
 //#region src/suites/shared/panel/config/editor/ref-autofill-editor/field-tree-select.vue
 init__plugin_vue_export_helper();
-var field_tree_select_default = /*#__PURE__*/ _plugin_vue_export_helper_default(field_tree_select_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-60520932"]]);
+var field_tree_select_default = /*#__PURE__*/ _plugin_vue_export_helper_default(field_tree_select_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-e4650f63"]]);
 //#endregion
 //#region src/suites/edhr/panel-schema/rule/constants/builtin-field-maps.ts
 var SOURCE_UNIT_KEY = "sourceUnit";
@@ -165855,7 +165997,6 @@ var FieldPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 			return openBlock(), createElementBlock("div", _hoisted_1$57, [
 				createVNode(unref(collapse_default), {
 					title: "字段属性",
-					visible: false,
 					class: "panel-collapse is-first"
 				}, {
 					expandIcon: withCtx(({ open }) => [createVNode(field_panel_chevron_default, { expanded: open }, null, 8, ["expanded"])]),
@@ -165942,7 +166083,6 @@ var FieldPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 				unref(Renderer) && unref(Renderer).config ? (openBlock(), createBlock(unref(collapse_default), {
 					key: 0,
 					title: "字段配置",
-					visible: false,
 					class: "panel-collapse"
 				}, {
 					expandIcon: withCtx(({ open }) => [createVNode(field_panel_chevron_default, { expanded: open }, null, 8, ["expanded"])]),
@@ -165963,7 +166103,6 @@ var FieldPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 				unref(Renderer) && unref(Renderer).style ? (openBlock(), createBlock(unref(collapse_default), {
 					key: 1,
 					title: "样式配置",
-					visible: false,
 					class: "panel-collapse"
 				}, {
 					expandIcon: withCtx(({ open }) => [createVNode(field_panel_chevron_default, { expanded: open }, null, 8, ["expanded"])]),
@@ -165982,7 +166121,6 @@ var FieldPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 				unref(Renderer) && unref(fieldMeta).field ? (openBlock(), createBlock(unref(collapse_default), {
 					key: 2,
 					title: "组件依赖",
-					visible: false,
 					class: "panel-collapse"
 				}, {
 					expandIcon: withCtx(({ open }) => [createVNode(field_panel_chevron_default, { expanded: open }, null, 8, ["expanded"])]),
@@ -166020,7 +166158,7 @@ var schema$3 = {
 			value: (attachFieldTarget === null || attachFieldTarget === void 0 ? void 0 : attachFieldTarget.attachFieldLabel) ?? "引用字段"
 		}];
 	},
-	render: /* @__PURE__ */ _plugin_vue_export_helper_default(FieldPanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-a9a74705"]])
+	render: /* @__PURE__ */ _plugin_vue_export_helper_default(FieldPanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-7e6026cd"]])
 };
 //#endregion
 //#region src/suites/edhr/panel-schema/paper-widget/PaperWidgetPanel.vue?vue&type=script&setup=true&lang.ts

package/dist/runtime/designer/ribbon/constant/font.d.ts

@@ -13,13 +13,21 @@ export declare const FontFamilyOptions: {
     label: string;
     value: FontFamilyEnum;
 }[];
-export declare const FontSizeOptions: ({
+export type FontSizeOption = {
     label: string;
+    /** 唯一标识，写入文档后用于区分同磅值的号数/数字项 */
     value: string;
-} | {
-    label: string;
-    value: number;
-})[];
+    pt: number;
+};
+export declare const DEFAULT_FONT_SIZE_OPTION = "cn-12";
+export declare const FontSizeOptions: FontSizeOption[];
+export declare function getFontSizeOptionPt(value: string): number | undefined;
+export declare function layoutPxToPt(px: number): number;
+/** 无存储项时，按磅值回退到号数项 */
+export declare function resolveFontSizeOptionFromLayout(raw: {
+    fontSize?: number;
+    fontSizeOption?: string;
+}): string;
 export declare const ParagraphTitleOptions: {
     label: string;
     value: string;

package/dist/word.css

@@ -10423,19 +10423,19 @@ textarea[data-v-a7d89044]::placeholder {
   height: 16px;
   margin-right: 8px;
 }
-.items-container[data-v-628a3f22] {
+.items-container[data-v-a478a99a] {
   display: inline-flex;
   align-items: center;
   height: 42px;
   overflow: hidden;
 }
-.ribbon-tab-item[data-v-628a3f22] {
+.ribbon-tab-item[data-v-a478a99a] {
   display: inline-flex;
   flex-shrink: 0;
   align-items: center;
   gap: 6px;
 }
-.split-divider[data-v-628a3f22] {
+.split-divider[data-v-a478a99a] {
   display: inline-block;
   flex-shrink: 0;
   width: 1px;
@@ -10443,11 +10443,11 @@ textarea[data-v-a7d89044]::placeholder {
   margin: 0 6px;
   background-color: rgba(13, 13, 13, 0.12);
 }
-.title-style-bottom-bar[data-v-628a3f22] {
+.title-style-bottom-bar[data-v-a478a99a] {
   position: relative;
   padding: 8px;
 }
-.title-style-bottom-bar[data-v-628a3f22]::before {
+.title-style-bottom-bar[data-v-a478a99a]::before {
   content: '';
   position: absolute;
   top: 0;
@@ -10458,11 +10458,11 @@ textarea[data-v-a7d89044]::placeholder {
   margin-left: 8px;
   background: #f0f0f0;
 }
-.title-style-bottom-bar .content[data-v-628a3f22] {
+.title-style-bottom-bar .content[data-v-a478a99a] {
   padding: 6px 8px;
   border-radius: 4px;
 }
-.title-style-bottom-bar .content[data-v-628a3f22]:hover {
+.title-style-bottom-bar .content[data-v-a478a99a]:hover {
   background: rgba(13, 13, 13, 0.06);
 }
 .v-popper__popper.paragraph-title-select-dropdown .option-label {
@@ -12461,86 +12461,86 @@ svg.portrait-icon[data-v-8bdb451e] {
 .field-tree-node[data-v-00885c69] {
   margin-bottom: 3px;
 }
-.field-tree-select[data-v-60520932] {
-  position: relative;
+.field-tree-select[data-v-e4650f63] {
   display: inline-block;
-  width: 100%;
+  position: relative;
   box-sizing: border-box;
+  width: 100%;
 }
-.field-tree-select__trigger[data-v-60520932] {
-  position: relative;
+.field-tree-select__trigger[data-v-e4650f63] {
   display: flex;
+  position: relative;
+  box-sizing: border-box;
   align-items: center;
   min-height: 32px;
   padding: 4px 28px 4px 8px;
+  transition: border-color 0.2s;
   border: 1px solid #d9d9d9;
   border-radius: 4px;
   background: #fff;
   cursor: pointer;
-  box-sizing: border-box;
-  transition: border-color 0.2s;
 }
-.field-tree-select__trigger[data-v-60520932]:hover {
+.field-tree-select__trigger[data-v-e4650f63]:hover {
   border-color: #026ac8;
 }
-.field-tree-select__trigger.open[data-v-60520932] {
+.field-tree-select__trigger.open[data-v-e4650f63] {
   border-color: #026ac8;
   box-shadow: 0 0 0 2px rgba(2, 106, 200, 0.1);
 }
-.field-tree-select__trigger-icon[data-v-60520932] {
+.field-tree-select__trigger-icon[data-v-e4650f63] {
   flex-shrink: 0;
   margin-right: 8px;
 }
-.field-tree-select__input[data-v-60520932] {
+.field-tree-select__input[data-v-e4650f63] {
   flex: 1;
   min-width: 0;
+  padding: 0;
   border: none;
   outline: none;
   background: transparent;
+  color: #0d0d0d;
   font-size: 13px;
   line-height: 22px;
-  color: #0d0d0d;
-  padding: 0;
   cursor: pointer;
 }
-.field-tree-select__input[data-v-60520932]::placeholder {
+.field-tree-select__input[data-v-e4650f63]::placeholder {
   color: rgba(0, 0, 0, 0.45);
 }
-.field-tree-select__input.has-value[data-v-60520932]::placeholder {
+.field-tree-select__input.has-value[data-v-e4650f63]::placeholder {
   color: #0d0d0d;
 }
-.field-tree-select__trigger.open .field-tree-select__input[data-v-60520932] {
+.field-tree-select__trigger.open .field-tree-select__input[data-v-e4650f63] {
   cursor: text;
 }
-.field-tree-select__suffix-icon[data-v-60520932] {
+.field-tree-select__suffix-icon[data-v-e4650f63] {
+  display: flex;
   position: absolute;
-  right: 6px;
   top: 50%;
-  transform: translateY(-50%);
-  display: flex;
+  right: 6px;
   align-items: center;
+  transform: translateY(-50%);
   pointer-events: none;
 }
-.field-tree-select__clear[data-v-60520932] {
+.field-tree-select__clear[data-v-e4650f63] {
+  display: flex;
   position: absolute;
-  right: 6px;
   top: 50%;
-  transform: translateY(-50%);
-  display: flex;
+  right: 6px;
   align-items: center;
+  transform: translateY(-50%);
   cursor: pointer;
 }
-.field-tree-select__clear[data-v-60520932]:hover {
+.field-tree-select__clear[data-v-e4650f63]:hover {
   opacity: 0.7;
 }
 .field-tree-dropdown {
-  background: #fff;
+  box-sizing: border-box;
+  overflow: hidden;
   border: 1px solid rgba(13, 13, 13, 0.12);
   border-radius: 8px;
+  background: #fff;
   box-shadow: 0 12px 32px rgba(13, 13, 13, 0.08);
-  overflow: hidden;
   isolation: isolate;
-  box-sizing: border-box;
 }
 .field-tree-dropdown__scrollbar {
   max-height: 280px;
@@ -12549,25 +12549,25 @@ svg.portrait-icon[data-v-8bdb451e] {
   padding: 4px;
 }
 .field-tree-dropdown__empty {
-  height: 80px;
   display: flex;
   align-items: center;
   justify-content: center;
+  height: 80px;
   color: #c3c3c3;
   font-size: 13px;
 }
 .field-tree-dropdown .field-tree-option {
-  position: relative;
   display: flex;
+  position: relative;
+  box-sizing: border-box;
   align-items: center;
+  padding: 5px 8px;
+  transition: background 0.2s;
+  border-radius: 6px;
   color: #0d0d0d;
   font-size: 14px;
-  border-radius: 6px;
   white-space: nowrap;
-  padding: 5px 8px;
   cursor: pointer;
-  transition: background 0.2s;
-  box-sizing: border-box;
 }
 .field-tree-dropdown .field-tree-option:not(.selected):not(.disabled):hover {
   background: rgba(13, 13, 13, 0.06);
@@ -12590,35 +12590,35 @@ svg.portrait-icon[data-v-8bdb451e] {
   background: transparent;
 }
 .field-tree-dropdown .field-tree-option .field-tree-option__switcher {
-  width: 16px;
   display: inline-flex;
+  flex-shrink: 0;
   align-items: center;
   justify-content: center;
+  width: 16px;
   margin-right: 4px;
-  flex-shrink: 0;
 }
 .field-tree-dropdown .field-tree-option .field-tree-option__switcher.placeholder {
   visibility: hidden;
 }
 .field-tree-dropdown .field-tree-option .field-tree-option__icon {
   display: inline-flex;
+  flex-shrink: 0;
   width: 16px;
   height: 16px;
   margin-right: 8px;
-  flex-shrink: 0;
 }
 .field-tree-dropdown .field-tree-option .field-tree-option__label {
   flex: 1;
   min-width: 0;
-  line-height: 24px;
   overflow: hidden;
+  color: #1a1d23;
+  line-height: 24px;
   text-overflow: ellipsis;
   white-space: nowrap;
-  color: #1a1d23;
 }
 .field-tree-dropdown .field-tree-option .field-tree-option__label .gct-is-highlight {
-  color: #026ac8;
   background: transparent;
+  color: #026ac8;
 }
 .field-map-row[data-v-886ee467] {
   display: grid;
@@ -12938,13 +12938,13 @@ svg.portrait-icon[data-v-8bdb451e] {
   display: block;
   flex: none;
 }
-.panel-field[data-v-a9a74705] {
+.panel-field[data-v-7e6026cd] {
   position: relative;
 }
-.panel-field .container[data-v-a9a74705] {
+.panel-field .container[data-v-7e6026cd] {
   padding: 15px 16px 16px;
 }
-.panel-field[data-v-a9a74705] .container > .form-item {
+.panel-field[data-v-7e6026cd] .container > .form-item {
   align-items: flex-start;
   min-height: 18px;
   margin-top: 10px !important;
@@ -12954,10 +12954,10 @@ svg.portrait-icon[data-v-8bdb451e] {
   font-weight: 400;
   line-height: 18px;
 }
-.panel-field[data-v-a9a74705] .container > .form-item:first-child {
+.panel-field[data-v-7e6026cd] .container > .form-item:first-child {
   margin-top: 0 !important;
 }
-.panel-field[data-v-a9a74705] .container > .form-item > .form-item__label {
+.panel-field[data-v-7e6026cd] .container > .form-item > .form-item__label {
   flex: 0 0 96px;
   width: 96px;
   overflow: hidden;
@@ -12969,7 +12969,7 @@ svg.portrait-icon[data-v-8bdb451e] {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.panel-field[data-v-a9a74705] .container > .form-item > .form-item__content {
+.panel-field[data-v-7e6026cd] .container > .form-item > .form-item__content {
   min-width: 0;
   overflow: hidden;
   color: #1a1d23;
@@ -12978,7 +12978,7 @@ svg.portrait-icon[data-v-8bdb451e] {
   font-weight: 400;
   line-height: 18px;
 }
-.panel-field[data-v-a9a74705] .collapse.panel-collapse > .collapse-header {
+.panel-field[data-v-7e6026cd] .collapse.panel-collapse > .collapse-header {
   box-sizing: border-box;
   align-items: center;
   height: 36px;
@@ -12991,11 +12991,11 @@ svg.portrait-icon[data-v-8bdb451e] {
   line-height: 18px;
   background: #f9fafb;
 }
-.panel-field[data-v-a9a74705] .collapse.panel-collapse.is-first > .collapse-header {
+.panel-field[data-v-7e6026cd] .collapse.panel-collapse.is-first > .collapse-header {
   height: 35px;
   min-height: 35px;
 }
-.panel-field[data-v-a9a74705] .collapse.panel-collapse .expand-icon {
+.panel-field[data-v-7e6026cd] .collapse.panel-collapse .expand-icon {
   display: flex;
   align-items: center;
   height: 16px;

package/package.json

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