@gct-paas/word 0.1.74-beta.10 → 0.1.74-beta.11

package/dist/domain/table/runtime/engines/linkage-engine.d.ts

@@ -46,8 +46,15 @@ export declare class LinkageEngine {
      * 1.当前行同名字段 → 2.context 隐式字段 → 3.主表映射字段 → 4.主表顶层同名字段（配置允许时）
      */
     private resolveLinkFieldValue;
-    /** 判断下拉联动是否需要启用 */
-    private shouldEnableSelectLinkage;
+    /**
+     * 解析实际生效的上游字段：
+     * 1. 首选 linkFieldKey（requireLinkWidget=false 或不要求控件 / 控件已拖入）
+     * 2. 否则若配置了 fallbackLinkFieldKey，且回退上游可用 → 用回退上游
+     * 3. 都不可用 → null（不启用联动）
+     */
+    private resolveActiveLinkFieldKey;
+    /** 判断某个上游字段当前是否可作为联动来源 */
+    private isLinkFieldAvailable;
     /**
      * 级联变更需清空的字段：
      * - 显式配置了 clearOnLinkChange（含空数组）→ 使用配置值

package/dist/domain/table/types.d.ts

@@ -374,6 +374,11 @@ export interface LinkQueryContext extends RuleContext {
 export interface SelectBehaviorDef {
     /** 上游字段 key 可与本字段同处一行 也可在子表外但需配合 implicitFields  */
     linkFieldKey: string;
+    /**
+     * 首选上游控件未拖入时的回退上游字段。
+     * 例：库位优先按库区联动；未拖库区时回退按仓库联动。
+     */
+    fallbackLinkFieldKey?: string;
     /**
      * 是否要求上游字段拖入子表表单才启用联动
      *
@@ -385,6 +390,7 @@ export interface SelectBehaviorDef {
      * | `false` | 不要求拖上游控件；行内无值时回退读主表 `$.{linkFieldKey}`，进行联动
      *
      * 与 `implicitFields` 配合：主表上游建议同时写 implicitFields（主表变更时刷新所有行 + 清空下游）。
+     * 若配置了 `fallbackLinkFieldKey`：首选上游未拖入时，对回退上游同样按本开关判断。
      */
     requireLinkWidget?: boolean;
     /** 构建下拉查询参数 */

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @gct-paas/word v0.1.74-beta.10 */
+/*! @gct-paas/word v0.1.74-beta.11 */
 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";
@@ -97564,8 +97564,14 @@ var init_fields$11 = __esmMin((() => {
 			match: { fieldKey: F$11.location },
 			select: {
 				linkFieldKey: F$11.storageZone,
+				fallbackLinkFieldKey: F$11.warehouse,
 				requireLinkWidget: true,
-				buildLinkQuery: ({ linkValue }) => linkValue ? { "storage_zone_id_.eq": linkValue } : {}
+				buildLinkQuery: ({ linkFieldKey, linkValue }) => {
+					if (!linkValue) return {};
+					if (linkFieldKey === F$11.storageZone) return { "storage_zone_id_.eq": linkValue };
+					if (linkFieldKey === F$11.warehouse) return { "warehouse_id_.eq": linkValue };
+					return {};
+				}
 			}
 		}
 	];
@@ -99043,8 +99049,9 @@ var init_linkage_engine = __esmMin((() => {
 			const updates = {};
 			for (const fieldProfile of ctx.profile.fields ?? []) {
 				const select = fieldProfile.select;
-				if (!select || select.linkFieldKey !== changedFieldKey) continue;
-				if (!this.shouldEnableSelectLinkage(ctx, select)) continue;
+				if (!select) continue;
+				const activeLinkFieldKey = this.resolveActiveLinkFieldKey(ctx, select);
+				if (!activeLinkFieldKey || activeLinkFieldKey !== changedFieldKey) continue;
 				const fieldKey = resolveFieldKeyFromMatch(fieldProfile);
 				if (!fieldKey) continue;
 				Object.assign(updates, buildClearUpdates(ruleCtx.rowPath, this.getDownstreamClearFieldKeys(select, fieldKey), { clearValue: void 0 }));
@@ -99058,18 +99065,18 @@ var init_linkage_engine = __esmMin((() => {
 			var _ctx$findFieldProfile;
 			const select = (_ctx$findFieldProfile = ctx.findFieldProfile(fieldKey)) === null || _ctx$findFieldProfile === void 0 ? void 0 : _ctx$findFieldProfile.select;
 			if (!select) return null;
-			if (!this.shouldEnableSelectLinkage(ctx, select)) return {
+			const activeLinkFieldKey = this.resolveActiveLinkFieldKey(ctx, select);
+			if (!activeLinkFieldKey) return {
 				enabled: false,
 				linkFieldKey: select.linkFieldKey
 			};
 			const parsed = runtimeValuePath ? parseSubtableFieldPath(runtimeValuePath) : null;
 			const rowIndex = (parsed === null || parsed === void 0 ? void 0 : parsed.rowIndex) ?? 0;
 			const ruleCtx = ctx.buildRuleContext(rowIndex);
-			const linkValue = this.resolveLinkFieldValue(ctx, ruleCtx, select.linkFieldKey, select);
 			return {
 				enabled: true,
-				linkFieldKey: select.linkFieldKey,
-				linkValue,
+				linkFieldKey: activeLinkFieldKey,
+				linkValue: this.resolveLinkFieldValue(ctx, ruleCtx, activeLinkFieldKey, select),
 				requireLinkValue: select.requireLinkValue
 			};
 		}
@@ -99103,14 +99110,15 @@ var init_linkage_engine = __esmMin((() => {
 			const fieldKey = resolveFieldKeyFromMatch(fieldProfile);
 			const select = fieldProfile.select;
 			if (!fieldKey || !select) return;
-			if (!this.shouldEnableSelectLinkage(ctx, select)) return;
 			if (!select.buildLinkQuery) return;
-			const linkValue = this.resolveLinkFieldValue(ctx, ruleCtx, select.linkFieldKey, select);
+			const activeLinkFieldKey = this.resolveActiveLinkFieldKey(ctx, select);
+			if (!activeLinkFieldKey) return;
+			const linkValue = this.resolveLinkFieldValue(ctx, ruleCtx, activeLinkFieldKey, select);
 			const fieldValuePath = `${ruleCtx.rowPath}.${fieldKey}`;
 			const linkCtx = {
 				...ruleCtx,
 				fieldKey,
-				linkFieldKey: select.linkFieldKey,
+				linkFieldKey: activeLinkFieldKey,
 				linkValue
 			};
 			const queryParams = select.buildLinkQuery(linkCtx);
@@ -99140,10 +99148,21 @@ var init_linkage_engine = __esmMin((() => {
 			}
 			return rowValue;
 		}
-		/** 判断下拉联动是否需要启用 */
-		shouldEnableSelectLinkage(ctx, select) {
+		/**
+		* 解析实际生效的上游字段：
+		* 1. 首选 linkFieldKey（requireLinkWidget=false 或不要求控件 / 控件已拖入）
+		* 2. 否则若配置了 fallbackLinkFieldKey，且回退上游可用 → 用回退上游
+		* 3. 都不可用 → null（不启用联动）
+		*/
+		resolveActiveLinkFieldKey(ctx, select) {
+			if (this.isLinkFieldAvailable(ctx, select.linkFieldKey, select)) return select.linkFieldKey;
+			if (select.fallbackLinkFieldKey && this.isLinkFieldAvailable(ctx, select.fallbackLinkFieldKey, select)) return select.fallbackLinkFieldKey;
+			return null;
+		}
+		/** 判断某个上游字段当前是否可作为联动来源 */
+		isLinkFieldAvailable(ctx, linkFieldKey, select) {
 			if (select.requireLinkWidget === false) return true;
-			return ctx.hasFieldWidget(select.linkFieldKey);
+			return ctx.hasFieldWidget(linkFieldKey);
 		}
 		/**
 		* 级联变更需清空的字段：

package/package.json

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