@gct-paas/word 0.1.74-beta.23 → 0.1.74-beta.24

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

@@ -8,6 +8,8 @@ import { DataSlotIndex } from '../../../view/types';
 type ValueType = string | number | undefined | null;
 export declare class FieldBaseHandler extends RunHandlerBase {
     static hasValue(value: ValueType): boolean;
+    /** 图片/附件 url 列表：兼容逗号串与数组 */
+    static normalizeUrlSources(raw: unknown): string[];
     /** 将展示文案拆成逐字 run；空串 split 会得到 []，需单独处理 */
     static toLayoutChars(label: unknown): string[];
     static isPrint(ctx: HandlerContext): boolean;

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @gct-paas/word v0.1.74-beta.23 */
+/*! @gct-paas/word v0.1.74-beta.24 */
 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";
@@ -98448,9 +98448,12 @@ function buildLikeQuery(searchFields, keyword, extraQuery = {}, options) {
 		exp
 	};
 }
+/** 设备可选过滤：使用中 + 校准有效期未过（next_calibration_date_ >= 当前时间） */
 function buildDeviceBaseQuery(extraQuery) {
 	const queryData = {
 		operating_state_: true,
+		"status_.eq": DeviceStatus.IN_USE,
+		"next_calibration_date_.ge": dayjs().format("YYYY-MM-DD HH:mm:ss"),
 		...extraQuery
 	};
 	const deviceTypeId = queryData["device_type_id_.eq"];
@@ -98465,9 +98468,29 @@ function buildDeviceQuickSearchQuery(quickSearchField, keyword, extraQuery) {
 function buildRefQuickSearchQuery(searchField, keyword, extraQuery, options) {
 	return buildLikeQuery((searchField === null || searchField === void 0 ? void 0 : searchField.length) ? searchField : ["code_", "name_"], keyword, { ...extraQuery }, options);
 }
-var QUICK_SEARCH_FIELD_TYPES, QUICK_SEARCH_CREATE_TYPES, DEFAULT_QUICK_SEARCH_FIELDS, FIELD_SEARCH_DEFAULT_EXP;
+var DeviceStatus, QUICK_SEARCH_FIELD_TYPES, QUICK_SEARCH_CREATE_TYPES, DEFAULT_QUICK_SEARCH_FIELDS, FIELD_SEARCH_DEFAULT_EXP;
 var init_quick_search = __esmMin((() => {
 	init_field_type();
+	DeviceStatus = {
+		/** 使用中 */
+		IN_USE: "IN_USE",
+		/** 维修中 */
+		REPAIRING: "REPAIRING",
+		/** 保养中 */
+		MAINTAINING: "MAINTAINING",
+		/** 点检中 */
+		INSPECTING: "INSPECTING",
+		/** 校准中 */
+		CALIBRATING: "CALIBRATING",
+		/** 验证中 */
+		VERIFYING: "VERIFYING",
+		/** 备用 */
+		STANDBY: "STANDBY",
+		/** 停用 */
+		DEACTIVATED: "DEACTIVATED",
+		/** 报废 */
+		SCRAPPED: "SCRAPPED"
+	};
 	QUICK_SEARCH_FIELD_TYPES = [
 		FIELD_TYPE.LONG_TEXT,
 		FIELD_TYPE.TEXT,
@@ -118288,6 +118311,11 @@ var init_FieldBaseHandler = __esmMin((() => {
 		static hasValue(value) {
 			return value !== void 0 && value !== null && value !== "";
 		}
+		/** 图片/附件 url 列表：兼容逗号串与数组 */
+		static normalizeUrlSources(raw) {
+			if (raw == null || raw === "") return [];
+			return (Array.isArray(raw) ? raw : String(raw).split(",")).map((s) => String(s ?? "").trim()).filter(Boolean);
+		}
 		/** 将展示文案拆成逐字 run；空串 split 会得到 []，需单独处理 */
 		static toLayoutChars(label) {
 			if (label === void 0 || label === null || label === "") return [];
@@ -118454,7 +118482,7 @@ var init_FieldBaseHandler = __esmMin((() => {
 			const fontSize = layoutStyle.fontSize ?? 16;
 			const chars = this.toLayoutChars(label);
 			const hasContent = chars.length > 0;
-			let doc = context.doc;
+			const doc = context.doc;
 			this.addFieldMarker({
 				ctx,
 				fontSize,
@@ -118499,7 +118527,7 @@ var init_FieldBaseHandler = __esmMin((() => {
 		static layoutNoValueLabel(ctx) {
 			var _context$doc$model;
 			const { context, wr } = ctx;
-			let doc = context.doc;
+			const doc = context.doc;
 			const textStyle = TextStyleResolver.resolve(wr.rPr, (_context$doc$model = context.doc.model) === null || _context$doc$model === void 0 ? void 0 : _context$doc$model.styles);
 			const measureStyle = {
 				...TextRun.textStyle2LayoutStyle(textStyle),
@@ -118965,14 +118993,15 @@ var init_FieldImageHandler = __esmMin((() => {
 			const valueJson = this.getValue(ctx, wr.valuePath);
 			const isAdaptive = isAdaptiveImageWidgetMeta(wr.widgetMeta);
 			const inCell = context.type === "cell" && !!context.cell;
-			if (valueJson) {
+			const allSources = this.normalizeUrlSources(valueJson);
+			if (allSources.length) {
 				this.addFieldMarker({
 					ctx,
 					fontSize: 16,
 					position: "left"
 				});
 				this.beginPrintField(ctx, true);
-				const filtered = (isAdaptive && inCell ? [valueJson.split(",")[0]] : valueJson.split(",")).map((s) => s === null || s === void 0 ? void 0 : s.trim()).filter(Boolean);
+				const filtered = isAdaptive && inCell ? allSources.slice(0, 1) : allSources;
 				filtered.forEach((src, index) => {
 					var _wr$widgetMeta;
 					const { width, height } = this.resolveImageSize((_wr$widgetMeta = wr.widgetMeta) === null || _wr$widgetMeta === void 0 ? void 0 : _wr$widgetMeta.props, isAdaptive && inCell);
@@ -119257,8 +119286,8 @@ var init_AttachmentHandler = __esmMin((() => {
 		}
 		static layoutField(ctx) {
 			const { context, wr } = ctx;
-			let valueStr = this.getValue(ctx, wr.valuePath);
-			if (valueStr) {
+			const files = this.normalizeUrlSources(this.getValue(ctx, wr.valuePath));
+			if (files.length) {
 				var _context$doc$model;
 				const textStyle = TextStyleResolver.resolve(wr.rPr, (_context$doc$model = context.doc.model) === null || _context$doc$model === void 0 ? void 0 : _context$doc$model.styles);
 				const layoutStyle = TextRun.textStyle2LayoutStyle(textStyle);
@@ -119269,7 +119298,6 @@ var init_AttachmentHandler = __esmMin((() => {
 					position: "left"
 				});
 				this.beginPrintField(ctx, true);
-				const files = String(valueStr).split(",").filter(Boolean);
 				this.layoutFileSummary({
 					ctx,
 					count: files.length,
@@ -119371,16 +119399,8 @@ var init_FieldHandler = __esmMin((() => {
 		static layoutCheckTableValue(ctx, isLinkNotSet) {
 			var _layoutCtx$wr$widgetM, _layoutCtx$wr$widgetM2;
 			const layoutCtx = prepareDynLayoutWr(ctx, isLinkNotSet);
-			if (layoutCtx.context.doc.mode === DocModeTypeConst.Print) {
-				FieldBaseHandler.layoutValue(layoutCtx);
-				return;
-			}
 			const props = ((_layoutCtx$wr$widgetM = layoutCtx.wr.widgetMeta) === null || _layoutCtx$wr$widgetM === void 0 ? void 0 : _layoutCtx$wr$widgetM.props) ?? {};
 			const widgetType = (_layoutCtx$wr$widgetM2 = layoutCtx.wr.widgetMeta) === null || _layoutCtx$wr$widgetM2 === void 0 ? void 0 : _layoutCtx$wr$widgetM2.type;
-			if (props.renderComp === RenderCompTypeConst.Checkbox || props.renderComp === RenderCompTypeConst.Radio) {
-				OptionHandler.layout(layoutCtx);
-				return;
-			}
 			if (widgetType === "fw:image") {
 				FieldImageHandler.layout(layoutCtx);
 				return;
@@ -119389,6 +119409,14 @@ var init_FieldHandler = __esmMin((() => {
 				AttachmentHandler.layout(layoutCtx);
 				return;
 			}
+			if (layoutCtx.context.doc.mode === DocModeTypeConst.Print) {
+				FieldBaseHandler.layoutValue(layoutCtx);
+				return;
+			}
+			if (props.renderComp === RenderCompTypeConst.Checkbox || props.renderComp === RenderCompTypeConst.Radio) {
+				OptionHandler.layout(layoutCtx);
+				return;
+			}
 			InputHandler.layout(layoutCtx);
 		}
 	};
@@ -136649,16 +136677,16 @@ async function submitDeviceScan(params) {
 		ok: false,
 		message: MSG_NO_CODE
 	};
+	const { queryData, exp } = buildLikeQuery([], "", buildDeviceBaseQuery({
+		"code_.eq": code,
+		...deviceGroupId ? { "device_group_id_.eq": deviceGroupId } : {}
+	}));
 	const option = (_res$options = (await apiFetchers.ref.getOptions({
 		fieldKey: fieldInfo.key,
 		modelKey: fieldInfo.modelKey,
 		refModelKey: fieldInfo.bindInfo,
-		exp: "OR(code_.eq)",
-		queryData: {
-			"code_.eq": code,
-			...deviceGroupId ? { "device_group_id_.eq": deviceGroupId } : {},
-			operating_state_: true
-		},
+		exp,
+		queryData,
 		pageNo: 1,
 		pageSize: 30
 	})).options) === null || _res$options === void 0 ? void 0 : _res$options[0];
@@ -136689,6 +136717,7 @@ var init_submit_device_scan = __esmMin((() => {
 	init_field_type();
 	init_fetchers();
 	init_columns();
+	init_quick_search();
 	init_utils$2();
 	init_form_value();
 	MSG_EMPTY = "请输入或扫描条码内容";
@@ -138855,6 +138884,7 @@ var init_rdo_version_name_tag = __esmMin((() => {
 //#region src/runtime/renderer/dropdowns/components/tables/rdo-table-dropdown.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1$141, _hoisted_2$87, rdo_table_dropdown_vue_vue_type_script_setup_true_lang_default;
 var init_rdo_table_dropdown_vue_vue_type_script_setup_true_lang = __esmMin((() => {
+	init_dist();
 	init_base$2();
 	init_base_vxe_table();
 	init_pagination_control();
@@ -138889,7 +138919,7 @@ var init_rdo_table_dropdown_vue_vue_type_script_setup_true_lang = __esmMin((() =
 			const inputRef = ref(null);
 			const { runtimeValuePath } = useWidgetMeta(props.widget);
 			const { columns, fetcher } = useTableDropdown(props);
-			const { xTable, loading, keyword, tableData, pagination, hasData, hasNextPage, hasPrevPage, search, reset, onSizeChange, handlePagination } = useSelectTable(fetcher, {
+			const { xTable, loading, keyword, tableData, pagination, hasData, hasNextPage, hasPrevPage, search, onSizeChange, handlePagination } = useSelectTable(fetcher, {
 				data: [],
 				total: 0,
 				highlightIdx: {
@@ -138898,6 +138928,12 @@ var init_rdo_table_dropdown_vue_vue_type_script_setup_true_lang = __esmMin((() =
 				}
 			});
 			const hideSearch = computed(() => props.widget.widgetMeta.props.searchable === false);
+			const debouncedSearch = useDebounceFn(() => {
+				search();
+			}, 500);
+			watch(keyword, () => {
+				debouncedSearch();
+			});
 			const onChangeSelect = (row) => {
 				const { __VALUE__, __DEFAULT__, __HAS_ONE_CHILD__, __SHOW_LABEL__, __VERSION_NAME__ } = row || {};
 				const value = __VALUE__ || (row === null || row === void 0 ? void 0 : row.value) || (row === null || row === void 0 ? void 0 : row._item.id_);
@@ -138924,49 +138960,30 @@ var init_rdo_table_dropdown_vue_vue_type_script_setup_true_lang = __esmMin((() =
 			});
 			return (_ctx, _cache) => {
 				return openBlock(), createElementBlock("div", _hoisted_1$141, [
-					!hideSearch.value ? (openBlock(), createElementBlock("div", _hoisted_2$87, [
-						createVNode(unref(input_default), {
-							modelValue: unref(keyword),
-							"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(keyword) ? keyword.value = $event : null),
-							ref_key: "inputRef",
-							ref: inputRef,
-							placeholder: "请输入关键字",
-							allowClear: "",
-							onKeydown: withKeys(unref(search), ["enter"]),
-							onClear: unref(search)
-						}, {
-							prependIcon: withCtx(() => [createVNode(unref(icon_default), {
-								icon: "icon-sousuo",
-								color: "rgba(0, 0, 0, 0.45)",
-								size: "14"
-							})]),
-							_: 1
-						}, 8, [
-							"modelValue",
-							"onKeydown",
-							"onClear"
-						]),
-						createVNode(unref(button_default), {
-							type: "primary",
-							onClick: unref(search)
-						}, {
-							default: withCtx(() => [..._cache[4] || (_cache[4] = [createTextVNode("搜索", -1)])]),
-							_: 1
-						}, 8, ["onClick"]),
-						createVNode(unref(button_default), { onClick: unref(reset) }, {
-							default: withCtx(() => [..._cache[5] || (_cache[5] = [createTextVNode("重置", -1)])]),
-							_: 1
-						}, 8, ["onClick"]),
-						__props.modelValue ? (openBlock(), createBlock(unref(button_default), {
-							key: 0,
-							type: "danger",
-							plain: "",
-							onClick: _cache[1] || (_cache[1] = () => onChangeSelect())
-						}, {
-							default: withCtx(() => [..._cache[6] || (_cache[6] = [createTextVNode("清除", -1)])]),
-							_: 1
-						})) : createCommentVNode("", true)
-					])) : createCommentVNode("", true),
+					!hideSearch.value ? (openBlock(), createElementBlock("div", _hoisted_2$87, [createVNode(unref(input_default), {
+						modelValue: unref(keyword),
+						"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(keyword) ? keyword.value = $event : null),
+						ref_key: "inputRef",
+						ref: inputRef,
+						placeholder: "请输入关键字",
+						allowClear: "",
+						onKeydown: withKeys(unref(search), ["enter"])
+					}, {
+						prependIcon: withCtx(() => [createVNode(unref(icon_default), {
+							icon: "icon-sousuo",
+							color: "rgba(0, 0, 0, 0.45)",
+							size: "14"
+						})]),
+						_: 1
+					}, 8, ["modelValue", "onKeydown"]), __props.modelValue ? (openBlock(), createBlock(unref(button_default), {
+						key: 0,
+						type: "danger",
+						plain: "",
+						onClick: _cache[1] || (_cache[1] = () => onChangeSelect())
+					}, {
+						default: withCtx(() => [..._cache[4] || (_cache[4] = [createTextVNode("清除", -1)])]),
+						_: 1
+					})) : createCommentVNode("", true)])) : createCommentVNode("", true),
 					createVNode(base_vxe_table_default, {
 						ref_key: "xTable",
 						ref: xTable,
@@ -141396,21 +141413,18 @@ var init_form_change_row = __esmMin((() => {
 	FORM_CHANGE_ROW_PALETTE = {
 		ADD: {
 			wmText: "新增",
-			text: "#306BD2",
 			bg: "rgba(144, 172, 233, 0.16)",
 			bgSelected: "rgba(144, 172, 233, 0.3)",
 			wm: "rgba(144, 172, 233, 0.4)"
 		},
 		DEL: {
 			wmText: "删除",
-			text: "#F54547",
 			bg: "rgba(248, 130, 132, 0.16)",
 			bgSelected: "rgba(248, 130, 132, 0.3)",
 			wm: "rgba(248, 130, 132, 0.4)"
 		},
 		ORPHAN: {
 			wmText: "增后删",
-			text: "#8B8B8B",
 			bg: "rgba(169, 175, 188, 0.16)",
 			bgSelected: "rgba(169, 175, 188, 0.3)",
 			wm: "rgba(169, 175, 188, 0.4)"
@@ -144797,13 +144811,6 @@ function tableKeyFromValuePath(valuePath) {
 	}
 	return ((_body$split$ = body.split("[")[0]) === null || _body$split$ === void 0 ? void 0 : _body$split$.split(".")[0]) || void 0;
 }
-function parseRowIndexFromValuePath(valuePath) {
-	if (!valuePath) return void 0;
-	const match = valuePath.match(/\[(\d+)\]/);
-	if (!match) return void 0;
-	const index = Number(match[1]);
-	return Number.isFinite(index) ? index : void 0;
-}
 function resolveRowIndex(sub) {
 	if (!sub) return void 0;
 	if (sub.yDataIndex != null) return sub.yDataIndex;
@@ -144813,6 +144820,13 @@ function resolveColIndex(sub) {
 	if ((sub === null || sub === void 0 ? void 0 : sub.xDataIndex) == null) return void 0;
 	return sub.xDataIndex;
 }
+/** 是否为动态表/业务子表区域内的数据格（不含区域外列、表头） */
+function isFormChangeSubTableRegionCell(cell) {
+	const sub = cell.subRenderer;
+	if (!sub || !sub.valuePath) return false;
+	if (sub.type === "table-header") return false;
+	return sub.dataIndex != null || sub.yDataIndex != null || sub.xDataIndex != null;
+}
 function resolveRowMarkUi(tableKey, rowIndex, annRowDetails, rawData, focusAnnotationId) {
 	if (rowIndex == null || rowIndex < 0 || !(annRowDetails === null || annRowDetails === void 0 ? void 0 : annRowDetails.length) || !rawData) return null;
 	const rows = rawData[tableKey];
@@ -144826,7 +144840,6 @@ function resolveRowMarkUi(tableKey, rowIndex, annRowDetails, rawData, focusAnnot
 		fill: focusAnnotationId === mark.cellLocation ? palette.bgSelected : palette.bg,
 		wmText: ui.wmText,
 		wmColor: palette.wm,
-		textColor: palette.text,
 		cellLocation: mark.cellLocation
 	};
 }
@@ -144839,21 +144852,22 @@ function resolveFromSubRenderer(subRenderer, annRowDetails, rawData, focusAnnota
 	const xKey = (xKeyRaw === null || xKeyRaw === void 0 ? void 0 : xKeyRaw.replace(/\[.*$/, "")) || void 0;
 	return resolveRowMarkUi(yKey, resolveRowIndex(subRenderer), annRowDetails, rawData, focusAnnotationId) || (xKey ? resolveRowMarkUi(xKey, resolveColIndex(subRenderer), annRowDetails, rawData, focusAnnotationId) : null) || (defaultTableKey !== yKey ? resolveRowMarkUi(defaultTableKey, resolveRowIndex(subRenderer) ?? resolveColIndex(subRenderer), annRowDetails, rawData, focusAnnotationId) : null);
 }
-/** 按行解析增删预览样式 */
+/** 按行解析增删预览样式：锚点取动态表区域内的数据格 */
 function resolveRowChangeStyle(cells, annRowDetails, rawData, focusAnnotationId) {
 	var _cells$find;
-	const anchor = (_cells$find = cells.find((cell) => cell.subRenderer)) === null || _cells$find === void 0 ? void 0 : _cells$find.subRenderer;
+	const anchor = (_cells$find = cells.find((cell) => isFormChangeSubTableRegionCell(cell))) === null || _cells$find === void 0 ? void 0 : _cells$find.subRenderer;
 	if (!anchor) return null;
 	return resolveFromSubRenderer(anchor, annRowDetails, rawData, focusAnnotationId);
 }
+/** 水印/底色包围盒：只包动态表区域内单元格（跨页后同样只覆盖区域内列） */
 function resolveRowWatermark(cells, style) {
 	if (!(style === null || style === void 0 ? void 0 : style.wmText) || !style.wmColor) return null;
-	const visible = cells.filter((cell) => !cell.mergeFromId);
-	if (!visible.length) return null;
-	const minX = Math.min(...visible.map((cell) => cell.roundX));
-	const maxX = Math.max(...visible.map((cell) => cell.roundX + cell.roundWidth));
-	const minY = Math.min(...visible.map((cell) => cell.roundY));
-	const maxY = Math.max(...visible.map((cell) => cell.roundY + cell.roundHeight));
+	const regionCells = cells.filter((cell) => isFormChangeSubTableRegionCell(cell));
+	if (!regionCells.length) return null;
+	const minX = Math.min(...regionCells.map((cell) => cell.roundX));
+	const maxX = Math.max(...regionCells.map((cell) => cell.roundX + cell.roundWidth));
+	const minY = Math.min(...regionCells.map((cell) => cell.roundY));
+	const maxY = Math.max(...regionCells.map((cell) => cell.roundY + cell.roundHeight));
 	return {
 		x: minX,
 		y: minY,
@@ -144863,15 +144877,6 @@ function resolveRowWatermark(cells, style) {
 		fill: style.wmColor
 	};
 }
-/** 字段所在数据行的变更文字色 */
-function resolveRowTextColor(valuePath, annRowDetails, rawData) {
-	var _resolveRowMarkUi;
-	if (!valuePath || !(annRowDetails === null || annRowDetails === void 0 ? void 0 : annRowDetails.length) || !rawData) return void 0;
-	const tableKey = tableKeyFromValuePath(valuePath);
-	const rowIndex = parseRowIndexFromValuePath(valuePath);
-	if (!tableKey || rowIndex == null) return void 0;
-	return (_resolveRowMarkUi = resolveRowMarkUi(tableKey, rowIndex, annRowDetails, rawData)) === null || _resolveRowMarkUi === void 0 ? void 0 : _resolveRowMarkUi.textColor;
-}
 var init_resolve_cell_row_change_style = __esmMin((() => {
 	init_form_change_row();
 }));
@@ -144901,26 +144906,35 @@ var init_table_form_change_overlay_vue_vue_type_script_setup_true_name_table_for
 				const rawData = (annRowDetails === null || annRowDetails === void 0 ? void 0 : annRowDetails.length) && previewBackup && docInst.value ? collectFormChangePreviewRaw(docInst.value, annRowDetails) : void 0;
 				const overlayRows = [];
 				props.rows.forEach((row) => {
+					const visualRowHeight = Math.round(row.height);
 					const layoutCells = row.cells.map((cell) => ({
-						...cell,
+						id: cell.id,
+						mergeFromId: cell.mergeFromId,
+						subRenderer: cell.subRenderer,
 						roundX: Math.round(cell.x),
 						roundY: Math.round(row.y),
 						roundWidth: Math.round(cell.width),
-						roundHeight: Math.round(cell.height)
+						roundHeight: visualRowHeight
 					}));
 					const rowStyle = resolveRowChangeStyle(row.cells, annRowDetails, rawData, focusAnnotationId);
+					const regionCells = layoutCells.filter((cell) => isFormChangeSubTableRegionCell(cell));
+					let fillRect = null;
+					if ((rowStyle === null || rowStyle === void 0 ? void 0 : rowStyle.fill) && regionCells.length) {
+						const minX = Math.min(...regionCells.map((cell) => cell.roundX));
+						const maxX = Math.max(...regionCells.map((cell) => cell.roundX + cell.roundWidth));
+						fillRect = {
+							x: minX,
+							y: Math.round(row.y),
+							width: maxX - minX,
+							height: visualRowHeight
+						};
+					}
 					overlayRows.push({
 						id: row.id,
 						previewFill: rowStyle === null || rowStyle === void 0 ? void 0 : rowStyle.fill,
-						fillCells: layoutCells.filter((cell) => !cell.mergeFromId && (rowStyle === null || rowStyle === void 0 ? void 0 : rowStyle.fill)).map((cell) => ({
-							id: cell.id,
-							x: cell.roundX,
-							y: cell.roundY,
-							width: cell.roundWidth,
-							height: cell.roundHeight
-						})),
+						fillRect,
 						rowStyle,
-						cells: layoutCells
+						regionCells
 					});
 				});
 				const watermarkByMark = /* @__PURE__ */ new Map();
@@ -144928,7 +144942,7 @@ var init_table_form_change_overlay_vue_vue_type_script_setup_true_name_table_for
 					var _row$rowStyle;
 					const markKey = (_row$rowStyle = row.rowStyle) === null || _row$rowStyle === void 0 ? void 0 : _row$rowStyle.cellLocation;
 					if (!markKey) return;
-					const partial = resolveRowWatermark(row.cells, row.rowStyle);
+					const partial = resolveRowWatermark(row.regionCells, row.rowStyle);
 					if (!partial) return;
 					const existing = watermarkByMark.get(markKey);
 					if (!existing) {
@@ -144954,7 +144968,7 @@ var init_table_form_change_overlay_vue_vue_type_script_setup_true_name_table_for
 				};
 			});
 			const hasOverlay = computed(() => overlayModel.value.overlayRows.some((row) => row.previewFill) || overlayModel.value.rowMarks.length > 0);
-			const overlayRows = computed(() => overlayModel.value.overlayRows.filter((row) => row.previewFill && row.fillCells.length));
+			const overlayRows = computed(() => overlayModel.value.overlayRows.filter((row) => row.previewFill && row.fillRect));
 			const rowMarks = computed(() => overlayModel.value.rowMarks);
 			return (_ctx, _cache) => {
 				const _component_v_rect = resolveComponent("v-rect");
@@ -144962,23 +144976,21 @@ var init_table_form_change_overlay_vue_vue_type_script_setup_true_name_table_for
 				const _component_v_group = resolveComponent("v-group");
 				return hasOverlay.value ? (openBlock(), createBlock(_component_v_group, { key: 0 }, {
 					default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(overlayRows.value, (row) => {
-						return openBlock(), createElementBlock(Fragment, { key: `fill-${row.id}` }, [(openBlock(true), createElementBlock(Fragment, null, renderList(row.fillCells, (cell) => {
-							return openBlock(), createBlock(_component_v_rect, {
-								key: `fill-cell-${cell.id}`,
-								x: cell.x,
-								y: cell.y,
-								width: cell.width,
-								height: cell.height,
-								fill: row.previewFill,
-								listening: false
-							}, null, 8, [
-								"x",
-								"y",
-								"width",
-								"height",
-								"fill"
-							]);
-						}), 128))], 64);
+						return openBlock(), createElementBlock(Fragment, { key: `fill-${row.id}` }, [row.fillRect ? (openBlock(), createBlock(_component_v_rect, {
+							key: 0,
+							x: row.fillRect.x,
+							y: row.fillRect.y,
+							width: row.fillRect.width,
+							height: row.fillRect.height,
+							fill: row.previewFill,
+							listening: false
+						}, null, 8, [
+							"x",
+							"y",
+							"width",
+							"height",
+							"fill"
+						])) : createCommentVNode("", true)], 64);
 					}), 128)), (openBlock(true), createElementBlock(Fragment, null, renderList(rowMarks.value, (mark) => {
 						return openBlock(), createElementBlock(Fragment, { key: `mark-${mark.cellLocation}` }, [createVNode(_component_v_rect, {
 							x: mark.watermark.x,
@@ -156884,7 +156896,6 @@ init_useWidgetRenderData();
 init_validation();
 init_form_change_row();
 init_widget();
-init_resolve_cell_row_change_style();
 var gct_text_render_vue_vue_type_script_setup_true_name_gct_text_render_lang_default = /*@__PURE__*/ defineComponent({
 	__name: "gct-text-render",
 	props: {
@@ -156899,20 +156910,7 @@ var gct_text_render_vue_vue_type_script_setup_true_name_gct_text_render_lang_def
 			return !!resolveFieldAnnotationHit(docInst.value, interCtx.annotationIds, runtimeValuePath.value);
 		});
 		const hasValidationError = computed(() => hasFieldErrorHighlight(interCtx.validationCommentMap, runtimeValuePath.value));
-		const rowTextColor = computed(() => {
-			var _docInst$value, _docInst$value$get;
-			const details = interCtx.formChangeRowDetails;
-			if (!(details === null || details === void 0 ? void 0 : details.length) || !interCtx.formChangeRowPreviewBackup) return void 0;
-			const path = runtimeValuePath.value;
-			if (!path || !/\[\d+\]/.test(path)) return void 0;
-			const tableKey = tableKeyFromValuePath(path);
-			if (!tableKey) return void 0;
-			const rows = (_docInst$value = docInst.value) === null || _docInst$value === void 0 || (_docInst$value = _docInst$value.dataManager) === null || _docInst$value === void 0 || (_docInst$value$get = _docInst$value.get) === null || _docInst$value$get === void 0 ? void 0 : _docInst$value$get.call(_docInst$value, `$.${tableKey}`);
-			if (!Array.isArray(rows)) return void 0;
-			return resolveRowTextColor(path, details, { [tableKey]: rows });
-		});
 		const resolvedTextColor = computed(() => {
-			if (rowTextColor.value) return rowTextColor.value;
 			if (isFieldChange.value) return FieldStateColors.fieldChange;
 			if (showRequired.value && showReadonly.value) return void 0;
 			return props.widget.color;
@@ -160167,6 +160165,7 @@ var bom_product_name_default = /* @__PURE__ */ defineComponent({
 //#region src/suites/edhr/panel-schema/material-consume-table/bom-entry-editor.vue?vue&type=script&setup=true&name=bom-entry-editor&lang.ts
 init_base$2();
 init_index_es();
+init_core();
 var _hoisted_1$86 = { class: "bom-entry-editor" };
 var _hoisted_2$50 = { class: "bom-entry-item flex items-center" };
 var _hoisted_3$33 = {
@@ -160188,6 +160187,11 @@ var bom_entry_editor_vue_vue_type_script_setup_true_name_bom_entry_editor_lang_d
 	setup(__props, { emit: __emit }) {
 		const props = __props;
 		const emit = __emit;
+		const { docInst } = useDocPubApiContext();
+		const showConsumePolicy = computed(() => {
+			var _docInst$value$device;
+			return ((_docInst$value$device = docInst.value.deviceConfig) === null || _docInst$value$device === void 0 ? void 0 : _docInst$value$device.materialSourceType) === "line_side_inventory";
+		});
 		/** 过滤且排序后的集合 */
 		const showList = computed(() => {
 			var _props$list;
@@ -160227,7 +160231,8 @@ var bom_entry_editor_vue_vue_type_script_setup_true_name_bom_entry_editor_lang_d
 			Ir("BOM_ENTRY_MODAL", {
 				data: cloneDeep(data),
 				hasIds: calcHasProductIds(data),
-				openFormulaEditor
+				openFormulaEditor,
+				showConsumePolicy: showConsumePolicy.value
 			}, modalProps).then(({ success, result }) => {
 				if (success) Object.assign(data, result);
 			});
@@ -160236,7 +160241,8 @@ var bom_entry_editor_vue_vue_type_script_setup_true_name_bom_entry_editor_lang_d
 		const add = async () => {
 			Ir("BOM_ENTRY_MODAL", {
 				hasIds: calcHasProductIds(),
-				openFormulaEditor
+				openFormulaEditor,
+				showConsumePolicy: showConsumePolicy.value
 			}, modalProps).then(({ success, result }) => {
 				if (success && result) {
 					const newData = { ...result };
@@ -160316,7 +160322,7 @@ var bom_entry_editor_vue_vue_type_script_setup_true_name_bom_entry_editor_lang_d
 //#endregion
 //#region src/suites/edhr/panel-schema/material-consume-table/bom-entry-editor.vue
 init__plugin_vue_export_helper();
-var bom_entry_editor_default = /*#__PURE__*/ _plugin_vue_export_helper_default(bom_entry_editor_vue_vue_type_script_setup_true_name_bom_entry_editor_lang_default, [["__scopeId", "data-v-b6651102"]]);
+var bom_entry_editor_default = /*#__PURE__*/ _plugin_vue_export_helper_default(bom_entry_editor_vue_vue_type_script_setup_true_name_bom_entry_editor_lang_default, [["__scopeId", "data-v-c8fea9fa"]]);
 //#endregion
 //#region src/suites/edhr/panel-schema/material-consume-table/MaterialConsumeTablePanel.vue?vue&type=script&setup=true&lang.ts
 init_base$2();
@@ -162985,6 +162991,10 @@ var object_init_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 		const { docInst } = useDocPubApiContext();
 		const modelKey = toRef(docInst.value, "mainModelKey");
 		const { fields } = useModelData(modelKey);
+		const showConsumePolicy = computed(() => {
+			var _docInst$value$device;
+			return ((_docInst$value$device = docInst.value.deviceConfig) === null || _docInst$value$device === void 0 ? void 0 : _docInst$value$device.materialSourceType) === "line_side_inventory";
+		});
 		const filledObjectFieldKeys = computed(() => {
 			var _props$objects;
 			return ((_props$objects = props.objects) === null || _props$objects === void 0 ? void 0 : _props$objects.map((obj) => obj.objectField)) || [];
@@ -163054,7 +163064,8 @@ var object_init_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 			Ir("MATERIAL_CONSUME_OBJECT_CONFIG", {
 				allFields,
 				objectFields: objectFields.filter((f) => !filledObjectFieldKeys.value.includes(f.key)),
-				RenderFieldWrapper
+				RenderFieldWrapper,
+				showConsumePolicy: showConsumePolicy.value
 			}, { title: "添加初始化对象" }).then(({ success, result }) => {
 				if (!success || !result) return;
 				emit("update:objects", [...props.objects, normalizeObjectConfig(result)]);
@@ -163068,7 +163079,8 @@ var object_init_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 			Ir("MATERIAL_CONSUME_OBJECT_CONFIG", {
 				...baseParam.value,
 				editingItem: obj,
-				RenderFieldWrapper
+				RenderFieldWrapper,
+				showConsumePolicy: showConsumePolicy.value
 			}, { title: "配置" }).then(({ success, result }) => {
 				if (!success || !result) return;
 				const objects = [...props.objects];
@@ -163115,7 +163127,7 @@ var object_init_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 //#endregion
 //#region src/suites/edhr/panel-schema/data-init/object-init/object-init.vue
 init__plugin_vue_export_helper();
-var object_init_default = /*#__PURE__*/ _plugin_vue_export_helper_default(object_init_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-d86e8222"]]);
+var object_init_default = /*#__PURE__*/ _plugin_vue_export_helper_default(object_init_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-79a4a3de"]]);
 //#endregion
 //#region src/suites/edhr/panel-schema/data-init/DataInitPanel.vue?vue&type=script&setup=true&name=panel-data-init&lang.ts
 init_core$1();

package/dist/runtime/canvas/table/shared/resolve-cell-row-change-style.d.ts

@@ -1,10 +1,10 @@
 import { FormChangeRowDetailMeta } from '../../../interface/form-change-row';
+import { SubRenderer } from '../../../../core/view/TableCell';
 import { Cell } from '../types/table';
 interface RowChangeStyle {
     fill?: string;
     wmText?: string;
     wmColor?: string;
-    textColor?: string;
     cellLocation?: string;
 }
 interface RowWatermark {
@@ -16,15 +16,19 @@ interface RowWatermark {
     fill: string;
 }
 export declare function tableKeyFromValuePath(valuePath?: string): string | undefined;
-/** 按行解析增删预览样式 */
+/** 是否为动态表/业务子表区域内的数据格（不含区域外列、表头） */
+export declare function isFormChangeSubTableRegionCell(cell: {
+    subRenderer?: SubRenderer;
+}): boolean;
+/** 按行解析增删预览样式：锚点取动态表区域内的数据格 */
 export declare function resolveRowChangeStyle(cells: readonly Cell[], annRowDetails: FormChangeRowDetailMeta[] | null | undefined, rawData: Record<string, any> | null | undefined, focusAnnotationId?: string | null): RowChangeStyle | null;
+/** 水印/底色包围盒：只包动态表区域内单元格（跨页后同样只覆盖区域内列） */
 export declare function resolveRowWatermark(cells: Array<{
     mergeFromId?: string;
+    subRenderer?: SubRenderer;
     roundX: number;
     roundY: number;
     roundWidth: number;
     roundHeight: number;
 }>, style: RowChangeStyle | null | undefined): RowWatermark | null;
-/** 字段所在数据行的变更文字色 */
-export declare function resolveRowTextColor(valuePath: string | undefined, annRowDetails: FormChangeRowDetailMeta[] | null | undefined, rawData: Record<string, any> | null | undefined): string | undefined;
 export {};

package/dist/runtime/interface/form-change-row.d.ts

@@ -4,7 +4,6 @@ type FormChangeRowWmKind = 'ADD' | 'DEL' | 'ORPHAN';
 /** 行变更样式色板 */
 export declare const FORM_CHANGE_ROW_PALETTE: Record<FormChangeRowWmKind, {
     wmText: string;
-    text: string;
     bg: string;
     bgSelected: string;
     wm: string;

package/dist/runtime/renderer/dropdowns/components/tables/utils/quick-search.d.ts

@@ -1,4 +1,26 @@
 import { FieldMeta } from '../../../../../../capabilities/model-field-runtime';
+/** 设备状态（enu_device_status） */
+export declare const DeviceStatus: {
+    /** 使用中 */
+    readonly IN_USE: "IN_USE";
+    /** 维修中 */
+    readonly REPAIRING: "REPAIRING";
+    /** 保养中 */
+    readonly MAINTAINING: "MAINTAINING";
+    /** 点检中 */
+    readonly INSPECTING: "INSPECTING";
+    /** 校准中 */
+    readonly CALIBRATING: "CALIBRATING";
+    /** 验证中 */
+    readonly VERIFYING: "VERIFYING";
+    /** 备用 */
+    readonly STANDBY: "STANDBY";
+    /** 停用 */
+    readonly DEACTIVATED: "DEACTIVATED";
+    /** 报废 */
+    readonly SCRAPPED: "SCRAPPED";
+};
+export type DeviceStatus = (typeof DeviceStatus)[keyof typeof DeviceStatus];
 export declare function fillDefaultSearchField(fields?: string[]): string[];
 export declare function buildQuickSearchFieldOptions(fields?: FieldMeta[]): {
     label: string;
@@ -16,6 +38,8 @@ export declare function buildLikeQuery(searchFields: string[], keyword: string,
     queryData: Record<string, any>;
     exp: string;
 };
+/** 设备可选过滤：使用中 + 校准有效期未过（next_calibration_date_ >= 当前时间） */
+export declare function buildDeviceBaseQuery(extraQuery?: Record<string, any>): Record<string, any>;
 /** 设备下拉：默认搜 code/name + 设备类型过滤 */
 export declare function buildDeviceQuickSearchQuery(quickSearchField: string[] | undefined, keyword: string, extraQuery?: Record<string, any>): {
     queryData: Record<string, any>;

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

@@ -24,6 +24,8 @@ export interface IDeviceConfig {
     defaultProductSearchFields: string;
     /** 是否启用人员字段 false: 不使用 true: 使用；先留着扩展，后续如果需要在字段列表过滤才使用 */
     enableUserField: boolean;
+    /** 物料管理模式的数据来源 */
+    materialSourceType?: 'line_receive_material' | 'line_side_inventory';
 }
 /** 文档模型层子表元信息 */
 export interface SubTableInfo {

package/dist/word.css

@@ -11663,11 +11663,11 @@ svg.portrait-icon[data-v-8bdb451e] {
   height: 32px;
   font-size: 14px;
 }
-.add-button[data-v-b6651102] {
+.add-button[data-v-c8fea9fa] {
   height: 32px;
   margin-bottom: 8px;
 }
-.bom-entry-item[data-v-b6651102] {
+.bom-entry-item[data-v-c8fea9fa] {
   padding: 10px 0;
   border: 1px dashed #e0e3eb;
   border-radius: 4px;
@@ -11675,26 +11675,26 @@ svg.portrait-icon[data-v-8bdb451e] {
   color: #1a1d23;
   font-size: 12px;
 }
-.bom-entry-item + .bom-entry-item[data-v-b6651102] {
+.bom-entry-item + .bom-entry-item[data-v-c8fea9fa] {
   margin-top: 8px;
 }
-.bom-entry-item[data-v-b6651102]:hover {
+.bom-entry-item[data-v-c8fea9fa]:hover {
   border-color: var(--ant-primary-color);
   background-color: rgb(from var(--ant-primary-color) r g b / 2%);
 }
-.bom-entry-item-content[data-v-b6651102] {
+.bom-entry-item-content[data-v-c8fea9fa] {
   width: 1px;
 }
-.bom-entry-item .iconfont[data-v-b6651102] {
+.bom-entry-item .iconfont[data-v-c8fea9fa] {
   color: #a6a6a6;
   font-size: 14px;
   cursor: pointer;
 }
-.bom-entry-item .iconfont.mover[data-v-b6651102] {
+.bom-entry-item .iconfont.mover[data-v-c8fea9fa] {
   padding: 0 4px;
   color: #c6c6c6;
 }
-.bom-entry-item .iconfont.btn-item[data-v-b6651102] {
+.bom-entry-item .iconfont.btn-item[data-v-c8fea9fa] {
   margin-right: 8px;
 }
 .panel-material-consume-table[data-v-9a20d3b9] {
@@ -12379,35 +12379,35 @@ svg.portrait-icon[data-v-8bdb451e] {
   cursor: pointer;
   color: #797a7d;
 }
-.object-item[data-v-d86e8222] {
+.object-item[data-v-79a4a3de] {
   margin-bottom: 16px;
   padding: 12px;
   border: 1px dashed #e4e4e4;
   border-radius: 8px;
   background: #f6f8fa;
 }
-.object-item.is-filled[data-v-d86e8222] {
+.object-item.is-filled[data-v-79a4a3de] {
   border-color: #a7cae6;
   background: #ecf3fc;
 }
-.object-item .item-info[data-v-d86e8222] {
+.object-item .item-info[data-v-79a4a3de] {
   display: flex;
 }
-.object-item .item-info .info-text[data-v-d86e8222] {
+.object-item .item-info .info-text[data-v-79a4a3de] {
   flex-grow: 1;
   margin-right: 8px;
   overflow: hidden;
 }
-.object-item .item-info .info-text .text-row[data-v-d86e8222] {
+.object-item .item-info .info-text .text-row[data-v-79a4a3de] {
   margin-bottom: 4px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.object-item .item-info .info-text .text-row .row-label[data-v-d86e8222] {
+.object-item .item-info .info-text .text-row .row-label[data-v-79a4a3de] {
   color: #76777e;
 }
-.object-item .item-info .info-button[data-v-d86e8222] {
+.object-item .item-info .info-button[data-v-79a4a3de] {
   display: flex;
   flex-shrink: 0;
   align-items: center;
@@ -12417,16 +12417,16 @@ svg.portrait-icon[data-v-8bdb451e] {
   border-radius: 4px;
   cursor: pointer;
 }
-.object-item .item-info .info-button[data-v-d86e8222]:hover {
+.object-item .item-info .info-button[data-v-79a4a3de]:hover {
   background: #fff;
 }
-.object-item .item-info .info-button:hover .gct-icon[data-v-d86e8222] {
+.object-item .item-info .info-button:hover .gct-icon[data-v-79a4a3de] {
   color: #1c1e20;
 }
-.object-item .item-info .info-button .gct-icon[data-v-d86e8222] {
+.object-item .item-info .info-button .gct-icon[data-v-79a4a3de] {
   color: #a4aaaf;
 }
-.object-item .item-button[data-v-d86e8222] {
+.object-item .item-button[data-v-79a4a3de] {
   margin-top: 8px;
 }
 .panel-data-init[data-v-004e3ce4] {

package/package.json

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