@gct-paas/word 0.1.63-beta.4 → 0.1.63-beta.6

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

@@ -40,8 +40,6 @@ export interface ApiRule {
     type: 'api';
     /** 请求函数 key */
     fetcher: 'ref' | 'rdo2ref';
-    /** 仅主模型字段可发起请求 */
-    onlyMainModelFieldsCanRequest: boolean;
     /** 失败时的默认 label */
     fallback?: string;
 }
@@ -78,6 +76,10 @@ export interface FieldComputedConfig {
     propRules?: Record<string, ComputedRule>;
     /** 写入 dataManager 的派生规则 */
     defaultValueRule?: ComputedRule;
+    /** 仅主模型字段可赋运行时默认值，子模型字段跳过默认值注入 */
+    onlyMainModelCanDefault?: boolean;
+    /** 作为对象子字段时，跳过运行时默认值解析 */
+    skipDefaultWhenBelongingObject?: boolean;
     /** 填报值变化后的 enrich（超链接 _href_、展示标签 _lb_、批次 _id_） */
     onValueChangeRule?: ValueChangeRule | ValueChangeRule[];
 }

package/dist/index.es.js

@@ -80842,17 +80842,24 @@ async function resolveFieldDefaults(params) {
   const manifest2 = ctx.getFieldManifest(field.fieldType);
   if (!manifest2?.computed) return;
   const { defaultValueRule } = manifest2.computed;
+  const skipRuntimeDefaultEnrichment = shouldSkipRuntimeDefaultEnrichment(field, manifest2.computed);
   let defaults2 = applyDefaultValue(props, {
     rule: defaultValueRule,
     valuePath: field.valuePath,
     fieldType: field.fieldType
   });
   if (defaultValueRule?.type === "api" || defaultValueRule?.type === "resolve" && defaultValueRule.isRenderSideRequest) {
-    defaults2 = enrichApiDefaultValues(defaults2, defaultValueRule, field.valuePath, field, context);
+    defaults2 = enrichApiDefaultValues(defaults2, defaultValueRule, field.valuePath, field, context, {
+      skipRuntimeDefaultEnrichment
+    });
   } else if (field.fieldType === FIELD_TYPE.E_SOP_VERSION && props.sopId) {
-    defaults2 = await enrichESopVersionDefaultValues(defaults2, field.valuePath, props, context);
+    if (!skipRuntimeDefaultEnrichment) {
+      defaults2 = await enrichESopVersionDefaultValues(defaults2, field.valuePath, props, context);
+    }
   } else {
-    defaults2 = enrichContextDefaultValues(defaults2, field.valuePath, field.fieldType, context);
+    defaults2 = enrichContextDefaultValues(defaults2, field.valuePath, field.fieldType, context, {
+      skipRuntimeDefaultEnrichment
+    });
   }
   const autofillDefaultValues = await loadDefaultValueByAutofillRules(
     instances,
@@ -80876,8 +80883,6 @@ async function loadDefaultValuesByFields(instances, ctx, context, masterSlaveLis
   const promises = instances.map(async (instance2) => {
     const { field, props } = instance2.widgetMeta;
     if (!field || !props) return;
-    const isSpecialMaterialConsumeObjField = !!field.belongingObject && [FIELD_TYPE.PRODUCT, FIELD_TYPE.MATERIAL_NO].includes(field.fieldType);
-    if (isSpecialMaterialConsumeObjField) return;
     mergeDefaultsIntoMap(
       defaultDataMap,
       await resolveFieldDefaults({ props, field, ctx, context, instances })
@@ -84262,6 +84267,15 @@ function applyDefaultValue(props, payload) {
 function buildFieldValueUpdate(valuePath, value) {
   return { [valuePath]: value };
 }
+function shouldSkipRuntimeDefaultEnrichment(fieldMeta, computed2) {
+  if (computed2?.onlyMainModelCanDefault && fieldMeta.subFieldKey) {
+    return true;
+  }
+  if (computed2?.skipDefaultWhenBelongingObject && fieldMeta.belongingObject) {
+    return true;
+  }
+  return false;
+}
 function enrichApiDefaultValues(defaults2, rule, valuePath, fieldMeta, context, options) {
   if (!rule || !("fetcher" in rule)) {
     return defaults2;
@@ -84275,8 +84289,7 @@ function enrichApiDefaultValues(defaults2, rule, valuePath, fieldMeta, context,
       return defaults2;
     }
   } else if (rule.type === "api") {
-    const apiRule = rule;
-    if (apiRule.onlyMainModelFieldsCanRequest && fieldMeta.subFieldKey && true) {
+    if (options?.skipRuntimeDefaultEnrichment) {
       return defaults2;
     }
   } else {
@@ -84284,7 +84297,10 @@ function enrichApiDefaultValues(defaults2, rule, valuePath, fieldMeta, context,
   }
   return { ...defaults2, [valuePath]: id };
 }
-function enrichContextDefaultValues(defaults2, valuePath, fieldType, context) {
+function enrichContextDefaultValues(defaults2, valuePath, fieldType, context, options) {
+  if (options?.skipRuntimeDefaultEnrichment) {
+    return defaults2;
+  }
   const contextValue = context[fieldType];
   if (isEmptyValue$1(contextValue)) {
     return defaults2;
@@ -89111,7 +89127,8 @@ const fields$1 = [
       optionMapping: { value: "id_", label: "name_" },
       searchFields: ["name_"],
       baseQuery: {
-        "production_identification_type_.in": ["LOT", "SN"]
+        "production_identification_type_.in": ["LOT", "SN"],
+        is_rework_: 0
       }
     },
     defaultProps: {},
@@ -89526,7 +89543,8 @@ const fields = [
       optionMapping: { value: "id_", label: "name_" },
       searchFields: ["name_"],
       baseQuery: {
-        "production_identification_type_.in": ["LOT", "SN"]
+        "production_identification_type_.in": ["LOT", "SN"],
+        is_rework_: 0
       }
     },
     defaultProps: {},
@@ -89679,10 +89697,17 @@ async function openEntrustSterilBatchListScan(options) {
         GctMessage.error("扫描的物料批次不存在");
         return;
       }
-      const { queryData, exp } = buildLikeQuery([], "", {
+      const { queryData: typeQueryData, exp: typeExp } = buildLikeQuery([], "", {
         "production_identification_type_.in": ["LOT", "SN"],
-        ...requestBody
+        is_rework_: 0
       });
+      const queryData = {
+        ...typeQueryData,
+        ...requestBody
+      };
+      const nameKeys = Object.keys(requestBody);
+      const nameExp = nameKeys.length <= 1 ? nameKeys[0] ?? "" : `AND(${nameKeys.join(",")})`;
+      const exp = typeExp && nameExp ? `AND(${nameExp},${typeExp})` : nameExp || typeExp;
       const result = await callBizService(remoteSync.api, {
         query: queryData,
         exp
@@ -123155,10 +123180,10 @@ const manifest$X = {
     ...autofillFieldDefaultProps
   },
   computed: {
+    onlyMainModelCanDefault: true,
     defaultValueRule: {
       type: "api",
-      fetcher: "ref",
-      onlyMainModelFieldsCanRequest: true
+      fetcher: "ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -123204,10 +123229,10 @@ const manifest$V = {
     ...autofillFieldDefaultProps
   },
   computed: {
+    onlyMainModelCanDefault: true,
     defaultValueRule: {
       type: "api",
-      fetcher: "ref",
-      onlyMainModelFieldsCanRequest: true
+      fetcher: "ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -123366,10 +123391,10 @@ const manifest$O = {
     ...autofillFieldDefaultProps
   },
   computed: {
+    onlyMainModelCanDefault: true,
     defaultValueRule: {
       type: "api",
-      fetcher: "ref",
-      onlyMainModelFieldsCanRequest: true
+      fetcher: "ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -123393,10 +123418,10 @@ const manifest$N = {
     ...autofillFieldDefaultProps
   },
   computed: {
+    onlyMainModelCanDefault: true,
     defaultValueRule: {
       type: "api",
-      fetcher: "ref",
-      onlyMainModelFieldsCanRequest: true
+      fetcher: "ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -123420,10 +123445,10 @@ const manifest$M = {
     ...autofillFieldDefaultProps
   },
   computed: {
+    onlyMainModelCanDefault: true,
     defaultValueRule: {
       type: "api",
-      fetcher: "rdo2ref",
-      onlyMainModelFieldsCanRequest: true
+      fetcher: "rdo2ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -123490,10 +123515,10 @@ const manifest$J = {
     ...autofillFieldDefaultProps
   },
   computed: {
+    onlyMainModelCanDefault: true,
     defaultValueRule: {
       type: "api",
-      fetcher: "ref",
-      onlyMainModelFieldsCanRequest: true
+      fetcher: "ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -123566,8 +123591,7 @@ const manifest$G = {
   computed: {
     defaultValueRule: {
       type: "api",
-      fetcher: "rdo2ref",
-      onlyMainModelFieldsCanRequest: false
+      fetcher: "rdo2ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -123749,8 +123773,7 @@ const manifest$z = {
   computed: {
     defaultValueRule: {
       type: "api",
-      fetcher: "ref",
-      onlyMainModelFieldsCanRequest: false
+      fetcher: "ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -123852,8 +123875,7 @@ const manifest$v = {
   computed: {
     defaultValueRule: {
       type: "api",
-      fetcher: "ref",
-      onlyMainModelFieldsCanRequest: false
+      fetcher: "ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -123929,8 +123951,7 @@ const manifest$s = {
   computed: {
     defaultValueRule: {
       type: "api",
-      fetcher: "ref",
-      onlyMainModelFieldsCanRequest: false
+      fetcher: "ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -124082,10 +124103,10 @@ const manifest$l = {
     }
   },
   computed: {
+    onlyMainModelCanDefault: true,
     defaultValueRule: {
       type: "api",
-      fetcher: "ref",
-      onlyMainModelFieldsCanRequest: true
+      fetcher: "ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -124147,6 +124168,8 @@ const manifest$i = {
     ...commonDefaultProps
   },
   computed: {
+    onlyMainModelCanDefault: true,
+    skipDefaultWhenBelongingObject: true,
     onValueChangeRule: [...hyperlinkAndIdOnValueChangeRules]
   }
 };
@@ -124169,10 +124192,10 @@ const manifest$h = {
     ...autofillFieldDefaultProps
   },
   computed: {
+    onlyMainModelCanDefault: true,
     defaultValueRule: {
       type: "api",
-      fetcher: "ref",
-      onlyMainModelFieldsCanRequest: true
+      fetcher: "ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -124218,10 +124241,11 @@ const manifest$f = {
     }
   },
   computed: {
+    onlyMainModelCanDefault: true,
+    skipDefaultWhenBelongingObject: true,
     defaultValueRule: {
       type: "api",
-      fetcher: "rdo2ref",
-      onlyMainModelFieldsCanRequest: true
+      fetcher: "rdo2ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -124251,10 +124275,10 @@ const manifest$e = {
     }
   },
   computed: {
+    onlyMainModelCanDefault: true,
     defaultValueRule: {
       type: "api",
-      fetcher: "ref",
-      onlyMainModelFieldsCanRequest: true
+      fetcher: "ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -124284,10 +124308,10 @@ const manifest$d = {
     }
   },
   computed: {
+    onlyMainModelCanDefault: true,
     defaultValueRule: {
       type: "api",
-      fetcher: "ref",
-      onlyMainModelFieldsCanRequest: true
+      fetcher: "ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -124328,6 +124352,7 @@ const manifest$b = {
     ...commonDefaultProps
   },
   computed: {
+    onlyMainModelCanDefault: true,
     onValueChangeRule: [...hyperlinkAndIdOnValueChangeRules]
   }
 };
@@ -124356,10 +124381,10 @@ const manifest$a = {
     }
   },
   computed: {
+    onlyMainModelCanDefault: true,
     defaultValueRule: {
       type: "api",
-      fetcher: "ref",
-      onlyMainModelFieldsCanRequest: true
+      fetcher: "ref"
     },
     onValueChangeRule: labelOnValueChangeRule
   }
@@ -124382,7 +124407,8 @@ const manifest$9 = {
     ...commonDefaultProps
   },
   computed: {
-    onValueChangeRule: idOnValueChangeRule
+    onlyMainModelCanDefault: true,
+    onValueChangeRule: [...hyperlinkAndIdOnValueChangeRules]
   }
 };
 const __vite_glob_0_63 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({

package/dist/runtime/interface/computed.d.ts

@@ -1,6 +1,6 @@
 import { FIELD_TYPE } from '../../domain/field/field-type';
 import { Doc } from '../../core';
-import { ComputedRule } from '../../domain/field/field-props-schema-type';
+import { ComputedRule, FieldComputedConfig } from '../../domain/field/field-props-schema-type';
 import { FieldDataBindingMeta } from '../../core/widget';
 export declare const RUNTIME_DATE_DEFAULT_PREFIX = "runtimeValue:date:";
 export declare function resolveComputedRule(rule: ComputedRule, props: any, fieldType?: FIELD_TYPE): any;
@@ -14,17 +14,21 @@ export declare function applyDefaultValue(props: any, payload: {
 } | undefined;
 /** 单字段 value 写入片段 */
 export declare function buildFieldValueUpdate(valuePath: string, value: unknown): Record<string, unknown>;
+/** 是否应跳过 context / api 运行时默认值注入 */
+export declare function shouldSkipRuntimeDefaultEnrichment(fieldMeta: FieldDataBindingMeta, computed?: FieldComputedConfig): boolean;
 /**
  * 渲染端：用 context 里的真实 id 覆盖设计态占位默认值
  */
 export declare function enrichApiDefaultValues(defaults: Record<string, any> | undefined, rule: ComputedRule, valuePath: string, fieldMeta: FieldDataBindingMeta, context: Record<string, unknown>, options?: {
-    allowSubModelRequest?: boolean;
+    skipRuntimeDefaultEnrichment?: boolean;
 }): Record<string, any> | undefined;
 /**
  * 渲染端：用 context[fieldType] 补全默认值（设计态 defaultValue 优先，仅空值时填充）
  * 适用于文本等非 api 类型字段从 paramsConfig 注入默认值
  */
-export declare function enrichContextDefaultValues(defaults: Record<string, any> | undefined, valuePath: string, fieldType: FIELD_TYPE, context: Record<string, unknown>): Record<string, any> | undefined;
+export declare function enrichContextDefaultValues(defaults: Record<string, any> | undefined, valuePath: string, fieldType: FIELD_TYPE, context: Record<string, unknown>, options?: {
+    skipRuntimeDefaultEnrichment?: boolean;
+}): Record<string, any> | undefined;
 /**
  * E-SOP 版本字段：配置了 SOP 后的默认值补全
  * 优先级：设计态 defaultValue > paramsConfig.sopList > 接口 default_ 版本

package/package.json

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