@gct-paas/word 0.1.74-beta.29 → 0.1.74-beta.30

package/dist/core/data/enrichers/lot-parent-label-enricher.d.ts

@@ -1,13 +1,12 @@
 import { Doc } from '../../view/Doc';
-import { FIELD_TYPE } from '../../../domain/field/field-type';
 import { DataEnricherRegistration } from '../types';
-export declare const LOT_PARENT_LABEL_FIELD_TYPES: Set<FIELD_TYPE>;
+export type LotParentLookupBy = 'name' | 'id';
 /** 生产 LOT/SN 字段保存子批次 ID 时，解析其子批次名称。 */
 export declare function resolveProductionContainerChildName(childId: unknown): Promise<string | undefined>;
 type LotParentLabelEnricherOptions = {
     doc: Doc;
     valuePath: string;
-    fieldType: FIELD_TYPE;
+    lookupBy?: LotParentLookupBy;
 };
 export declare function createLotParentLabelEnricher(options: LotParentLabelEnricherOptions): DataEnricherRegistration;
 export {};

package/dist/domain/field/field-props-schema-type.d.ts

@@ -67,7 +67,16 @@ export interface LabelRule {
 export interface IdRule {
     type: 'id';
 }
-export type ValueChangeRule = HyperlinkRule | LabelRule | IdRule;
+/**
+ * LOT/SN 父批展示名写入 `_lb_`。
+ * - lookupBy: 'name' → 字段值是子批次 name_
+ * - lookupBy: 'id' → 字段值是子批次 id_（如生产 LOT/SN）
+ */
+export interface LotParentLabelRule {
+    type: 'lot-parent-label';
+    lookupBy?: 'name' | 'id';
+}
+export type ValueChangeRule = HyperlinkRule | LabelRule | IdRule | LotParentLabelRule;
 /** 将 manifest 中的 onValueChangeRule 规范为数组 */
 export declare function normalizeValueChangeRules(rule?: ValueChangeRule | ValueChangeRule[]): ValueChangeRule[];
 export type ComputedRule = PriorityRule | ResolveRule | MapRule | JoinRule | ApiRule;

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @gct-paas/word v0.1.74-beta.29 */
+/*! @gct-paas/word v0.1.74-beta.30 */
 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";
@@ -96155,7 +96155,7 @@ function resolveVerticalOptionGap(optionIndex, optionCount, optionSpacing, legac
 var init_option_spacing = __esmMin((() => {}));
 //#endregion
 //#region src/suites/edhr/manifest/field/_common_/basic.ts
-var initComponentDependency, commonDefaultRenderers, commonDefaultProps, autofillFieldDefaultProps, dateFieldDefaultProps, numberFieldDefaultProps, signFieldDefaultProps, fileFieldDefaultProps, styleDefaultProps, styleSizeDefaultProps, signStyleSizeDefaultProps, labelPriorityConfig, labelResolveDateConfig, labelResolveUserConfig, labelResolveOrgConfig, labelResolveEnumConfig, optionsMapEnumConfig, labelOnValueChangeRule, hyperlinkOnValueChangeRule, idOnValueChangeRule, hyperlinkAndIdOnValueChangeRules;
+var initComponentDependency, commonDefaultRenderers, commonDefaultProps, autofillFieldDefaultProps, dateFieldDefaultProps, numberFieldDefaultProps, signFieldDefaultProps, fileFieldDefaultProps, styleDefaultProps, styleSizeDefaultProps, signStyleSizeDefaultProps, labelPriorityConfig, labelResolveDateConfig, labelResolveUserConfig, labelResolveOrgConfig, labelResolveEnumConfig, optionsMapEnumConfig, labelOnValueChangeRule, hyperlinkOnValueChangeRule, idOnValueChangeRule, lotParentLabelByNameRule, lotParentLabelByIdRule, hyperlinkAndIdOnValueChangeRules, hyperlinkIdAndLotParentLabelRules;
 var init_basic = __esmMin((() => {
 	init_enum();
 	init_option_spacing();
@@ -96295,7 +96295,16 @@ var init_basic = __esmMin((() => {
 	labelOnValueChangeRule = { type: "label" };
 	hyperlinkOnValueChangeRule = { type: "hyperlink" };
 	idOnValueChangeRule = { type: "id" };
+	lotParentLabelByNameRule = {
+		type: "lot-parent-label",
+		lookupBy: "name"
+	};
+	lotParentLabelByIdRule = {
+		type: "lot-parent-label",
+		lookupBy: "id"
+	};
 	hyperlinkAndIdOnValueChangeRules = [hyperlinkOnValueChangeRule, idOnValueChangeRule];
+	hyperlinkIdAndLotParentLabelRules = [...hyperlinkAndIdOnValueChangeRules, lotParentLabelByNameRule];
 }));
 //#endregion
 //#region src/domain/table/business/check/check-table/profile/field-keys.ts
@@ -99783,13 +99792,13 @@ var init_label_enricher = __esmMin((() => {
 }));
 //#endregion
 //#region src/core/data/enrichers/lot-parent-label-enricher.ts
-function getQuery(value, fieldType) {
+function getQuery(value, lookupBy) {
 	if (!isPresent(value)) return void 0;
-	return { [fieldType === FIELD_TYPE.PRODUCTION_CONTAINER ? "id_.eq" : "name_.eq"]: String(value) };
+	return { [lookupBy === "id" ? "id_.eq" : "name_.eq"]: String(value) };
 }
 /** 按字段值获取 LOT/SN 原始记录。 */
-async function resolveLotRecordByFieldValue(value, fieldType) {
-	const queryData = getQuery(value, fieldType);
+async function resolveLotRecordByFieldValue(value, lookupBy) {
+	const queryData = getQuery(value, lookupBy);
 	if (!queryData) return void 0;
 	try {
 		const result = await api$1.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey({
@@ -99809,12 +99818,12 @@ async function resolveLotRecordByFieldValue(value, fieldType) {
 }
 /** 生产 LOT/SN 字段保存子批次 ID 时，解析其子批次名称。 */
 async function resolveProductionContainerChildName(childId) {
-	const record = await resolveLotRecordByFieldValue(childId, FIELD_TYPE.PRODUCTION_CONTAINER);
+	const record = await resolveLotRecordByFieldValue(childId, "id");
 	const name = record === null || record === void 0 ? void 0 : record.name_;
 	return name == null || name === "" ? void 0 : String(name);
 }
 function createLotParentLabelEnricher(options) {
-	const { doc, valuePath, fieldType } = options;
+	const { doc, valuePath, lookupBy = "name" } = options;
 	return {
 		id: `lot-parent-label:${valuePath}`,
 		valuePathTemplate: valuePath,
@@ -99826,29 +99835,21 @@ function createLotParentLabelEnricher(options) {
 			if (!isPresent(value)) return { [labelPath]: null };
 			const label = resolveLotDisplayLabel(await withRequestCache.handleRequest("lot_parent_label_resolve", {
 				value,
-				fieldType
-			}, () => resolveLotRecordByFieldValue(value, fieldType), 3e4));
+				lookupBy
+			}, () => resolveLotRecordByFieldValue(value, lookupBy), 3e4));
 			if (label) return { [labelPath]: label };
-			if (fieldType === FIELD_TYPE.PRODUCTION_CONTAINER) return { [labelPath]: null };
+			if (lookupBy === "id") return { [labelPath]: null };
 			return { [labelPath]: String(value) };
 		}
 	};
 }
-var LOT_PARENT_LABEL_FIELD_TYPES;
 var init_lot_parent_label_enricher = __esmMin((() => {
-	init_field_type();
 	init_lot_display_label();
 	init_api$1();
 	init_core$1();
 	init_withRequestCache();
 	init_field_paths();
 	init_enrich_utils();
-	LOT_PARENT_LABEL_FIELD_TYPES = /* @__PURE__ */ new Set([
-		FIELD_TYPE.MATERIAL_NO,
-		FIELD_TYPE.RELATED_LOT_NO,
-		FIELD_TYPE.SCRAP_MATERIAL_NO,
-		FIELD_TYPE.PRODUCTION_CONTAINER
-	]);
 }));
 //#endregion
 //#region src/sdk/doc-runtime/utils/sub-field-config.ts
@@ -100074,50 +100075,58 @@ function buildFieldEnricherRegistrations(instances, ctx, doc) {
 	const regs = [];
 	const ofInstNumTargets = [];
 	for (const instance of instances) {
-		var _instance$widgetMeta2;
+		var _instance$widgetMeta2, _manifest$computed2;
 		const fieldMeta = (_instance$widgetMeta2 = instance.widgetMeta) === null || _instance$widgetMeta2 === void 0 ? void 0 : _instance$widgetMeta2.field;
 		const valuePath = instance.valuePath;
 		if (!fieldMeta || !valuePath) continue;
 		const ofInstNumTarget = tryCollectOfInstNumTarget(instance);
 		if (ofInstNumTarget) ofInstNumTargets.push(ofInstNumTarget);
 		const manifest = ctx.getFieldManifest(fieldMeta.fieldType);
-		const computed = manifest === null || manifest === void 0 ? void 0 : manifest.computed;
-		const valueChangeRules = normalizeValueChangeRules(computed === null || computed === void 0 ? void 0 : computed.onValueChangeRule);
-		if (valueChangeRules.some((rule) => rule.type === "hyperlink")) regs.push(createHyperlinkEnricher({
-			id: `hyperlink:${valuePath}`,
-			valuePathTemplate: valuePath,
-			match: createValuePathMatcher(valuePath),
-			doc,
-			widgetMeta: instance.widgetMeta
-		}));
-		if (valueChangeRules.some((rule) => rule.type === "id")) regs.push(createIdEnricher({
-			id: `id:${valuePath}`,
-			valuePathTemplate: valuePath,
-			match: createValuePathMatcher(valuePath),
-			doc,
-			widgetMeta: instance.widgetMeta
-		}));
-		const fieldType = fieldMeta.fieldType;
-		if (LOT_PARENT_LABEL_FIELD_TYPES.has(fieldType)) regs.push(createLotParentLabelEnricher({
-			doc,
-			valuePath,
-			fieldType
-		}));
-		else if (fieldNeedsLabelEnrichment(fieldType, manifest)) {
-			const enricherProps = resolveEnricherWidgetProps(instance, manifest);
-			regs.push(createLabelEnricher({
-				id: `label:${valuePath}`,
-				valuePathTemplate: valuePath,
-				match: createValuePathMatcher(valuePath),
-				doc,
-				widgetMeta: {
-					...instance.widgetMeta,
-					props: enricherProps
-				},
-				fieldBinding: fieldMeta,
-				manifest,
-				loadFieldByKey: ctx.loadFieldByKey
-			}));
+		const valueChangeRules = normalizeValueChangeRules(manifest === null || manifest === void 0 || (_manifest$computed2 = manifest.computed) === null || _manifest$computed2 === void 0 ? void 0 : _manifest$computed2.onValueChangeRule);
+		if (!valueChangeRules.length) continue;
+		const match = createValuePathMatcher(valuePath);
+		const preferLotParentLabel = valueChangeRules.some((rule) => rule.type === "lot-parent-label");
+		for (const rule of valueChangeRules) switch (rule.type) {
+			case "hyperlink":
+				regs.push(createHyperlinkEnricher({
+					id: `hyperlink:${valuePath}`,
+					valuePathTemplate: valuePath,
+					match,
+					doc,
+					widgetMeta: instance.widgetMeta
+				}));
+				break;
+			case "id":
+				regs.push(createIdEnricher({
+					id: `id:${valuePath}`,
+					valuePathTemplate: valuePath,
+					match,
+					doc,
+					widgetMeta: instance.widgetMeta
+				}));
+				break;
+			case "lot-parent-label":
+				regs.push(createLotParentLabelEnricher({
+					doc,
+					valuePath,
+					lookupBy: rule.lookupBy ?? "name"
+				}));
+				break;
+			case "label":
+				if (preferLotParentLabel) break;
+				regs.push(createLabelEnricher({
+					id: `label:${valuePath}`,
+					valuePathTemplate: valuePath,
+					match,
+					doc,
+					widgetMeta: {
+						...instance.widgetMeta,
+						props: resolveEnricherWidgetProps(instance, manifest)
+					},
+					fieldBinding: fieldMeta,
+					manifest,
+					loadFieldByKey: ctx.loadFieldByKey
+				}));
 		}
 	}
 	if (ofInstNumTargets.length) regs.push(createOfInstNumEnricher(doc, ofInstNumTargets));
@@ -100130,7 +100139,6 @@ var init_build_field_enrichers = __esmMin((() => {
 	init_id_enricher();
 	init_label_enricher();
 	init_lot_parent_label_enricher();
-	init_label_resolve();
 	init_static_label_enrichers();
 	init_computed();
 	init_field_props_schema_type();
@@ -138631,16 +138639,17 @@ async function resolveProductIdsFromLot(lotIdOrName, byName) {
 /** 用工单 id 取 product_id_ */
 async function resolveProductIdsFromMfgOrder(orderId) {
 	try {
-		return pickProductIdsFromMfgOrderRow(await api$1.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey({
+		const result = await api$1.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey({
 			modelCategory: "entity",
 			modelKey: "em_mfg_order",
 			bsKey: "biz_get_mfg_order_by_id"
-		}, { id_: orderId }, {}));
+		}, { id_: orderId }, {});
+		return pickProductIdsFromMfgOrderRow(unwrapBizServiceData(result) ?? (result && typeof result === "object" ? result : null));
 	} catch {
 		return [];
 	}
 }
-/** 物料下拉按产品 id 过滤：RDO 有版本用 base_id_.in，否则 id_.in */
+/** 物料下拉按产品 id 过滤：RDO 有版本用 base_id_.in，否则 id_.in；混用时 OR */
 function buildProductIdFilterQuery(productIds) {
 	const baseIds = [];
 	const ids = [];
@@ -138654,15 +138663,19 @@ function buildProductIdFilterQuery(productIds) {
 		if (targetId) ids.push(targetId);
 	}
 	const uniqueBaseIds = uniqNonEmpty(baseIds);
-	if (uniqueBaseIds.length) return { "base_id_.in": uniqueBaseIds };
 	const uniqueIds = uniqNonEmpty(ids);
+	if (uniqueBaseIds.length && uniqueIds.length) return {
+		"base_id_.in": uniqueBaseIds,
+		"id_.in": uniqueIds,
+		[ASSOC_FILTER_OR_EXP_KEYS]: ["base_id_.in", "id_.in"]
+	};
+	if (uniqueBaseIds.length) return { "base_id_.in": uniqueBaseIds };
 	if (uniqueIds.length) return { "id_.in": uniqueIds };
 	return {};
 }
 /**
 * 按物料「关联过滤」配置，回查源字段同源接口拿到 product_id_ 再拼查询参数。
-* - 未开启 / 源值为空 → {}（不加过滤，不清空已选物料）
-* - 源有值但解析不到产品 → 空命中条件（不退回全量产品）
+* 未开启 / 源值为空 / 解析不到产品 → {}（不加过滤，不清空已选物料）。
 */
 async function buildAssocFilterExtraParams(doc, widgetProps, runtimeValuePath) {
 	if (!(widgetProps === null || widgetProps === void 0 ? void 0 : widgetProps.enableAssocFilter) || !widgetProps.assocFilterSourceField) return {};
@@ -138678,7 +138691,7 @@ async function buildAssocFilterExtraParams(doc, widgetProps, runtimeValuePath) {
 	const idValue = doc.dataManager.get(getIdPath(valuePath));
 	const sourceType = widgetProps.assocFilterSourceFieldType;
 	let productIds = [];
-	if (sourceType === FIELD_TYPE.MFG_ORDER) productIds = await resolveProductIdsFromMfgOrder(String(value));
+	if (sourceType === FIELD_TYPE.MFG_ORDER) productIds = await resolveProductIdsFromMfgOrder(!isNil(idValue) && idValue !== "" ? String(idValue) : String(value));
 	else if (sourceType === FIELD_TYPE.MATERIAL_NO) {
 		const hasId = !isNil(idValue) && idValue !== "";
 		productIds = await resolveProductIdsFromLot(String(hasId ? idValue : value), !hasId);
@@ -138686,7 +138699,7 @@ async function buildAssocFilterExtraParams(doc, widgetProps, runtimeValuePath) {
 	if (!productIds.length) return {};
 	return buildProductIdFilterQuery(productIds);
 }
-var PARENT_ROLES;
+var PARENT_ROLES, ASSOC_FILTER_OR_EXP_KEYS;
 var init_assoc_filter = __esmMin((() => {
 	init_data();
 	init_field_type();
@@ -138697,6 +138710,7 @@ var init_assoc_filter = __esmMin((() => {
 	init_core$1();
 	init_enum();
 	PARENT_ROLES = /* @__PURE__ */ new Set([ContainerRoleConst.RELATED_PARENT, ContainerRoleConst.COLLINEAR_PARENT]);
+	ASSOC_FILTER_OR_EXP_KEYS = "__orExpKeys";
 }));
 //#endregion
 //#region src/runtime/renderer/dropdowns/components/tables/composables/useTableDropdown.ts
@@ -142379,15 +142393,25 @@ function resolveFieldKey(widgetMeta, runtimeValuePath) {
 	if (fromPath) return fromPath;
 	return getLastSegment$1((_widgetMeta$field = widgetMeta.field) === null || _widgetMeta$field === void 0 ? void 0 : _widgetMeta$field.fieldLink) || "";
 }
+/**
+* 弹框要的是子批次 name_：
+* - 普通 LOT/SN：字段值本身就是子批次名
+* - 生产 LOT/SN：字段值是子批次 id_，需回查 name_（不能用 _lb_，关联子批时 _lb_ 是父批名）
+*/
+async function resolveHyperlinkMaterialNo(widgetMeta, fieldKey, rawValue) {
+	var _widgetMeta$field2;
+	if (((_widgetMeta$field2 = widgetMeta.field) === null || _widgetMeta$field2 === void 0 ? void 0 : _widgetMeta$field2.fieldType) === FIELD_TYPE.PRODUCTION_CONTAINER || fieldKey === "production_container_id_") return await resolveProductionContainerChildName(rawValue) ?? getValue$1(rawValue, false);
+	return getValue$1(rawValue, false);
+}
 async function resolveOpenFieldHyperlinkModalOptions(doc, widgetMeta, runtimeValuePath) {
-	var _widgetMeta$field2, _TableRuntimeContext$, _widgetMeta$field3, _widgetMeta$field4;
+	var _widgetMeta$field3, _TableRuntimeContext$, _widgetMeta$field4;
 	const rawValue = doc.dataManager.get(runtimeValuePath);
 	const sub = parseSubtableFieldPath(runtimeValuePath);
-	const subFieldKey = (sub === null || sub === void 0 ? void 0 : sub.subFieldKey) || ((_widgetMeta$field2 = widgetMeta.field) === null || _widgetMeta$field2 === void 0 ? void 0 : _widgetMeta$field2.subFieldKey);
+	const subFieldKey = (sub === null || sub === void 0 ? void 0 : sub.subFieldKey) || ((_widgetMeta$field3 = widgetMeta.field) === null || _widgetMeta$field3 === void 0 ? void 0 : _widgetMeta$field3.subFieldKey);
 	const tableType = subFieldKey ? (_TableRuntimeContext$ = TableRuntimeContext.find(doc, subFieldKey)) === null || _TableRuntimeContext$ === void 0 ? void 0 : _TableRuntimeContext$.profile.type : void 0;
 	const fieldKey = resolveFieldKey(widgetMeta, runtimeValuePath);
 	return {
-		materialNo: ((_widgetMeta$field3 = widgetMeta.field) === null || _widgetMeta$field3 === void 0 ? void 0 : _widgetMeta$field3.fieldType) === FIELD_TYPE.PRODUCTION_CONTAINER || fieldKey === "production_container_id_" ? await resolveProductionContainerChildName(rawValue) ?? getValue$1(rawValue, false) : getValue$1(rawValue, false),
+		materialNo: await resolveHyperlinkMaterialNo(widgetMeta, fieldKey, rawValue),
 		fieldType: (_widgetMeta$field4 = widgetMeta.field) === null || _widgetMeta$field4 === void 0 ? void 0 : _widgetMeta$field4.fieldType,
 		href: doc.dataManager.getHref(runtimeValuePath) ?? void 0,
 		fieldKey: fieldKey || void 0,
@@ -142403,12 +142427,12 @@ async function openFieldHyperlinkModal(doc, widgetMeta, runtimeValuePath) {
 }
 var init_open_field_hyperlink = __esmMin((() => {
 	init_data();
+	init_lot_parent_label_enricher();
 	init_table_runtime_context();
+	init_field_type();
 	init_form_value();
 	init_TriggerUtil();
 	init_core$1();
-	init_field_type();
-	init_lot_parent_label_enricher();
 }));
 //#endregion
 //#region src/runtime/canvas/__common__/widget-container/index.vue?vue&type=script&setup=true&name=widget-container&lang.ts
@@ -154719,7 +154743,7 @@ var manifest$47 = {
 	renderers: { ...commonDefaultRenderers },
 	propsSchema: "schema:field-business",
 	defaultProps: { ...commonDefaultProps },
-	computed: { onValueChangeRule: idOnValueChangeRule }
+	computed: { onValueChangeRule: [idOnValueChangeRule, lotParentLabelByNameRule] }
 };
 //#endregion
 //#region src/suites/edhr/manifest/field/business/scrap-qty-manifest.ts
@@ -155413,7 +155437,7 @@ var manifest$18 = {
 	computed: {
 		onlyMainModelCanDefault: true,
 		skipDefaultWhenBelongingObject: true,
-		onValueChangeRule: [...hyperlinkAndIdOnValueChangeRules]
+		onValueChangeRule: [...hyperlinkIdAndLotParentLabelRules]
 	}
 };
 //#endregion
@@ -155527,7 +155551,7 @@ var manifest$14 = {
 			type: "api",
 			fetcher: "ref"
 		},
-		onValueChangeRule: labelOnValueChangeRule
+		onValueChangeRule: lotParentLabelByIdRule
 	}
 };
 //#endregion
@@ -155599,7 +155623,7 @@ var manifest$11 = {
 	defaultProps: { ...commonDefaultProps },
 	computed: {
 		onlyMainModelCanDefault: true,
-		onValueChangeRule: [...hyperlinkAndIdOnValueChangeRules]
+		onValueChangeRule: [...hyperlinkIdAndLotParentLabelRules]
 	}
 };
 //#endregion
@@ -158318,13 +158342,9 @@ var vueComponentMap = loadVueComponentModulesSync();
 var CONVENTION_PANEL_TYPES = [
 	"panel:dynamic-table",
 	"panel:warehouse-in-table",
-	"panel:warehouse-inbound-table",
 	"panel:warehouse-out-table",
-	"panel:warehouse-outbound-table",
 	"panel:warehouse-in-out-table",
 	"panel:warehouse-inventory-table",
-	"panel:part-stocktake-table",
-	"panel:device-part-consume-table",
 	"panel:warehouse-allocate-table",
 	"panel:2d-table",
 	"panel:material-consume-table",
@@ -160191,41 +160211,29 @@ var schema$25 = createTablePanelSchema("dynamic-table.basic", RepeatingSubTableP
 //#region src/suites/edhr/panel-schema/warehouse-in-table/warehouse-in-table.basic.ts
 var schema$24 = createTablePanelSchema("warehouse-in-table.basic", RepeatingSubTablePanel_default);
 //#endregion
-//#region src/suites/edhr/panel-schema/warehouse-inbound-table/warehouse-inbound-table.basic.ts
-var schema$23 = createTablePanelSchema("warehouse-inbound-table.basic", RepeatingSubTablePanel_default);
-//#endregion
 //#region src/suites/edhr/panel-schema/warehouse-out-table/warehouse-out-table.basic.ts
-var schema$22 = createTablePanelSchema("warehouse-out-table.basic", RepeatingSubTablePanel_default);
-//#endregion
-//#region src/suites/edhr/panel-schema/warehouse-outbound-table/warehouse-outbound-table.basic.ts
-var schema$21 = createTablePanelSchema("warehouse-outbound-table.basic", RepeatingSubTablePanel_default);
-//#endregion
-//#region src/suites/edhr/panel-schema/part-stocktake-table/part-stocktake-table.basic.ts
-var schema$20 = createTablePanelSchema("part-stocktake-table.basic", RepeatingSubTablePanel_default);
-//#endregion
-//#region src/suites/edhr/panel-schema/device-part-consume-table/device-part-consume-table.basic.ts
-var schema$19 = createTablePanelSchema("device-part-consume-table.basic", RepeatingSubTablePanel_default);
+var schema$23 = createTablePanelSchema("warehouse-out-table.basic", RepeatingSubTablePanel_default);
 //#endregion
 //#region src/suites/edhr/panel-schema/warehouse-in-out-table/warehouse-in-out-table.basic.ts
-var schema$18 = createTablePanelSchema("warehouse-in-out-table.basic", RepeatingSubTablePanel_default);
+var schema$22 = createTablePanelSchema("warehouse-in-out-table.basic", RepeatingSubTablePanel_default);
 //#endregion
 //#region src/suites/edhr/panel-schema/warehouse-inventory-table/warehouse-inventory-table.basic.ts
-var schema$17 = createTablePanelSchema("warehouse-inventory-table.basic", RepeatingSubTablePanel_default);
+var schema$21 = createTablePanelSchema("warehouse-inventory-table.basic", RepeatingSubTablePanel_default);
 //#endregion
 //#region src/suites/edhr/panel-schema/material-balance-table/material-balance-table.basic.ts
-var schema$16 = createTablePanelSchema("material-balance-table.basic", RepeatingSubTablePanel_default);
+var schema$20 = createTablePanelSchema("material-balance-table.basic", RepeatingSubTablePanel_default);
 //#endregion
 //#region src/suites/edhr/panel-schema/material-requisition-table/material-requisition-table.basic.ts
-var schema$15 = createTablePanelSchema("material-requisition-table.basic", RepeatingSubTablePanel_default);
+var schema$19 = createTablePanelSchema("material-requisition-table.basic", RepeatingSubTablePanel_default);
 //#endregion
 //#region src/suites/edhr/panel-schema/warehouse-allocate-table/warehouse-allocate-table.basic.ts
-var schema$14 = createTablePanelSchema("warehouse-allocate-table.basic", RepeatingSubTablePanel_default);
+var schema$18 = createTablePanelSchema("warehouse-allocate-table.basic", RepeatingSubTablePanel_default);
 //#endregion
 //#region src/suites/edhr/panel-schema/entrust-steril-batch-list-table/entrust-steril-batch-list-table.basic.ts
-var schema$13 = createTablePanelSchema("entrust-steril-batch-list-table.basic", RepeatingSubTablePanel_default);
+var schema$17 = createTablePanelSchema("entrust-steril-batch-list-table.basic", RepeatingSubTablePanel_default);
 //#endregion
 //#region src/suites/edhr/panel-schema/pretreatment-list-table/pretreatment-list-table.basic.ts
-var schema$12 = createTablePanelSchema("pretreatment-list-table.basic", RepeatingSubTablePanel_default);
+var schema$16 = createTablePanelSchema("pretreatment-list-table.basic", RepeatingSubTablePanel_default);
 //#endregion
 //#region src/suites/shared/panel/modules/sub-table-grid-info.vue?vue&type=script&setup=true&lang.ts
 init_base$2();
@@ -160376,7 +160384,7 @@ var _2DSubTablePanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 init__plugin_vue_export_helper();
 //#endregion
 //#region src/suites/edhr/panel-schema/2d-table/2d-table.basic.ts
-var schema$11 = createTablePanelSchema("2d-table.basic", /* @__PURE__ */ _plugin_vue_export_helper_default(_2DSubTablePanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-12ebeb6f"]]));
+var schema$15 = createTablePanelSchema("2d-table.basic", /* @__PURE__ */ _plugin_vue_export_helper_default(_2DSubTablePanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-12ebeb6f"]]));
 //#endregion
 //#region src/suites/edhr/panel-schema/material-consume-table/parse-rule-add-btn.vue?vue&type=script&setup=true&name=parse-rule-add-btn&lang.ts
 init_base$2();
@@ -160888,7 +160896,7 @@ var MaterialConsumeTablePanel_vue_vue_type_script_setup_true_lang_default = /*@_
 init__plugin_vue_export_helper();
 //#endregion
 //#region src/suites/edhr/panel-schema/material-consume-table/material-consume-table.basic.ts
-var schema$10 = createTablePanelSchema("material-consume-table.basic", /* @__PURE__ */ _plugin_vue_export_helper_default(MaterialConsumeTablePanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-9a20d3b9"]]));
+var schema$14 = createTablePanelSchema("material-consume-table.basic", /* @__PURE__ */ _plugin_vue_export_helper_default(MaterialConsumeTablePanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-9a20d3b9"]]));
 //#endregion
 //#region src/suites/edhr/panel-schema/_shared/BoundedSubTablePanel.vue?vue&type=script&setup=true&lang.ts
 init_table$1();
@@ -161011,7 +161019,7 @@ var BoundedSubTablePanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE
 init__plugin_vue_export_helper();
 //#endregion
 //#region src/suites/edhr/panel-schema/fixed-table/fixed-table.basic.ts
-var schema$9 = createTablePanelSchema("fixed-table.basic", /* @__PURE__ */ _plugin_vue_export_helper_default(BoundedSubTablePanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-5a5ac7e8"]]));
+var schema$13 = createTablePanelSchema("fixed-table.basic", /* @__PURE__ */ _plugin_vue_export_helper_default(BoundedSubTablePanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-5a5ac7e8"]]));
 //#endregion
 //#region src/suites/edhr/panel-schema/check-table/add-ds-btn.vue?vue&type=script&setup=true&name=add-ds-btn&lang.ts
 init_base$2();
@@ -161131,7 +161139,7 @@ var CheckTablePanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 init__plugin_vue_export_helper();
 //#endregion
 //#region src/suites/edhr/panel-schema/check-table/check-table.basic.ts
-var schema$8 = createTablePanelSchema("check-table.basic", /* @__PURE__ */ _plugin_vue_export_helper_default(CheckTablePanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-ff555ae9"]]));
+var schema$12 = createTablePanelSchema("check-table.basic", /* @__PURE__ */ _plugin_vue_export_helper_default(CheckTablePanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-ff555ae9"]]));
 //#endregion
 //#region src/suites/edhr/panel-schema/data-group/DataGroupPanel.vue?vue&type=script&setup=true&lang.ts
 init_base$2();
@@ -161237,7 +161245,7 @@ var DataGroupPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ d
 init__plugin_vue_export_helper();
 //#endregion
 //#region src/suites/edhr/panel-schema/data-group/data-group.basic.ts
-var schema$7 = {
+var schema$11 = {
 	key: "data-group.basic",
 	title: [
 		{
@@ -161435,7 +161443,7 @@ function createDataGroup2DTitle({ active, widget }) {
 }
 //#endregion
 //#region src/suites/edhr/panel-schema/data-group-2d/data-group-2d.basic.ts
-var schema$6 = {
+var schema$10 = {
 	key: "data-group-2d.basic",
 	title: [{
 		key: "paper",
@@ -163802,7 +163810,7 @@ var DataInitPanel_vue_vue_type_script_setup_true_name_panel_data_init_lang_defau
 init__plugin_vue_export_helper();
 //#endregion
 //#region src/suites/edhr/panel-schema/data-init/data-init.basic.ts
-var schema$5 = {
+var schema$9 = {
 	key: "data-init.basic",
 	title: "数据",
 	render: /* @__PURE__ */ _plugin_vue_export_helper_default(DataInitPanel_vue_vue_type_script_setup_true_name_panel_data_init_lang_default, [["__scopeId", "data-v-004e3ce4"]])
@@ -165268,7 +165276,7 @@ var RulePanel_vue_vue_type_script_setup_true_name_panel_rule_lang_default = /*@_
 init__plugin_vue_export_helper();
 //#endregion
 //#region src/suites/edhr/panel-schema/rule/rule.basic.ts
-var schema$4 = {
+var schema$8 = {
 	key: "rule.basic",
 	title: "规则",
 	render: /* @__PURE__ */ _plugin_vue_export_helper_default(RulePanel_vue_vue_type_script_setup_true_name_panel_rule_lang_default, [["__scopeId", "data-v-1da79152"]])
@@ -166163,7 +166171,7 @@ var FieldPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 init__plugin_vue_export_helper();
 //#endregion
 //#region src/suites/edhr/panel-schema/field/field.basic.ts
-var schema$3 = {
+var schema$7 = {
 	key: "field.basic",
 	title: "字段属性",
 	resolveTitle({ active, attachFieldTarget }) {
@@ -166237,7 +166245,7 @@ var PaperWidgetPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 init__plugin_vue_export_helper();
 //#endregion
 //#region src/suites/edhr/panel-schema/paper-widget/paper-widget.basic.ts
-var schema$2 = {
+var schema$6 = {
 	key: "paper-widget.basic",
 	title: "组件属性",
 	render: /* @__PURE__ */ _plugin_vue_export_helper_default(PaperWidgetPanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-07cf8744"]])
@@ -166308,7 +166316,7 @@ var TableHeaderPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/
 init__plugin_vue_export_helper();
 //#endregion
 //#region src/suites/edhr/panel-schema/table-header/table-header.basic.ts
-var schema$1 = {
+var schema$5 = {
 	key: "table-header.basic",
 	title: "表头",
 	render: /* @__PURE__ */ _plugin_vue_export_helper_default(TableHeaderPanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-1c020e08"]])
@@ -166479,7 +166487,7 @@ var PaperHeaderFooterPanel_vue_vue_type_script_setup_true_lang_default = /*@__PU
 init__plugin_vue_export_helper();
 //#endregion
 //#region src/suites/edhr/panel-schema/paper-header-footer/paper-header-footer.basic.ts
-var schema = {
+var schema$4 = {
 	key: "paper-header-footer.basic",
 	title: "页眉页脚属性",
 	render: /* @__PURE__ */ _plugin_vue_export_helper_default(PaperHeaderFooterPanel_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-80e3a630"]])
@@ -166491,30 +166499,26 @@ function registryPanelSchemas() {
 		"paper.basic": schema$26,
 		"dynamic-table.basic": schema$25,
 		"warehouse-in-table.basic": schema$24,
-		"warehouse-inbound-table.basic": schema$23,
-		"warehouse-out-table.basic": schema$22,
-		"warehouse-outbound-table.basic": schema$21,
-		"part-stocktake-table.basic": schema$20,
-		"device-part-consume-table.basic": schema$19,
-		"warehouse-in-out-table.basic": schema$18,
-		"warehouse-inventory-table.basic": schema$17,
-		"warehouse-allocate-table.basic": schema$14,
-		"entrust-steril-batch-list-table.basic": schema$13,
-		"pretreatment-list-table.basic": schema$12,
-		"2d-table.basic": schema$11,
-		"material-consume-table.basic": schema$10,
-		"material-balance-table.basic": schema$16,
-		"material-requisition-table.basic": schema$15,
-		"fixed-table.basic": schema$9,
-		"check-table.basic": schema$8,
-		"data-group.basic": schema$7,
-		"data-group-2d.basic": schema$6,
-		"data-init.basic": schema$5,
-		"rule.basic": schema$4,
-		"paper-header-footer.basic": schema,
-		"field.basic": schema$3,
-		"table-header.basic": schema$1,
-		"paper-widget.basic": schema$2
+		"warehouse-out-table.basic": schema$23,
+		"warehouse-in-out-table.basic": schema$22,
+		"warehouse-inventory-table.basic": schema$21,
+		"warehouse-allocate-table.basic": schema$18,
+		"entrust-steril-batch-list-table.basic": schema$17,
+		"pretreatment-list-table.basic": schema$16,
+		"2d-table.basic": schema$15,
+		"material-consume-table.basic": schema$14,
+		"material-balance-table.basic": schema$20,
+		"material-requisition-table.basic": schema$19,
+		"fixed-table.basic": schema$13,
+		"check-table.basic": schema$12,
+		"data-group.basic": schema$11,
+		"data-group-2d.basic": schema$10,
+		"data-init.basic": schema$9,
+		"rule.basic": schema$8,
+		"paper-header-footer.basic": schema$4,
+		"field.basic": schema$7,
+		"table-header.basic": schema$5,
+		"paper-widget.basic": schema$6
 	};
 }
 //#endregion
@@ -173881,6 +173885,43 @@ var edhrSuitePlugin = {
 	install: installEdhrSuite
 };
 //#endregion
+//#region src/suites/eqm/panel-router/index.ts
+/** EQM 业务表面板约定路由 */
+var EQM_CONVENTION_PANEL_TYPES = [
+	"panel:warehouse-inbound-table",
+	"panel:warehouse-outbound-table",
+	"panel:part-stocktake-table",
+	"panel:device-part-consume-table"
+];
+function registryEqmPanelRouters() {
+	const panelRouters = {};
+	for (const panelType of EQM_CONVENTION_PANEL_TYPES) panelRouters[panelType] = () => `${panelType.slice(6)}.basic`;
+	return panelRouters;
+}
+//#endregion
+//#region src/suites/eqm/panel-schema/warehouse-inbound-table/warehouse-inbound-table.basic.ts
+var schema$3 = createTablePanelSchema("warehouse-inbound-table.basic", RepeatingSubTablePanel_default);
+//#endregion
+//#region src/suites/eqm/panel-schema/warehouse-outbound-table/warehouse-outbound-table.basic.ts
+var schema$2 = createTablePanelSchema("warehouse-outbound-table.basic", RepeatingSubTablePanel_default);
+//#endregion
+//#region src/suites/eqm/panel-schema/part-stocktake-table/part-stocktake-table.basic.ts
+var schema$1 = createTablePanelSchema("part-stocktake-table.basic", RepeatingSubTablePanel_default);
+//#endregion
+//#region src/suites/eqm/panel-schema/device-part-consume-table/device-part-consume-table.basic.ts
+var schema = createTablePanelSchema("device-part-consume-table.basic", RepeatingSubTablePanel_default);
+//#endregion
+//#region src/suites/eqm/panel-schema/index.ts
+/** EQM 业务表面板 schema */
+function registryEqmPanelSchemas() {
+	return {
+		"warehouse-inbound-table.basic": schema$3,
+		"warehouse-outbound-table.basic": schema$2,
+		"part-stocktake-table.basic": schema$1,
+		"device-part-consume-table.basic": schema
+	};
+}
+//#endregion
 //#region src/suites/eqm/index.ts
 init_model_field_runtime();
 init_field_manifest();
@@ -173891,7 +173932,8 @@ init_registry$2();
 init_registry$1();
 var SUITE_KEY = "eqm";
 /**
-* 当前复用 edhr 能力；可见性差异见 `suites/shared/suite-features.ts`
+* 复用 edhr 字段/组件能力；EQM 业务表面板在本套件注册。
+* 可见性差异见 `suites/shared/suite-features.ts`
 */
 function installEqmSuite() {
 	FieldEngine.bootstrap({
@@ -173902,11 +173944,17 @@ function installEqmSuite() {
 	fieldManifestRegistry.register(SUITE_KEY, fieldManifestMap);
 	paperWidgetManifestRegistry.register(SUITE_KEY, paperWidgetManifestMap);
 	componentRegistry.register(SUITE_KEY, vueComponentMap);
-	panelRouterRegistry.register(SUITE_KEY, registryPanelRouters());
-	panelSchemaRegistry.register(SUITE_KEY, registryPanelSchemas());
+	panelRouterRegistry.register(SUITE_KEY, {
+		...registryPanelRouters(),
+		...registryEqmPanelRouters()
+	});
+	panelSchemaRegistry.register(SUITE_KEY, {
+		...registryPanelSchemas(),
+		...registryEqmPanelSchemas()
+	});
 	panelConfigRegistry.register(SUITE_KEY, panelConfigComponentMap);
 }
-/** EQM 套件插件注册（当前复用 edhr 能力） */
+/** EQM 套件插件注册 */
 var eqmSuitePlugin = {
 	key: SUITE_KEY,
 	install: installEqmSuite

package/dist/runtime/renderer/dropdowns/components/tables/utils/assoc-filter.d.ts

@@ -4,10 +4,14 @@ type AssocFilterWidgetProps = {
     assocFilterSourceField?: string;
     assocFilterSourceFieldType?: string;
 };
+/**
+ * buildLikeQuery 识别：这些 key 彼此 OR，再与其余过滤 AND。
+ * 用于 RDO base_id_ 与普通 id_ 混用场景。
+ */
+export declare const ASSOC_FILTER_OR_EXP_KEYS = "__orExpKeys";
 /**
  * 按物料「关联过滤」配置，回查源字段同源接口拿到 product_id_ 再拼查询参数。
- * - 未开启 / 源值为空 → {}（不加过滤，不清空已选物料）
- * - 源有值但解析不到产品 → 空命中条件（不退回全量产品）
+ * 未开启 / 源值为空 / 解析不到产品 → {}（不加过滤，不清空已选物料）。
  */
 export declare function buildAssocFilterExtraParams(doc: Doc, widgetProps: AssocFilterWidgetProps | undefined, runtimeValuePath?: string): Promise<Record<string, any>>;
 export {};

package/dist/suites/edhr/manifest/field/_common_/basic.d.ts

@@ -1,5 +1,5 @@
 import { ComponentDependency } from '../../../../shared/panel/modules/field-dependency-module/types';
-import { MapRule, PriorityRule, ResolveRule, HyperlinkRule, LabelRule, IdRule } from '../../../../../domain/field/field-props-schema-type';
+import { MapRule, PriorityRule, ResolveRule, HyperlinkRule, LabelRule, IdRule, LotParentLabelRule } from '../../../../../domain/field/field-props-schema-type';
 import { FieldNodeRenderers } from '../../../../../core/widget';
 export declare const commonDefaultRenderers: FieldNodeRenderers;
 export declare const commonDefaultProps: {
@@ -96,7 +96,13 @@ export declare const labelOnValueChangeRule: LabelRule;
 export declare const hyperlinkOnValueChangeRule: HyperlinkRule;
 /** 值变化后补全批次唯一标识 _id_ */
 export declare const idOnValueChangeRule: IdRule;
+/** LOT/SN：按 name_ 回查父批展示名写入 _lb_ */
+export declare const lotParentLabelByNameRule: LotParentLabelRule;
+/** 生产 LOT/SN：按 id_ 回查父批展示名写入 _lb_ */
+export declare const lotParentLabelByIdRule: LotParentLabelRule;
 /** 同时补全 _href_ 与 _lb_（如批次号等追溯字段） */
 export declare const hyperlinkAndLabelOnValueChangeRules: readonly [HyperlinkRule, LabelRule];
 /** 批次号：补全 _href_ 与  _id_ */
 export declare const hyperlinkAndIdOnValueChangeRules: readonly [HyperlinkRule, IdRule];
+/** 批次号：补全 _href_、_id_ 与父批展示 _lb_ */
+export declare const hyperlinkIdAndLotParentLabelRules: readonly [HyperlinkRule, IdRule, LotParentLabelRule];

package/dist/suites/edhr/panel-schema/index.d.ts

@@ -6,11 +6,7 @@ export declare function registryPanelSchemas(): {
     };
     'dynamic-table.basic': import('../../..').PanelSchema;
     'warehouse-in-table.basic': import('../../..').PanelSchema;
-    'warehouse-inbound-table.basic': import('../../..').PanelSchema;
     'warehouse-out-table.basic': import('../../..').PanelSchema;
-    'warehouse-outbound-table.basic': import('../../..').PanelSchema;
-    'part-stocktake-table.basic': import('../../..').PanelSchema;
-    'device-part-consume-table.basic': import('../../..').PanelSchema;
     'warehouse-in-out-table.basic': import('../../..').PanelSchema;
     'warehouse-inventory-table.basic': import('../../..').PanelSchema;
     'warehouse-allocate-table.basic': import('../../..').PanelSchema;

package/dist/suites/eqm/index.d.ts

@@ -1,3 +1,3 @@
 import { WordSuitePlugin } from '../../sdk/types';
-/** EQM 套件插件注册（当前复用 edhr 能力） */
+/** EQM 套件插件注册 */
 export declare const eqmSuitePlugin: WordSuitePlugin;

package/dist/suites/eqm/panel-router/index.d.ts

@@ -0,0 +1,2 @@
+import { PanelRouterMap } from '../../../capabilities/panel/router/types';
+export declare function registryEqmPanelRouters(): PanelRouterMap;

package/dist/suites/eqm/panel-schema/index.d.ts

@@ -0,0 +1,7 @@
+/** EQM 业务表面板 schema */
+export declare function registryEqmPanelSchemas(): {
+    'warehouse-inbound-table.basic': import('../../..').PanelSchema;
+    'warehouse-outbound-table.basic': import('../../..').PanelSchema;
+    'part-stocktake-table.basic': import('../../..').PanelSchema;
+    'device-part-consume-table.basic': import('../../..').PanelSchema;
+};

package/package.json

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