@gct-paas/word 0.1.73-patch.2 → 0.1.73-patch.4

package/dist/base/utils/image-size-util.d.ts

@@ -20,6 +20,8 @@ export declare function computeImageDisplaySize(natural: ImageSize, opts?: Image
  * 在目标框内等比缩放（contain），不压缩、不拉伸
  */
 export declare function computeContainDisplaySize(natural: ImageSize, box: ImageSize): ImageSize;
+/** 同步取无图签名缓存（布局重建时可避免先闪占位再异步补图） */
+export declare function getCachedSignatureImage(name: string, width?: number, height?: number, time?: number | string): HTMLImageElement | null;
 /**
  * 创建无图签名兜底图（用户名 + 电子签名 + 验证日期）
  * 按字段宽高绘制，显示框设多大，字就按多大排

package/dist/core/model/document/Wtbl/Calculation.d.ts

@@ -25,7 +25,13 @@ export declare class WtblCalculation {
      */
     private static processBounded;
     /**
-     * 处理 boundedItem 数据
+     * 按 itemRegion.id 查找嵌套的数据分组 / 动态关联区域
+     * （itemRegion 不在 table.regions 顶层，不能用 findRegionById）
+     */
+    private static findItemRegionById;
+    private static applyBoundsToItemRegion;
+    /**
+     * 处理 boundedItem 数据（更新父级 bounded 的 itemRegion 边界）
      */
     private static processBoundedItem;
     /**
@@ -33,7 +39,7 @@ export declare class WtblCalculation {
      */
     private static processCheckTable;
     /**
-     * 处理 dataGroup2D 数据
+     * 处理 dataGroup2D 数据（更新检验表 / 二维表上的 itemRegion 边界）
      */
     private static processDataGroup2D;
 }

package/dist/core/model/document/Wtbl/RowColumnOps.d.ts

@@ -9,11 +9,23 @@ export declare class WtblRowColumnOps {
     /** 仅外表需要做「删除行/列/表时联动删除嵌套表」 */
     private static detachNestedTablesFromOuterTable;
     /**
-     * 新单元格同步引用信息
-     * refCell: 参考单元格 (above | left)
-     * nextRefCell: 后参考单元格 (below | right )，如果传入，需要跟 refCell 比对一致后同步
+     * 新单元格同步引用信息（mergeId / subTable / subTableItem / header）
+     *
+     * 必须两侧参考单元格都存在，且对应字段一致，才写入新格。
+     * 单侧缺失（表边界、子表外侧空行）不同步，避免检验表等 region
+     * 在「上一行/下一行插入」时被错误扩大，进而触发重叠校验误报。
      */
     private static syncRefInfo;
+    /**
+     * 在 insertIndex 处插入一行后，将落在该行及以下的 region / itemRegion 行号整体 +1。
+     * 否则仅靠单元格标记回写时，动态关联 itemRegion 若未能匹配 id，边界会留在原行，
+     * 设计端字段与背景框就不会随检验表下移。
+     */
+    private static shiftRegionsForRowInsert;
+    /**
+     * 在 insertIndex 处插入一列后，将落在该列及右侧的 region / itemRegion 列号整体 +1。
+     */
+    private static shiftRegionsForColInsert;
     /**
      * 在指定行位置插入新行
      */

package/dist/domain/table/business/check/check-table/actions/fetch-check-items.d.ts

@@ -1,6 +1,7 @@
 import { CheckTableItemInfosPayload, CheckTableRegionRef } from '../types';
 /**
  * 按已扫描的检验表 region 并行拉取检验项详情。
+ * @param instanceId 真实填报实例 id；设计态 / 模拟填报应传空字符串（默认数据源将跳过请求）
  * @returns infosMap / countMap（count 至少为 1，用于占位行）
  */
 export declare function fetchCheckItemsForRegions(instanceId: string, regions: CheckTableRegionRef[]): Promise<{

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @gct-paas/word v0.1.73-patch.2 */
+/*! @gct-paas/word v0.1.73-patch.4 */
 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, toRaw, toRef, toValue, unref, useCssVars, useModel, useSlots, vModelText, vShow, watch, watchEffect, withCtx, withDirectives, withKeys, withModifiers } from "vue";
 import FloatingVue, { PopperWrapper } from "floating-vue";
 import VueKonva from "vue-konva";
@@ -92458,16 +92458,16 @@ async function fetchCustomCheckDsData(customCheckDsItems) {
 	return toPayload(await callBizService(CUSTOM_API, { ids: customCheckDsItems.join(",") }));
 }
 async function fetchOneRegionInfo(instanceId, region) {
-	if (!instanceId) return EMPTY_INFO;
 	const props = region.props ?? {};
 	const checkDsType = props.checkDsType;
 	const customCheckDsItems = Array.isArray(props.customCheckDsItems) ? props.customCheckDsItems : [];
-	const info = checkDsType === CheckDsTypeEnum.CUSTOM ? await fetchCustomCheckDsData(customCheckDsItems) : await fetchCheckDsDataForTable(instanceId);
+	const info = checkDsType === CheckDsTypeEnum.CUSTOM ? await fetchCustomCheckDsData(customCheckDsItems) : instanceId ? await fetchCheckDsDataForTable(instanceId) : EMPTY_INFO;
 	for (const item of info.data) delete item.id_;
 	return info;
 }
 /**
 * 按已扫描的检验表 region 并行拉取检验项详情。
+* @param instanceId 真实填报实例 id；设计态 / 模拟填报应传空字符串（默认数据源将跳过请求）
 * @returns infosMap / countMap（count 至少为 1，用于占位行）
 */
 async function fetchCheckItemsForRegions(instanceId, regions) {
@@ -100569,11 +100569,12 @@ var init_BoundedRegion = __esmMin((() => {
 				widgetMeta: json.widgetMeta
 			});
 			if (json.itemRegion) {
-				var _json$itemRegion, _json$itemRegion2;
+				var _json$itemRegion, _json$itemRegion2, _json$itemRegion3;
 				region.itemRegion = new BoundedItemRegion({
 					table,
-					start: (_json$itemRegion = json.itemRegion) === null || _json$itemRegion === void 0 ? void 0 : _json$itemRegion.start,
-					end: (_json$itemRegion2 = json.itemRegion) === null || _json$itemRegion2 === void 0 ? void 0 : _json$itemRegion2.end,
+					id: (_json$itemRegion = json.itemRegion) === null || _json$itemRegion === void 0 ? void 0 : _json$itemRegion.id,
+					start: (_json$itemRegion2 = json.itemRegion) === null || _json$itemRegion2 === void 0 ? void 0 : _json$itemRegion2.start,
+					end: (_json$itemRegion3 = json.itemRegion) === null || _json$itemRegion3 === void 0 ? void 0 : _json$itemRegion3.end,
 					parent: region
 				});
 			}
@@ -100677,11 +100678,12 @@ var init_LinkSubTableRegion = __esmMin((() => {
 		}
 		static restoreItemRegion(region, json, table) {
 			if (json.itemRegion) {
-				var _json$itemRegion, _json$itemRegion2;
+				var _json$itemRegion, _json$itemRegion2, _json$itemRegion3;
 				region.itemRegion = new DataGroup2DRegion({
 					table,
-					start: (_json$itemRegion = json.itemRegion) === null || _json$itemRegion === void 0 ? void 0 : _json$itemRegion.start,
-					end: (_json$itemRegion2 = json.itemRegion) === null || _json$itemRegion2 === void 0 ? void 0 : _json$itemRegion2.end,
+					id: (_json$itemRegion = json.itemRegion) === null || _json$itemRegion === void 0 ? void 0 : _json$itemRegion.id,
+					start: (_json$itemRegion2 = json.itemRegion) === null || _json$itemRegion2 === void 0 ? void 0 : _json$itemRegion2.start,
+					end: (_json$itemRegion3 = json.itemRegion) === null || _json$itemRegion3 === void 0 ? void 0 : _json$itemRegion3.end,
 					parent: region
 				});
 			}
@@ -100918,19 +100920,50 @@ var init_RowColumnOps = __esmMin((() => {
 			table.collectNestedTables().forEach((nested) => nested.remove());
 		}
 		/**
-		* 新单元格同步引用信息
-		* refCell: 参考单元格 (above | left)
-		* nextRefCell: 后参考单元格 (below | right )，如果传入，需要跟 refCell 比对一致后同步
+		* 新单元格同步引用信息（mergeId / subTable / subTableItem / header）
+		*
+		* 必须两侧参考单元格都存在，且对应字段一致，才写入新格。
+		* 单侧缺失（表边界、子表外侧空行）不同步，避免检验表等 region
+		* 在「上一行/下一行插入」时被错误扩大，进而触发重叠校验误报。
 		*/
-		static syncRefInfo(newCell, refCell, nextRefCell) {
+		static syncRefInfo(newCell, sideA, sideB) {
+			if (!sideA || !sideB) return;
 			WTC_REF_KEYS.forEach((key) => {
-				const refValue = refCell[key];
+				const refValue = sideA[key];
 				if (!refValue) return;
-				if (nextRefCell && JSON.stringify(nextRefCell[key]) !== JSON.stringify(refValue)) return;
+				if (JSON.stringify(sideB[key]) !== JSON.stringify(refValue)) return;
 				newCell[key] = refValue;
 			});
 		}
 		/**
+		* 在 insertIndex 处插入一行后，将落在该行及以下的 region / itemRegion 行号整体 +1。
+		* 否则仅靠单元格标记回写时，动态关联 itemRegion 若未能匹配 id，边界会留在原行，
+		* 设计端字段与背景框就不会随检验表下移。
+		*/
+		static shiftRegionsForRowInsert(table, insertIndex) {
+			for (const region of table.regions) {
+				if (region.start.row >= insertIndex) region.start.row += 1;
+				if (region.end.row >= insertIndex) region.end.row += 1;
+				const itemRegion = region.itemRegion;
+				if (!itemRegion) continue;
+				if (itemRegion.start.row >= insertIndex) itemRegion.start.row += 1;
+				if (itemRegion.end.row >= insertIndex) itemRegion.end.row += 1;
+			}
+		}
+		/**
+		* 在 insertIndex 处插入一列后，将落在该列及右侧的 region / itemRegion 列号整体 +1。
+		*/
+		static shiftRegionsForColInsert(table, insertIndex) {
+			for (const region of table.regions) {
+				if (region.start.col >= insertIndex) region.start.col += 1;
+				if (region.end.col >= insertIndex) region.end.col += 1;
+				const itemRegion = region.itemRegion;
+				if (!itemRegion) continue;
+				if (itemRegion.start.col >= insertIndex) itemRegion.start.col += 1;
+				if (itemRegion.end.col >= insertIndex) itemRegion.end.col += 1;
+			}
+		}
+		/**
 		* 在指定行位置插入新行
 		*/
 		static insertRowAt(table, index) {
@@ -100944,6 +100977,7 @@ var init_RowColumnOps = __esmMin((() => {
 					this.syncRefInfo(cell, above, below);
 				});
 				table.insertChildAt(index, newRow);
+				this.shiftRegionsForRowInsert(table, index);
 			} });
 		}
 		/**
@@ -100953,11 +100987,13 @@ var init_RowColumnOps = __esmMin((() => {
 			const refRow = table.getChildAt(index);
 			if (!refRow) return;
 			table.runConsistencyMutation({ mutate: () => {
+				const above = table.rows[index - 1];
 				const newRow = Wtr.fromTemplate(table.colWidths || []);
 				newRow.children.forEach((cell, cellIndex) => {
-					this.syncRefInfo(cell, refRow.cells[cellIndex]);
+					this.syncRefInfo(cell, above === null || above === void 0 ? void 0 : above.cells[cellIndex], refRow.cells[cellIndex]);
 				});
 				table.insertBefore(refRow, newRow);
+				this.shiftRegionsForRowInsert(table, index);
 			} });
 		}
 		/**
@@ -100967,11 +101003,13 @@ var init_RowColumnOps = __esmMin((() => {
 			const refRow = table.getChildAt(index);
 			if (!refRow) return;
 			table.runConsistencyMutation({ mutate: () => {
+				const below = table.rows[index + 1];
 				const newRow = Wtr.fromTemplate(table.colWidths || []);
 				newRow.children.forEach((cell, cellIndex) => {
-					this.syncRefInfo(cell, refRow.cells[cellIndex]);
+					this.syncRefInfo(cell, refRow.cells[cellIndex], below === null || below === void 0 ? void 0 : below.cells[cellIndex]);
 				});
 				table.insertAfter(refRow, newRow);
+				this.shiftRegionsForRowInsert(table, index + 1);
 			} });
 		}
 		/**
@@ -100988,6 +101026,7 @@ var init_RowColumnOps = __esmMin((() => {
 					this.syncRefInfo(newCell, left, right);
 				}
 				if (table.colWidths) table.colWidths.splice(index, 0, colWidth);
+				this.shiftRegionsForColInsert(table, index);
 			} });
 		}
 		/**
@@ -100997,13 +101036,15 @@ var init_RowColumnOps = __esmMin((() => {
 			table.runConsistencyMutation({ mutate: () => {
 				const colWidth = DEFAULT_WIDTH;
 				for (const row of table.rows) {
-					const refCell = row.cells[index];
-					if (!refCell) continue;
+					const right = row.cells[index];
+					if (!right) continue;
+					const left = row.cells[index - 1];
 					const newCell = Wtc.fromTemplate(colWidth);
-					this.syncRefInfo(newCell, refCell);
+					this.syncRefInfo(newCell, left, right);
 					row.insertChildAt(index, newCell);
 				}
 				if (table.colWidths) table.colWidths.splice(index, 0, colWidth);
+				this.shiftRegionsForColInsert(table, index);
 			} });
 		}
 		/**
@@ -101013,13 +101054,15 @@ var init_RowColumnOps = __esmMin((() => {
 			table.runConsistencyMutation({ mutate: () => {
 				const colWidth = DEFAULT_WIDTH;
 				for (const row of table.rows) {
-					const refCell = row.cells[index];
-					if (!refCell) continue;
+					const left = row.cells[index];
+					if (!left) continue;
+					const right = row.cells[index + 1];
 					const newCell = Wtc.fromTemplate(colWidth);
-					this.syncRefInfo(newCell, refCell);
+					this.syncRefInfo(newCell, left, right);
 					row.insertChildAt(index + 1, newCell);
 				}
 				if (table.colWidths) table.colWidths.splice(index + 1, 0, colWidth);
+				this.shiftRegionsForColInsert(table, index + 1);
 			} });
 		}
 		/**
@@ -101590,19 +101633,36 @@ var init_Calculation = __esmMin((() => {
 			}
 		}
 		/**
-		* 处理 boundedItem 数据
+		* 按 itemRegion.id 查找嵌套的数据分组 / 动态关联区域
+		* （itemRegion 不在 table.regions 顶层，不能用 findRegionById）
+		*/
+		static findItemRegionById(table, itemId) {
+			for (const region of table.regions) {
+				if (region.type === "bounded") {
+					const item = region.itemRegion;
+					if ((item === null || item === void 0 ? void 0 : item.id) === itemId) return item;
+				}
+				if (isLinkSubTableType(region.type)) {
+					const item = region.itemRegion;
+					if ((item === null || item === void 0 ? void 0 : item.id) === itemId) return item;
+				}
+			}
+		}
+		static applyBoundsToItemRegion(itemRegion, bounds) {
+			itemRegion.start.row = bounds.minRow;
+			itemRegion.end.row = bounds.maxRow;
+			itemRegion.start.col = bounds.minCol;
+			itemRegion.end.col = bounds.maxCol;
+		}
+		/**
+		* 处理 boundedItem 数据（更新父级 bounded 的 itemRegion 边界）
 		*/
 		static processBoundedItem(table, boundedItemGroups) {
 			for (const [groupId, positions] of boundedItemGroups.entries()) {
 				if (positions.length === 0) continue;
-				const { minRow, maxRow, minCol, maxCol } = calculateGroupBounds(positions);
-				const region = table.findRegionById(groupId);
-				if (region && region.type === "bounded") {
-					region.start.row = minRow;
-					region.end.row = maxRow;
-					region.start.col = minCol;
-					region.end.col = maxCol;
-				}
+				const itemRegion = this.findItemRegionById(table, groupId);
+				if (!itemRegion) continue;
+				this.applyBoundsToItemRegion(itemRegion, calculateGroupBounds(positions));
 			}
 		}
 		/**
@@ -101622,19 +101682,14 @@ var init_Calculation = __esmMin((() => {
 			}
 		}
 		/**
-		* 处理 dataGroup2D 数据
+		* 处理 dataGroup2D 数据（更新检验表 / 二维表上的 itemRegion 边界）
 		*/
 		static processDataGroup2D(table, dataGroup2DGroups) {
 			for (const [groupId, positions] of dataGroup2DGroups.entries()) {
 				if (positions.length === 0) continue;
-				const { minRow, maxRow, minCol, maxCol } = calculateGroupBounds(positions);
-				const region = table.findRegionById(groupId);
-				if (region && isLinkSubTableType(region.type)) {
-					region.start.row = minRow;
-					region.end.row = maxRow;
-					region.start.col = minCol;
-					region.end.col = maxCol;
-				}
+				const itemRegion = this.findItemRegionById(table, groupId);
+				if (!itemRegion) continue;
+				this.applyBoundsToItemRegion(itemRegion, calculateGroupBounds(positions));
 			}
 		}
 	};
@@ -105483,6 +105538,50 @@ function isTableNested(doc, tableId) {
 		return (meta === null || meta === void 0 ? void 0 : meta.component) === BuiltinComponentTypeConst.TableCell;
 	});
 }
+/**
+* 按合并单元格把选区列范围扩成完整矩形。
+*
+* 横向合并只能点到主格（tableCellIndex 为起点列），从上往下拖进合并区时
+* anchor/focus 往往同为起点列，右侧从格进不了选区。
+* 需把选中格所属合并区的完整 colspan 扩进 [colFrom, colTo]。
+*/
+function expandColRangeForMergedCells(doc, tableLines, colFrom, colTo) {
+	let from = colFrom;
+	let to = colTo;
+	for (let guard = 0; guard < 32; guard++) {
+		let expanded = false;
+		for (const line of tableLines) {
+			const colCount = line.nextIds.length;
+			for (let ci = from; ci <= to && ci < colCount; ci++) {
+				const cellId = line.nextIds[ci];
+				if (!cellId) continue;
+				const cell = doc.layoutMapper.getLayoutNodeById(cellId);
+				if (!cell) continue;
+				let spanStart = ci;
+				let spanEnd = ci;
+				if (cell.mergeFromId) {
+					const master = doc.layoutMapper.getLayoutNodeById(cell.mergeFromId);
+					if (!master) continue;
+					spanStart = ci - (cell.mergeRefColOffset ?? 0);
+					spanEnd = spanStart + (master.colspan || 1) - 1;
+				} else if ((cell.colspan || 1) > 1) spanEnd = ci + (cell.colspan || 1) - 1;
+				else continue;
+				const nextFrom = Math.min(from, Math.max(0, spanStart));
+				const nextTo = Math.max(to, Math.min(colCount - 1, spanEnd));
+				if (nextFrom !== from || nextTo !== to) {
+					from = nextFrom;
+					to = nextTo;
+					expanded = true;
+				}
+			}
+		}
+		if (!expanded) break;
+	}
+	return {
+		colFrom: from,
+		colTo: to
+	};
+}
 function findEnclosingTable(node) {
 	let current = node;
 	while (current) {
@@ -105685,43 +105784,46 @@ function getSelectLinesInfo(doc, selection, upgrade) {
 		}
 	}
 	const rangeWidgetIds = [];
-	scopedSelectedLines.forEach((line) => {
-		if (line.type !== "tablerow") return;
-		if (tableMode === "cell-range") {
+	if (tableMode === "cell-range") {
+		const tableLines = scopedSelectedLines.filter((line) => line.type === "tablerow");
+		if (tableLines.length > 0) {
+			const firstLine = tableLines[0];
 			const startCI = typeof scopedStartCellIndex === "number" ? scopedStartCellIndex : 0;
-			const endCI = typeof scopedEndCellIndex === "number" ? scopedEndCellIndex : typeof focusClampToLast === "boolean" ? focusClampToLast ? (line.nextIds.length ?? 1) - 1 : 0 : typeof scopedStartCellIndex === "number" ? scopedStartCellIndex : (line.nextIds.length ?? 1) - 1;
-			const colFrom = Math.min(startCI, endCI);
-			const colTo = Math.max(startCI, endCI);
-			for (let ci = colFrom; ci <= colTo; ci++) {
+			const endCI = typeof scopedEndCellIndex === "number" ? scopedEndCellIndex : typeof focusClampToLast === "boolean" ? focusClampToLast ? (firstLine.nextIds.length ?? 1) - 1 : 0 : typeof scopedStartCellIndex === "number" ? scopedStartCellIndex : (firstLine.nextIds.length ?? 1) - 1;
+			let colFrom = Math.min(startCI, endCI);
+			let colTo = Math.max(startCI, endCI);
+			({colFrom, colTo} = expandColRangeForMergedCells(doc, tableLines, colFrom, colTo));
+			for (const line of tableLines) for (let ci = colFrom; ci <= colTo; ci++) {
 				const cellId = line.nextIds[ci];
 				if (cellId) rangeWidgetIds.push(cellId);
 			}
-		} else if (tableMode === "cell-full") {
-			var _start$line4, _end$line3;
-			const startCellId = (_start$line4 = start.line) === null || _start$line4 === void 0 ? void 0 : _start$line4.tableCellId;
-			const endCellId = (_end$line3 = end.line) === null || _end$line3 === void 0 ? void 0 : _end$line3.tableCellId;
-			if (startCellId && startCellId === endCellId) {
-				var _start$line5;
-				const cell = doc.layoutMapper.getLayoutNodeById(startCellId);
-				const table = doc.layoutMapper.getLayoutNodeById((_start$line5 = start.line) === null || _start$line5 === void 0 ? void 0 : _start$line5.tableId);
-				if (cell && table) {
-					var _start$line6, _start$line7;
-					const startRowIdx = (_start$line6 = start.line) === null || _start$line6 === void 0 ? void 0 : _start$line6.tableRowIndex;
-					const startColIdx = (_start$line7 = start.line) === null || _start$line7 === void 0 ? void 0 : _start$line7.tableCellIndex;
-					const rowspan = cell.rowspan || 1;
-					const colspan = cell.colspan || 1;
-					table.forEachCell({
-						startRowIdx,
-						startColIdx,
-						endRowIdx: startRowIdx + rowspan - 1,
-						endColIdx: startColIdx + colspan - 1,
-						callback: (c) => rangeWidgetIds.push(c.id)
-					});
-				}
+		}
+	} else if (tableMode === "cell-full") {
+		var _start$line4, _end$line3;
+		const startCellId = (_start$line4 = start.line) === null || _start$line4 === void 0 ? void 0 : _start$line4.tableCellId;
+		const endCellId = (_end$line3 = end.line) === null || _end$line3 === void 0 ? void 0 : _end$line3.tableCellId;
+		if (startCellId && startCellId === endCellId) {
+			var _start$line5;
+			const cell = doc.layoutMapper.getLayoutNodeById(startCellId);
+			const table = doc.layoutMapper.getLayoutNodeById((_start$line5 = start.line) === null || _start$line5 === void 0 ? void 0 : _start$line5.tableId);
+			if (cell && table) {
+				var _start$line6, _start$line7;
+				const startRowIdx = (_start$line6 = start.line) === null || _start$line6 === void 0 ? void 0 : _start$line6.tableRowIndex;
+				const startColIdx = (_start$line7 = start.line) === null || _start$line7 === void 0 ? void 0 : _start$line7.tableCellIndex;
+				const rowspan = cell.rowspan || 1;
+				const colspan = cell.colspan || 1;
+				table.forEachCell({
+					startRowIdx,
+					startColIdx,
+					endRowIdx: startRowIdx + rowspan - 1,
+					endColIdx: startColIdx + colspan - 1,
+					callback: (c) => rangeWidgetIds.push(c.id)
+				});
 			}
-		} else if (tableMode === "mixed") {
-			for (const cellId of line.nextIds) if (cellId) rangeWidgetIds.push(cellId);
 		}
+	} else if (tableMode === "mixed") scopedSelectedLines.forEach((line) => {
+		if (line.type !== "tablerow") return;
+		for (const cellId of line.nextIds) if (cellId) rangeWidgetIds.push(cellId);
 	});
 	return {
 		normalized,
@@ -109533,6 +109635,34 @@ var init_InsertText = __esmMin((() => {
 //#endregion
 //#region src/core/command/commands/MergeCells.ts
 var MergeCells_exports = /* @__PURE__ */ __exportAll({ MergeCells: () => MergeCells });
+/**
+* 选区只包含「可视主格」时，补齐其 merge 区域内的从格。
+*
+* 横向合并后从格不渲染、不可点选，跨行再合并时选区往往只有各行主格（同一列）。
+* 若不展开，会把已有 colspan/rowspan 误判成部分重叠。
+*/
+function expandSelectionToMergeRegions(table, selectedCells) {
+	var _table$rows$;
+	const selectedIds = new Set(selectedCells.map((cell) => cell.id));
+	const mergeIds = new Set(selectedCells.map((cell) => cell.mergeId).filter((id) => !!id));
+	const expanded = [];
+	const colCount = ((_table$rows$ = table.rows[0]) === null || _table$rows$ === void 0 ? void 0 : _table$rows$.cells.length) ?? 0;
+	if (colCount === 0 || table.rows.length === 0) return expanded;
+	table.forEachCell({
+		startRowIdx: 0,
+		endRowIdx: table.rows.length - 1,
+		startColIdx: 0,
+		endColIdx: colCount - 1,
+		callback: (cell, row, col) => {
+			if (selectedIds.has(cell.id) || cell.mergeId && mergeIds.has(cell.mergeId)) expanded.push({
+				cell,
+				row,
+				col
+			});
+		}
+	});
+	return expanded;
+}
 var MergeCells;
 var init_MergeCells = __esmMin((() => {
 	init_CommandBase();
@@ -109550,66 +109680,41 @@ var init_MergeCells = __esmMin((() => {
 			const selectedCells = models.map(({ model }) => model);
 			const table = (_selectedCells$ = selectedCells[0]) === null || _selectedCells$ === void 0 ? void 0 : _selectedCells$.table;
 			if (!table) return null;
-			const positions = selectedCells.map((cell) => {
+			if (selectedCells.map((cell) => {
 				var _cell$parent;
 				return {
 					cell,
 					row: ((_cell$parent = cell.parent) === null || _cell$parent === void 0 ? void 0 : _cell$parent.getCurrentIndex()) ?? -1,
 					col: cell.getCurrentIndex() ?? -1
 				};
-			});
-			if (positions.some(({ row, col }) => row < 0 || col < 0)) throw new Error("Invalid table selection");
-			const minRow = Math.min(...positions.map((p) => p.row));
-			const maxRow = Math.max(...positions.map((p) => p.row));
-			const minCol = Math.min(...positions.map((p) => p.col));
-			const maxCol = Math.max(...positions.map((p) => p.col));
-			const rowSpan = maxRow - minRow + 1;
-			const colSpan = maxCol - minCol + 1;
-			const expectedCount = rowSpan * colSpan;
-			const selectedIds = new Set(selectedCells.map((cell) => cell.id));
+			}).some(({ row, col }) => row < 0 || col < 0)) throw new Error("Invalid table selection");
+			let minRow = 0;
+			let maxRow = 0;
+			let minCol = 0;
+			let maxCol = 0;
 			let topLeftCell;
 			table.runConsistencyMutation({
 				validate: () => {
-					if (selectedIds.size !== expectedCount) throw new Error("必须是完整矩形");
-					const mergeRoots = /* @__PURE__ */ new Map();
+					const expanded = expandSelectionToMergeRegions(table, selectedCells);
+					if (expanded.length === 0) throw new Error("Invalid table selection");
+					minRow = Math.min(...expanded.map((p) => p.row));
+					maxRow = Math.max(...expanded.map((p) => p.row));
+					minCol = Math.min(...expanded.map((p) => p.col));
+					maxCol = Math.max(...expanded.map((p) => p.col));
+					const expectedCount = (maxRow - minRow + 1) * (maxCol - minCol + 1);
+					const expandedIds = new Set(expanded.map((p) => p.cell.id));
+					if (expandedIds.size !== expectedCount) throw new Error("必须是完整矩形");
 					for (let row = minRow; row <= maxRow; row++) for (let col = minCol; col <= maxCol; col++) {
 						var _table$rows$row;
 						const cell = (_table$rows$row = table.rows[row]) === null || _table$rows$row === void 0 ? void 0 : _table$rows$row.cells[col];
-						if (!cell || !selectedIds.has(cell.id)) throw new Error("Merge requires a complete rectangle selection");
-						if (!cell.mergeId) continue;
-						if (mergeRoots.has(cell.mergeId)) continue;
-						if (cell.isMergeStart) {
-							mergeRoots.set(cell.mergeId, cell);
-							continue;
-						}
-						let root;
-						table.forEachCell({
-							startRowIdx: 0,
-							endRowIdx: table.children.length - 1,
-							startColIdx: 0,
-							endColIdx: table.rows[0].cells.length - 1,
-							filter: (c) => c.id === cell.mergeId,
-							callback: (c) => {
-								root = c;
-							}
-						});
-						if (root) mergeRoots.set(root.mergeId, root);
-					}
-					for (const root of mergeRoots.values()) {
-						const rRoot = root.parent.getCurrentIndex();
-						const cRoot = root.getCurrentIndex();
-						const rs = root.rowspan || 1;
-						const cs = root.colspan || 1;
-						const endRow = rRoot + rs - 1;
-						const endCol = cRoot + cs - 1;
-						if (rRoot < minRow || endRow > maxRow || cRoot < minCol || endCol > maxCol) throw new Error("Cannot merge: selection partially overlaps an existing merged region");
+						if (!cell || !expandedIds.has(cell.id)) throw new Error("Merge requires a complete rectangle selection");
 					}
 				},
 				mutate: () => {
 					var _table$rows$minRow;
 					topLeftCell = (_table$rows$minRow = table.rows[minRow]) === null || _table$rows$minRow === void 0 ? void 0 : _table$rows$minRow.cells[minCol];
 					if (!topLeftCell) throw new Error("Cannot locate top-left cell for merge");
-					topLeftCell.merge(rowSpan, colSpan, { skipConsistency: true });
+					topLeftCell.merge(maxRow - minRow + 1, maxCol - minCol + 1, { skipConsistency: true });
 				}
 			});
 			const mapper = this.doc.layoutMapper;
@@ -123234,20 +123339,19 @@ function findLastIndex(array, predicate) {
 var BomEntryValidator, BomEntriesValidator;
 var init_bom_validator = __esmMin((() => {
 	init_service$5();
-	init_types$2();
 	init_defineProperty();
 	BomEntryValidator = class {
 		/** 剩于可消耗数量 */
 		get remainingNum() {
 			return this.total - this.hasConsumed;
 		}
-		constructor(bomEntry, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, mcPattern) {
+		constructor(bomEntry, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, noBomMode) {
 			_defineProperty(this, "bomEntry", void 0);
 			_defineProperty(this, "enableSequenceLoading", void 0);
 			_defineProperty(this, "materialNoNum", void 0);
 			_defineProperty(this, "historyData", void 0);
 			_defineProperty(this, "mainMaterialNo", void 0);
-			_defineProperty(this, "mcPattern", void 0);
+			_defineProperty(this, "noBomMode", void 0);
 			_defineProperty(
 				this,
 				/** 该明细使用到的产品的id集合 */
@@ -123277,7 +123381,7 @@ var init_bom_validator = __esmMin((() => {
 			this.materialNoNum = materialNoNum;
 			this.historyData = historyData;
 			this.mainMaterialNo = mainMaterialNo;
-			this.mcPattern = mcPattern;
+			this.noBomMode = noBomMode;
 			this.productIds.push(this.bomEntry.product_id_);
 			this.productCodes[this.bomEntry.product_id_] = this.bomEntry.product_code_;
 			if (this.bomEntry.substitute_material_enabled_ && this.bomEntry.substitute_material_entries_) this.bomEntry.substitute_material_entries_.forEach((i) => {
@@ -123420,21 +123524,21 @@ var init_bom_validator = __esmMin((() => {
 		}
 	};
 	BomEntriesValidator = class {
-		constructor(entries, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, mcPattern) {
+		constructor(entries, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, noBomMode) {
 			_defineProperty(this, "entries", void 0);
 			_defineProperty(this, "enableSequenceLoading", void 0);
 			_defineProperty(this, "materialNoNum", void 0);
 			_defineProperty(this, "historyData", void 0);
 			_defineProperty(this, "mainMaterialNo", void 0);
-			_defineProperty(this, "mcPattern", void 0);
+			_defineProperty(this, "noBomMode", void 0);
 			_defineProperty(this, "bomEntryValidators", void 0);
 			this.entries = entries;
 			this.enableSequenceLoading = enableSequenceLoading;
 			this.materialNoNum = materialNoNum;
 			this.historyData = historyData;
 			this.mainMaterialNo = mainMaterialNo;
-			this.mcPattern = mcPattern;
-			this.bomEntryValidators = entries.map((i) => new BomEntryValidator(i, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, mcPattern));
+			this.noBomMode = noBomMode;
+			this.bomEntryValidators = entries.map((i) => new BomEntryValidator(i, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, noBomMode));
 		}
 		/**
 		* 翻译物料的code
@@ -123472,7 +123576,7 @@ var init_bom_validator = __esmMin((() => {
 		* @param row 单行的数据
 		*/
 		validateInBom(row) {
-			if (this.mcPattern === MaterialConsumptionPatternEnum.RECORD) return;
+			if (this.noBomMode) return;
 			if (!row.product_id_) throw new Error("物料不能为空");
 			if (!this.findUtilByProductId(row.product_id_)) {
 				const name = row.product_id__lb_ || "";
@@ -123545,7 +123649,7 @@ var init_bom_validator = __esmMin((() => {
 		async validateScanCanInsert(arr) {
 			const editRow = arr.find((i) => !i.is_confirmed_);
 			if (!editRow) throw new Error("没有正在编辑的行");
-			if (this.mcPattern === MaterialConsumptionPatternEnum.RECORD) return;
+			if (this.noBomMode) return;
 			this.validateInBom(editRow);
 			await this.validateSequenceLoading(editRow, arr);
 			this.validateSubstitute(arr);
@@ -123826,6 +123930,9 @@ var init_material_consume_table_controller = __esmMin((() => {
 		get mcPattern() {
 			return this.tmplBom.material_consumption_pattern_ ?? this.tmplBomController.defaultMCPattern;
 		}
+		get isRecordPattern() {
+			return this.mcPattern === MaterialConsumptionPatternEnum.RECORD && !this.tmplBom.personal_bom_enabled_;
+		}
 		/**
 		* 解析规则配置
 		*/
@@ -123913,7 +124020,7 @@ var init_material_consume_table_controller = __esmMin((() => {
 			this.tmplBom = tmplBom;
 			this.initScanRule(this.tmplBom.barcode_parsing_rules_id_);
 			markRaw(this);
-			this.bomEntriesValidator = new BomEntriesValidator(this.actualBomEntries, this.enableSequenceLoading, this.materialNoNum, this.tmplBomController.historyData, this.tmplBomController.materialNo, this.mcPattern);
+			this.bomEntriesValidator = new BomEntriesValidator(this.actualBomEntries, this.enableSequenceLoading, this.materialNoNum, this.tmplBomController.historyData, this.tmplBomController.materialNo, this.isRecordPattern);
 		}
 		/** 错误信息 */
 		error(message) {
@@ -124003,7 +124110,6 @@ var init_material_consume_table_controller = __esmMin((() => {
 		async parseScanStr(str, option) {
 			var _this$scanRuleProps;
 			if (!this.isFirstBlankRow() && this.hasEditingRow()) return;
-			const isRecordPattern = this.mcPattern === MaterialConsumptionPatternEnum.RECORD;
 			const data = getParseRuleValue$1(str, this.scanRules);
 			console.log("parseScanStr", data);
 			const arr = await materialCheck({
@@ -124011,15 +124117,15 @@ var init_material_consume_table_controller = __esmMin((() => {
 				production_identification_name_: data.lot,
 				qty_: data.qty,
 				validate_: data.expiration,
-				bom_entries_: isRecordPattern ? null : this.actualBomEntries,
+				bom_entries_: this.isRecordPattern ? null : this.actualBomEntries,
 				operation_id_: this.tmplBomController.operationId
-			}) || (isRecordPattern ? [{ productionIdentificationName: data.lot }] : null);
+			}) || (this.isRecordPattern ? [{ productionIdentificationName: data.lot }] : null);
 			if (!arr) {
 				this.error("扫描的物料不存在或不在bom中");
 				return;
 			}
 			let materialData = arr[0];
-			if (arr.length > 1 && !isRecordPattern) {
+			if (arr.length > 1 && !this.isRecordPattern) {
 				const ids = this.actualTableData.map((i) => i.product_id_);
 				const find = arr.find((j) => ids.includes(j.materialId));
 				if (!find) throw new Error("表格数据里没有匹配的物料，请选择该物料后再扫码");
@@ -124031,7 +124137,7 @@ var init_material_consume_table_controller = __esmMin((() => {
 				qty_: data.qty,
 				is_confirmed_: false
 			};
-			if (isRecordPattern && !row.product_id_) row._scanFallback = true;
+			if (this.isRecordPattern && !row.product_id_) row._scanFallback = true;
 			if ((_this$scanRuleProps = this.scanRuleProps) === null || _this$scanRuleProps === void 0 || (_this$scanRuleProps = _this$scanRuleProps.fillMapArr) === null || _this$scanRuleProps === void 0 ? void 0 : _this$scanRuleProps.length) {
 				const fillData = calcFillData(data, this.scanRuleProps.fillMapArr);
 				console.log("fillData", fillData);
@@ -124116,7 +124222,7 @@ var init_material_consume_table_controller = __esmMin((() => {
 		async confirm(option, subModelKey, doc) {
 			try {
 				if (doc) await this.applyUnitConversionBeforeConfirm(option, doc);
-				if (this.mcPattern === MaterialConsumptionPatternEnum.RECORD) {
+				if (this.isRecordPattern) {
 					const { dataManager, rowIndex, subFieldKey } = option;
 					const row = (dataManager.getRawData()[subFieldKey] ?? [])[rowIndex];
 					if (!row) throw new Error("请填写数据");
@@ -124140,7 +124246,7 @@ var init_material_consume_table_controller = __esmMin((() => {
 			if (!rules.length) return;
 			const rawRows = dataManager.getRawData()[subFieldKey] ?? [];
 			const tableRows = ((_this$tableDataRef = this.tableDataRef) === null || _this$tableDataRef === void 0 ? void 0 : _this$tableDataRef.value) ?? rawRows;
-			const row = this.mcPattern === MaterialConsumptionPatternEnum.RECORD ? tableRows[rowIndex] ?? rawRows[rowIndex] : tableRows.find((item) => !item.is_confirmed_ && !item.deleted_) ?? rawRows.find((item) => !item.is_confirmed_ && !item.deleted_);
+			const row = this.isRecordPattern ? tableRows[rowIndex] ?? rawRows[rowIndex] : tableRows.find((item) => !item.is_confirmed_ && !item.deleted_) ?? rawRows.find((item) => !item.is_confirmed_ && !item.deleted_);
 			if (!row) return;
 			if (!await applyUnitConversionRules({
 				rules,
@@ -125072,7 +125178,7 @@ async function initializeDocumentEngine(props, payload, result) {
 		loadSubModels: true
 	});
 	const cloneRuntimeJson = cloneDeep(JSON.parse(requestInfo.runtimeJson || "{}"));
-	const { runtimeJson: runtimeJsonForModel, infosMap, regions: checkTableRegions } = await prepareCheckTableRuntimeJson(fillModeType === DocModeTypeConst.Edit ? "" : id, cloneRuntimeJson);
+	const { runtimeJson: runtimeJsonForModel, infosMap, regions: checkTableRegions } = await prepareCheckTableRuntimeJson(fillModeType !== DocModeTypeConst.Edit && payload.factoryType === "instance" ? id : "", cloneRuntimeJson);
 	const docModel = ModelConverter.toModel(runtimeJsonForModel);
 	const templateId = result.tid.split(":")[1];
 	await syncMaterialConsumeTableBomInfo(templateId, docModel);
@@ -130347,22 +130453,48 @@ function loadDataUrlAsImage(dataUrl) {
 		img.onload = () => resolve(img);
 	});
 }
+function buildSignatureCacheKey(name, width, height, time) {
+	return `${name}\0${width}x${height}\0${time ?? ""}`;
+}
+/** 同步取无图签名缓存（布局重建时可避免先闪占位再异步补图） */
+function getCachedSignatureImage(name, width = 180, height = 102, time) {
+	const w = Math.max(1, Math.round(width));
+	const h = Math.max(1, Math.round(height));
+	return signatureImageCache.get(buildSignatureCacheKey(name, w, h, time)) ?? null;
+}
 /**
 * 创建无图签名兜底图（用户名 + 电子签名 + 验证日期）
 * 按字段宽高绘制，显示框设多大，字就按多大排
 */
 function createSignatureImageDataUrl(name, width = 180, height = 102, time) {
-	return createFormSignFallbackImage(name, Math.max(1, Math.round(width)), Math.max(1, Math.round(height)), time);
+	const w = Math.max(1, Math.round(width));
+	const h = Math.max(1, Math.round(height));
+	const key = buildSignatureCacheKey(name, w, h, time);
+	const cached = signatureDataUrlCache.get(key);
+	if (cached) return cached;
+	const dataUrl = createFormSignFallbackImage(name, w, h, time);
+	signatureDataUrlCache.set(key, dataUrl);
+	return dataUrl;
 }
 function createSignatureImage(name, width = 180, height = 102, time) {
-	return loadDataUrlAsImage(createSignatureImageDataUrl(name, width, height, time));
+	const w = Math.max(1, Math.round(width));
+	const h = Math.max(1, Math.round(height));
+	const key = buildSignatureCacheKey(name, w, h, time);
+	const cached = signatureImageCache.get(key);
+	if (cached) return Promise.resolve(cached);
+	return loadDataUrlAsImage(createSignatureImageDataUrl(name, w, h, time)).then((img) => {
+		signatureImageCache.set(key, img);
+		return img;
+	});
 }
-var SIGN_CANVAS_BASE_WIDTH, FALLBACK_SIGN_DPR, ELECTRONIC_SIGNATURE_LABEL, DATE_LABEL;
+var SIGN_CANVAS_BASE_WIDTH, FALLBACK_SIGN_DPR, ELECTRONIC_SIGNATURE_LABEL, DATE_LABEL, signatureImageCache, signatureDataUrlCache;
 var init_image_size_util = __esmMin((() => {
 	SIGN_CANVAS_BASE_WIDTH = 240;
 	FALLBACK_SIGN_DPR = 2;
 	ELECTRONIC_SIGNATURE_LABEL = "电子签名";
 	DATE_LABEL = "日期";
+	signatureImageCache = /* @__PURE__ */ new Map();
+	signatureDataUrlCache = /* @__PURE__ */ new Map();
 }));
 //#endregion
 //#region src/runtime/renderer/dialogs/signature/logic.ts
@@ -144518,9 +144650,24 @@ var gct_signature_render_vue_vue_type_script_setup_true_name_gct_signature_rende
 			height: imageHeight.value ?? 102,
 			fill: "#f3f3f3"
 		}));
+		function applyImage(img) {
+			natural.value = {
+				width: img.naturalWidth,
+				height: img.naturalHeight
+			};
+			display.value = computeContainDisplaySize(natural.value, {
+				width: imageWidth.value,
+				height: imageHeight.value
+			});
+			imgRef.value = img;
+		}
 		async function loadImage() {
 			const { src, signature, signTime } = props.widget;
-			if (signature) return await createSignatureImage(signature, imageWidth.value, imageHeight.value, signTime);
+			if (signature) {
+				const cached = getCachedSignatureImage(signature, imageWidth.value, imageHeight.value, signTime);
+				if (cached) return cached;
+				return await createSignatureImage(signature, imageWidth.value, imageHeight.value, signTime);
+			}
 			if (src) return await AssetHelper.loadImage(src);
 			return null;
 		}
@@ -144531,17 +144678,16 @@ var gct_signature_render_vue_vue_type_script_setup_true_name_gct_signature_rende
 			imageWidth.value,
 			imageHeight.value
 		], async () => {
+			if (props.widget.signature) {
+				const cached = getCachedSignatureImage(props.widget.signature, imageWidth.value, imageHeight.value, props.widget.signTime);
+				if (cached) {
+					applyImage(cached);
+					return;
+				}
+			}
 			const img = await loadImage();
 			if (!img) return;
-			natural.value = {
-				width: img.naturalWidth,
-				height: img.naturalHeight
-			};
-			display.value = computeContainDisplaySize(natural.value, {
-				width: imageWidth.value,
-				height: imageHeight.value
-			});
-			imgRef.value = img;
+			applyImage(img);
 		}, { immediate: true });
 		const imageConfig = computed(() => ({
 			x: (imageWidth.value - display.value.width) / 2,

package/dist/runtime/canvas/table/render/material-consume/bom-validator.d.ts

@@ -1,4 +1,4 @@
-import { IBomEntry, IMaterialConsumeData, MaterialConsumptionPatternEnum } from '../../../../../domain/table/business/material/types';
+import { IBomEntry, IMaterialConsumeData } from '../../../../../domain/table/business/material/types';
 export declare class BomEntryValidator {
     bomEntry: IBomEntry;
     /** 是否启用顺序投料 */
@@ -10,7 +10,7 @@ export declare class BomEntryValidator {
     /** 表单实例的批次号 */
     mainMaterialNo: string;
     /** 物料消耗模式 */
-    mcPattern: MaterialConsumptionPatternEnum;
+    noBomMode: boolean;
     /** 该明细使用到的产品的id集合 */
     productIds: string[];
     /** 物料和code的映射 */
@@ -31,7 +31,7 @@ export declare class BomEntryValidator {
     /** 表单实例的批次号 */
     mainMaterialNo: string, 
     /** 物料消耗模式 */
-    mcPattern: MaterialConsumptionPatternEnum);
+    noBomMode: boolean);
     /**
      * 翻译物料的code
      * @param productId
@@ -90,7 +90,7 @@ export declare class BomEntriesValidator {
     /** 表单实例的批次号 */
     mainMaterialNo: string;
     /** 物料消耗模式 */
-    mcPattern: MaterialConsumptionPatternEnum;
+    noBomMode: boolean;
     bomEntryValidators: BomEntryValidator[];
     constructor(entries: IBomEntry[], 
     /** 是否启用顺序投料 */
@@ -102,7 +102,7 @@ export declare class BomEntriesValidator {
     /** 表单实例的批次号 */
     mainMaterialNo: string, 
     /** 物料消耗模式 */
-    mcPattern: MaterialConsumptionPatternEnum);
+    noBomMode: boolean);
     /**
      * 翻译物料的code
      * @param productId

package/dist/runtime/canvas/table/render/material-consume/material-consume-table-controller.d.ts

@@ -89,6 +89,7 @@ export declare class MaterialConsumeTableController {
     get materialNoNum(): number;
     /** 物料消耗模式（自身没有配置的话取环境的默认值） */
     get mcPattern(): MaterialConsumptionPatternEnum;
+    get isRecordPattern(): boolean;
     /**
      * 解析规则数据对象
      */

package/package.json

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