@gct-paas/word 0.1.57 → 0.1.58

package/dist/core/data/DataManager.d.ts

@@ -85,6 +85,7 @@ export declare class DataManager {
     private scheduleLayout;
     getLabelPath(path: JsonPath): JsonPath;
     getHrefPath(path: JsonPath): JsonPath;
+    getIdPath(path: JsonPath): JsonPath;
     getFieldRuntimeSpecificConfigKeys(): string[];
     getRuntimeSpecificConfig(): [string, FieldRuntimeSpecificConfig][];
     setRuntimeSpecificConfig(entries: any): void;
@@ -121,6 +122,8 @@ export declare class DataManager {
     getLabel<T = any>(path: JsonPath): T | undefined;
     /** 获取与 value 并存的超链接 href；无或不可链时为 null/undefined */
     getHref<T = string>(path: JsonPath): T | null | undefined;
+    /** 获取与 value 并存的批次唯一标识；老数据可能为空 */
+    getId<T = string>(path: JsonPath): T | null | undefined;
     /** 子表数组路径下未软删行数 */
     countActiveSubtableRows(arrayPath: JsonPath): number;
     /**
@@ -328,7 +331,7 @@ export declare class DataManager {
      * @param runtimeValuePath 版面解析后的具体路径（可选）
      */
     removeFieldBindingData(designValuePath: JsonPath, runtimeValuePath?: JsonPath): void;
-    /** 收集与字段绑定相关的路径（含 value / label / href 及通配符变体） */
+    /** 收集与字段绑定相关的路径（含 value / label / href / id 及通配符变体） */
     private collectFieldBindingPaths;
     /** 收集可从 rawData 删除的具体路径（跳过含通配符的设计路径） */
     private collectConcreteRawDataPaths;

package/dist/core/data/derived-fields.d.ts

@@ -2,11 +2,14 @@
 export declare const LABEL_SUFFIX = "_lb_";
 /** 与 rawData 并存的外链 href 后缀（超链接字段） */
 export declare const HREF_SUFFIX = "_href_";
+/** 与 rawData 并存的 id 后缀（批次字段，如 material_no_ → material_no__id_） */
+export declare const ID_SUFFIX = "_id_";
 /** 版面超链接文字颜色 */
 export declare const HYPERLINK_TEXT_COLOR = "#0563c1";
 export declare function getLabelPath(path: string): string;
 export declare function getHrefPath(path: string): string;
-/** 派生数据路径（label / href），不参与 changedMap / 业务副作用 */
+export declare function getIdPath(path: string): string;
+/** 派生数据路径（label / href / id），不参与 changedMap / 业务副作用 */
 export declare function isDerivedDataPath(path: string): boolean;
 /** 子表行内仅前端使用、不参与提交的字段 */
 export declare const ROW_RUNTIME_META_KEYS: Set<string>;

package/dist/core/data/enrichers/id-enricher.d.ts

@@ -0,0 +1,9 @@
+import { Doc } from '../../view/Doc';
+import { WidgetMeta } from '../../widget/widget-meta';
+import { DataEnricherRegistration } from '../enricher-types';
+type IdEnricherOptions = Omit<DataEnricherRegistration, 'enrich'> & {
+    doc: Doc;
+    widgetMeta: WidgetMeta;
+};
+export declare function createIdEnricher(reg: IdEnricherOptions): DataEnricherRegistration;
+export {};

package/dist/core/data/pipeline-logger.d.ts

@@ -1,5 +1,5 @@
 import { EmitSource } from './emit-source';
-export type PipelineLogNS = 'data.emit' | 'pipeline.hydrate' | 'pipeline.onChange' | 'pipeline.deps' | 'enricher.label' | 'enricher.hyperlink' | 'pipeline.afterFlush' | 'table.runtime' | 'init.lifecycle' | 'submit.prepare';
+export type PipelineLogNS = 'data.emit' | 'pipeline.hydrate' | 'pipeline.onChange' | 'pipeline.deps' | 'enricher.label' | 'enricher.hyperlink' | 'enricher.id' | 'pipeline.afterFlush' | 'table.runtime' | 'init.lifecycle' | 'submit.prepare';
 export type PipelineLogLevel = 'debug' | 'info' | 'warn' | 'error';
 export interface PipelineLogEvent {
     ns: PipelineLogNS;

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

@@ -39,7 +39,7 @@ export interface JoinRule {
 export interface ApiRule {
     type: 'api';
     /** 请求函数 key */
-    fetcher: 'ref' | 'lot2sn' | 'rdo2ref' | 'ref2lot2sn';
+    fetcher: 'ref' | 'rdo2ref' | 'ref2lot2sn';
     /** 仅主模型字段可发起请求 */
     onlyMainModelFieldsCanRequest: boolean;
     /** 失败时的默认 label */
@@ -65,7 +65,11 @@ export interface HyperlinkRule {
 export interface LabelRule {
     type: 'label';
 }
-export type ValueChangeRule = HyperlinkRule | LabelRule;
+/** 值变化后补全批次唯一标识（companion `_id_` 字段） */
+export interface IdRule {
+    type: 'id';
+}
+export type ValueChangeRule = HyperlinkRule | LabelRule | IdRule;
 /** 将 manifest 中的 onValueChangeRule 规范为数组 */
 export declare function normalizeValueChangeRules(rule?: ValueChangeRule | ValueChangeRule[]): ValueChangeRule[];
 export type ComputedRule = PriorityRule | ResolveRule | MapRule | JoinRule | ApiRule;
@@ -74,6 +78,6 @@ export interface FieldComputedConfig {
     propRules?: Record<string, ComputedRule>;
     /** 写入 dataManager 的派生规则 */
     defaultValueRule?: ComputedRule;
-    /** 填报值变化后的 enrich（超链接 _href_、展示标签 _lb_） */
+    /** 填报值变化后的 enrich（超链接 _href_、展示标签 _lb_、批次 _id_） */
     onValueChangeRule?: ValueChangeRule | ValueChangeRule[];
 }

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

@@ -62,6 +62,6 @@ export declare class LinkageEngine {
     buildFillFromOption(ctx: TableRuntimeContext, fieldKey: string, rowIndex: number, selectedOption: Record<string, unknown>): Record<string, unknown>;
     /** 将单条 FieldOptionFillDef 映射写入 updates */
     private applyOptionFillDef;
-    /** 构建字段清空更新对象（同时清值与 _lb_ 标签） */
+    /** 构建字段清空更新对象（同时清值、_lb_ 标签与 companion _id_） */
     private buildClearUpdates;
 }

package/dist/index.es.js

@@ -33385,6 +33385,7 @@ function normalizeValueChangeRules(rule) {
 }
 const LABEL_SUFFIX = "_lb_";
 const HREF_SUFFIX = "_href_";
+const ID_SUFFIX = "_id_";
 const HYPERLINK_TEXT_COLOR = "#0563c1";
 function getLabelPath(path) {
   return path + LABEL_SUFFIX;
@@ -33392,8 +33393,11 @@ function getLabelPath(path) {
 function getHrefPath(path) {
   return path + HREF_SUFFIX;
 }
+function getIdPath(path) {
+  return path + ID_SUFFIX;
+}
 function isDerivedDataPath(path) {
-  return path.endsWith(LABEL_SUFFIX) || path.endsWith(HREF_SUFFIX);
+  return path.endsWith(LABEL_SUFFIX) || path.endsWith(HREF_SUFFIX) || path.endsWith(ID_SUFFIX);
 }
 const ROW_RUNTIME_META_KEYS = /* @__PURE__ */ new Set([
   "row_source_",
@@ -34167,7 +34171,7 @@ const apiFetchers = {
     cachePrefix: "lot2sn",
     cacheTTL: 5 * 60 * 1e3,
     fetchDataList: async (params) => {
-      const { queryData = {}, pageNo = 1, pageSize = 20 } = params;
+      const { queryData = {}, exp, pageNo = 1, pageSize = 20 } = params;
       const result = await api.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey(
         {
           modelCategory: API_CONFIG.ENTITY_CATEGORY,
@@ -34176,6 +34180,7 @@ const apiFetchers = {
         },
         {},
         {
+          exp,
           query: queryData,
           pageSize,
           pageNo
@@ -34188,28 +34193,6 @@ const apiFetchers = {
         totalCount: totalCount || 0
       };
     },
-    fetchOne: async (id) => {
-      if (!id) return {};
-      const result = await api.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey(
-        {
-          modelCategory: API_CONFIG.ENTITY_CATEGORY,
-          modelKey: API_CONFIG.LOT_DEFAULTS.modelKey,
-          bsKey: API_CONFIG.LOT_DEFAULTS.bsKey
-        },
-        {},
-        {
-          query: { "name_.like": id },
-          pageSize: 20,
-          pageNo: 1
-        }
-      );
-      const { data = [], totalPage, dict, totalCount } = result || {};
-      return {
-        data: transformSourceDataList(data || [], dict) || [],
-        totalPage,
-        totalCount: totalCount || 0
-      };
-    },
     transformers: {
       toOptions(items) {
         const transformer = createTransformer("name_", "name_");
@@ -34336,11 +34319,7 @@ const apiFetchers = {
     cachePrefix: "productRdo2ref",
     cacheTTL: 5 * 60 * 1e3,
     fetchDataList: async (params) => {
-      const {
-        queryData = {},
-        pageNo = 1,
-        pageSize = 20
-      } = params;
+      const { queryData = {}, pageNo = 1, pageSize = 20 } = params;
       const result = await api.apaas.modelComprehensive.postBizServiceGeneralModelCategoryModelKeyBsKey(
         {
           modelCategory: API_CONFIG.ENTITY_CATEGORY,
@@ -34374,20 +34353,12 @@ function fieldNeedsLabelEnrichment(fieldType, manifest2) {
   if (rules2.some((rule) => rule.type === "label")) return true;
   return false;
 }
-function getRowPathFromFieldPath(path) {
-  const parsed = parseValuePath(path);
-  if (!parsed.isSubTable) return "$";
-  const normalized = path.replace(/^\$\./, "");
-  const lastDot = normalized.lastIndexOf(".");
-  if (lastDot < 0) return "$";
-  return `$.${normalized.slice(0, lastDot)}`;
-}
 function getDictFieldKey(path, fieldBinding) {
   const parsed = parseValuePath(path);
   return parsed.fieldKey || getLastSegment(fieldBinding.fieldLink) || "";
 }
 function readDictLabel(dataManager, path, fieldBinding, value, dictFieldKey) {
-  const rowPath = getRowPathFromFieldPath(path);
+  const rowPath = getBeforeBracket(path);
   const row = rowPath ? dataManager.get(rowPath) : dataManager.getRawData();
   const fieldKey = dictFieldKey || getDictFieldKey(path, fieldBinding);
   const dict = row?._DICT?.[fieldKey];
@@ -34435,7 +34406,7 @@ async function readApiLabel(strategy, value, fieldBinding, loadFieldByKey) {
     refModelKey: fieldInfo?.bindInfo
   };
   try {
-    const isSingle = strategy.fetcher === "rdo2ref" || strategy.fetcher === "ref2lot2sn" || strategy.fetcher === "lot2sn";
+    const isSingle = strategy.fetcher === "rdo2ref" || strategy.fetcher === "ref2lot2sn";
     const result = isSingle ? await fetcher.getOptionById(String(value), params) : await fetcher.getOptionByIds(getValue$1(value, true), params);
     const list = Array.isArray(result) ? result : result ? [result] : [];
     const labels = list.map((item) => item?.label).filter(Boolean);
@@ -35691,13 +35662,14 @@ class LinkageEngine {
     if (isBlank(value)) return;
     updates[`${rowPath}.${def.toField}`] = value;
   }
-  /** 构建字段清空更新对象（同时清值与 _lb_ 标签） */
+  /** 构建字段清空更新对象（同时清值、_lb_ 标签与 companion _id_） */
   buildClearUpdates(rowPath, clearFieldKeys) {
     const updates = {};
     for (const clearFieldKey of clearFieldKeys) {
       const fieldPath = `${rowPath}.${clearFieldKey}`;
       updates[fieldPath] = void 0;
       updates[getLabelPath(fieldPath)] = void 0;
+      updates[getIdPath(fieldPath)] = void 0;
     }
     return updates;
   }
@@ -36067,6 +36039,7 @@ const NS_LABEL = {
   "pipeline.deps": "依赖刷新",
   "enricher.label": "标签增强",
   "enricher.hyperlink": "超链接增强",
+  "enricher.id": "批次内置ID",
   "pipeline.afterFlush": "业务收尾",
   "table.runtime": "业务子表",
   "init.lifecycle": "文档初始化",
@@ -36345,6 +36318,76 @@ function createHyperlinkEnricher(reg) {
     }
   };
 }
+function resolveProductId(doc, path) {
+  const dataManager = doc.dataManager;
+  const rowPath = getBeforeBracket(path);
+  if (rowPath) {
+    const row = dataManager.get(rowPath);
+    const productId = row?.product_id_;
+    return productId != null && productId !== "" ? String(productId) : void 0;
+  }
+  const fromParams = doc.paramsConfig?.productId ?? doc.paramsConfig?.product_id_;
+  return fromParams != null && fromParams !== "" ? String(fromParams) : void 0;
+}
+function shouldPreservePersistedId(dataManager, valuePath, ctx) {
+  if (ctx?.batchSource !== "hydrate") return false;
+  if (ctx.oldValue !== ctx.newValue) return false;
+  return isPresent(dataManager.get(getIdPath(valuePath)));
+}
+function extractCompanionId(result) {
+  if (result == null || result === "" || result === false) return null;
+  if (typeof result === "string" || typeof result === "number") return String(result);
+  if (typeof result === "object") {
+    const record = result;
+    const id = record.id_ ?? record.id;
+    return id != null && id !== "" ? String(id) : null;
+  }
+  return null;
+}
+async function resolveLotCompanionId(path, value, productId) {
+  if (value == null || value === "") return null;
+  try {
+    const result = await api.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey(
+      {
+        bsKey: "biz_get_single_production_identification",
+        modelKey: "em_production_identification",
+        modelCategory: "entity"
+      },
+      {
+        name_: value,
+        ...productId ? { product_id_: productId } : {}
+      },
+      {}
+    );
+    return extractCompanionId(result);
+  } catch {
+    return null;
+  }
+}
+function createIdEnricher(reg) {
+  const { doc, widgetMeta, ...rest } = reg;
+  return {
+    ...rest,
+    id: rest.id || `id:${rest.valuePathTemplate}`,
+    enrich: async (path, value, ctx) => {
+      const dataManager = doc.dataManager;
+      const idPath = getIdPath(path);
+      if (shouldPreservePersistedId(dataManager, path, ctx)) return;
+      if (value == null || value === "") {
+        return { [idPath]: null };
+      }
+      if (isPresent(dataManager.get(idPath))) return;
+      const productId = resolveProductId(doc, path);
+      const id = await withRequestCache.handleRequest(
+        "id_enrich_resolve",
+        { path, value, productId },
+        ({ path: reqPath, value: reqValue, productId: reqProductId }) => resolveLotCompanionId(reqPath, reqValue, reqProductId),
+        30 * 1e3
+      );
+      return { [idPath]: id };
+    }
+  };
+}
 class Hooks {
   /**
    * @callback HookCallback
@@ -84101,6 +84144,17 @@ function buildFieldEnricherRegistrations(instances, ctx, doc) {
         })
       );
     }
+    if (valueChangeRules.some((rule) => rule.type === "id")) {
+      regs.push(
+        createIdEnricher({
+          id: `id:${valuePath}`,
+          valuePathTemplate: valuePath,
+          match: createValuePathMatcher(valuePath),
+          doc,
+          widgetMeta: instance2.widgetMeta
+        })
+      );
+    }
     if (fieldNeedsLabelEnrichment(fieldMeta.fieldType, manifest2)) {
       const enricherProps = resolveEnricherWidgetProps(instance2, manifest2);
       regs.push(
@@ -84169,7 +84223,12 @@ function collectSubtableRowEnrichPaths(instances, subFieldKey, rowIndexes) {
     if (parsed.parentFieldKey !== subFieldKey) continue;
     for (const rowIndex of uniqueIndexes) {
       paths.add(
-        replacePathIndexPlaceholders({ templatePath: valuePath, n: rowIndex, y: rowIndex, x: rowIndex })
+        replacePathIndexPlaceholders({
+          templatePath: valuePath,
+          n: rowIndex,
+          y: rowIndex,
+          x: rowIndex
+        })
       );
     }
   }
@@ -85159,9 +85218,10 @@ const optionsMapEnumConfig = {
 };
 const labelOnValueChangeRule = { type: "label" };
 const hyperlinkOnValueChangeRule = { type: "hyperlink" };
-const hyperlinkAndLabelOnValueChangeRules = [
+const idOnValueChangeRule = { type: "id" };
+const hyperlinkAndIdOnValueChangeRules = [
   hyperlinkOnValueChangeRule,
-  labelOnValueChangeRule
+  idOnValueChangeRule
 ];
 function mergeCheckTableItemInfosIntoDefaults(defaultsMap, region, infos, layoutColumnCount) {
   applySubFieldDefaults(defaultsMap, region, infos, layoutColumnCount ?? 0);
@@ -101033,7 +101093,7 @@ class PostChangePipeline {
         }
       }
       if (Object.keys(updates).length) {
-        const enrichLogNs = enricherIds.some((id) => id.startsWith("label")) ? "enricher.label" : "enricher.hyperlink";
+        const enrichLogNs = enricherIds.some((id) => id.startsWith("label")) ? "enricher.label" : enricherIds.some((id) => id.startsWith("id")) ? "enricher.id" : "enricher.hyperlink";
         createPipelineLogger(enrichLogNs, { batchId, path }).debug(
           `写回增强字段：${Object.keys(updates).join("、")}`,
           { enricherId: enricherIds.join(","), keys: Object.keys(updates) }
@@ -101230,6 +101290,9 @@ class DataManager {
   getHrefPath(path) {
     return getHrefPath(path);
   }
+  getIdPath(path) {
+    return getIdPath(path);
+  }
   getFieldRuntimeSpecificConfigKeys() {
     return [...this.fieldRuntimeConfigByPath.keys()];
   }
@@ -101423,6 +101486,10 @@ class DataManager {
   getHref(path) {
     return this.get(this.getHrefPath(path));
   }
+  /** 获取与 value 并存的批次唯一标识；老数据可能为空 */
+  getId(path) {
+    return this.get(this.getIdPath(path));
+  }
   /** 子表数组路径下未软删行数 */
   countActiveSubtableRows(arrayPath) {
     const rows = this.getByPath(this.rawData, arrayPath);
@@ -102476,9 +102543,14 @@ class DataManager {
     }
     this.removeFieldDependencies(designValuePath);
   }
-  /** 收集与字段绑定相关的路径（含 value / label / href 及通配符变体） */
+  /** 收集与字段绑定相关的路径（含 value / label / href / id 及通配符变体） */
   collectFieldBindingPaths(designValuePath) {
-    const bases = [designValuePath, getLabelPath(designValuePath), getHrefPath(designValuePath)];
+    const bases = [
+      designValuePath,
+      getLabelPath(designValuePath),
+      getHrefPath(designValuePath),
+      getIdPath(designValuePath)
+    ];
     const wildcardKeys = new Set(bases.map((path) => this.convertPathToWildcard(path)));
     const result = new Set(bases);
     const scanTargets = [
@@ -102501,15 +102573,19 @@ class DataManager {
       paths.add(path);
       paths.add(getLabelPath(path));
       paths.add(getHrefPath(path));
+      paths.add(getIdPath(path));
     }
     return [...paths];
   }
   /** 移除字段注册的组件依赖 */
   removeFieldDependencies(designValuePath) {
     const wildcardKeys = new Set(
-      [designValuePath, getLabelPath(designValuePath), getHrefPath(designValuePath)].map(
-        (path) => this.convertPathToWildcard(path)
-      )
+      [
+        designValuePath,
+        getLabelPath(designValuePath),
+        getHrefPath(designValuePath),
+        getIdPath(designValuePath)
+      ].map((path) => this.convertPathToWildcard(path))
     );
     const nodes = this.collectDepNodes();
     const removedKeys = /* @__PURE__ */ new Set();
@@ -110011,11 +110087,14 @@ function transformTreeData(options = [], currentValue) {
   });
   return { data: treeData, highlightIdx };
 }
-function transformLotData(options = [], currentValue) {
+function transformLotData(options = [], currentValue, currentId) {
   const highlightIdx = { index: [] };
   const values = Array.isArray(currentValue) ? currentValue.filter((v) => !isNil(v)) : [currentValue].filter((v) => !isNil(v));
+  const preferId = !!currentId;
   const showOptions = (options || []).map((item, index2) => {
-    if (values.includes(item.value)) {
+    const matchedById = preferId && item._item?.id_ === currentId;
+    const matchedByValue = !preferId && values.includes(item.value);
+    if (matchedById || matchedByValue) {
       highlightIdx.index.push(index2);
     }
     return {
@@ -121338,12 +121417,7 @@ const manifest$F = {
     ...commonDefaultProps
   },
   computed: {
-    defaultValueRule: {
-      type: "api",
-      fetcher: "lot2sn",
-      onlyMainModelFieldsCanRequest: true
-    },
-    onValueChangeRule: labelOnValueChangeRule
+    onValueChangeRule: idOnValueChangeRule
   }
 };
 const __vite_glob_0_24 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -121964,12 +122038,7 @@ const manifest$f = {
     ...commonDefaultProps
   },
   computed: {
-    defaultValueRule: {
-      type: "api",
-      fetcher: "lot2sn",
-      onlyMainModelFieldsCanRequest: true
-    },
-    onValueChangeRule: [...hyperlinkAndLabelOnValueChangeRules]
+    onValueChangeRule: [...hyperlinkAndIdOnValueChangeRules]
   }
 };
 const __vite_glob_0_50 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -122117,12 +122186,7 @@ const manifest$9 = {
     ...commonDefaultProps
   },
   computed: {
-    defaultValueRule: {
-      type: "api",
-      fetcher: "lot2sn",
-      onlyMainModelFieldsCanRequest: true
-    },
-    onValueChangeRule: [...hyperlinkAndLabelOnValueChangeRules]
+    onValueChangeRule: [...hyperlinkAndIdOnValueChangeRules]
   }
 };
 const __vite_glob_0_56 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -122253,6 +122317,9 @@ const filterFn = (f) => {
   ].includes(f.key)) {
     return false;
   }
+  if (f.createType === "BUILTIN" && f.key && f.key.endsWith(ID_SUFFIX) && f.type === FIELD_TYPE.TEXT) {
+    return false;
+  }
   return true;
 };
 const FieldIconFallbackMap = {
@@ -136024,6 +136091,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
     columns: {},
     tableData: {},
     modelValue: {},
+    selectedId: {},
     loading: { type: Boolean },
     height: { default: "100%" },
     autoResize: { type: Boolean, default: true },
@@ -136056,6 +136124,9 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
       return result;
     });
     const rowClassName = ({ row }) => {
+      if (props.selectedId) {
+        return row._item?.id_ === props.selectedId ? "row--active" : "";
+      }
       return selectedIds.value.has(row.__VALUE__) ? "row--active" : "";
     };
     const onCellClick = ({ row }) => {
@@ -136127,7 +136198,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BaseVxeTable = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-8ae65aef"]]);
+const BaseVxeTable = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-c169ed2c"]]);
 const DEVICE_TYPE_MODEL_KEY = "em_device_type";
 const ENTITY_CATEGORY = "entity";
 const _sfc_main$9 = /* @__PURE__ */ defineComponent({
@@ -136431,35 +136502,39 @@ function shouldEnableLinkage(doc, clickedFieldType, clickedKey) {
     return key === clickedKey && fieldMeta.fieldType === targetLinkedFieldType;
   });
 }
-function buildLikeQuery(fields2, keyword, query) {
-  if (!keyword?.trim()) {
-    return {
-      queryData: { ...query },
-      exp: ""
-    };
+function buildLikeQuery(fields2, keyword, query = {}) {
+  const resultQuery = {
+    ...query
+  };
+  const queryExp = Object.keys(query);
+  let likeExp = "";
+  if (keyword?.trim()) {
+    fields2.forEach((field) => {
+      const key = field.includes(".") ? field : `${field}.iLike`;
+      resultQuery[key] = keyword;
+    });
+    likeExp = `OR(${fields2.map((field) => field.includes(".") ? field : `${field}.iLike`).join(",")})`;
   }
-  const queryData = fields2.reduce(
-    (prev, field) => {
-      const expKey = field.includes(".") ? field : field + ".iLike";
-      prev[expKey] = keyword;
-      return prev;
-    },
-    {
-      ...query
-    }
-  );
-  const exp = `OR(${fields2.map((k) => `${k}.iLike`).join(",")})`;
-  return { queryData, exp };
+  const baseExp = queryExp.length ? `OR(${queryExp.join(",")})` : "";
+  let exp = "";
+  if (baseExp && likeExp) {
+    exp = `AND(${baseExp},${likeExp})`;
+  } else {
+    exp = baseExp || likeExp;
+  }
+  return {
+    queryData: resultQuery,
+    exp
+  };
 }
 const selectStrategyMap = {
   [FIELD_TYPE.MATERIAL_NO]: {
     columnsKey: "lot-sn",
     fetcher: "lot2sn",
     allowManualInput: true,
+    persistOptionId: true,
     buildQuery({ keyword, extraParams }) {
-      return buildLikeQuery(["name_"], keyword, {
-        ...extraParams
-      });
+      return buildLikeQuery(["name_"], keyword, { "product_id_.isNotNull": null, ...extraParams });
     },
     transform: transformLotData
   },
@@ -136467,8 +136542,9 @@ const selectStrategyMap = {
     columnsKey: "lot-sn",
     fetcher: "lot2sn",
     allowManualInput: true,
-    buildQuery({ keyword }) {
-      return buildLikeQuery(["name_"], keyword, {});
+    persistOptionId: true,
+    buildQuery({ keyword, extraParams }) {
+      return buildLikeQuery(["name_"], keyword, { "product_id_.isNotNull": null, ...extraParams });
     },
     transform: transformLotData
   },
@@ -136476,8 +136552,9 @@ const selectStrategyMap = {
     columnsKey: "lot-sn",
     fetcher: "lot2sn",
     allowManualInput: true,
-    buildQuery({ keyword }) {
-      return buildLikeQuery(["name_"], keyword, {});
+    persistOptionId: true,
+    buildQuery({ keyword, extraParams }) {
+      return buildLikeQuery(["name_"], keyword, { "product_id_.isNotNull": null, ...extraParams });
     },
     transform: transformLotData
   },
@@ -136687,6 +136764,11 @@ function useTableDropdown(props, searchFilters) {
   const strategy = computed(() => getSelectStrategy(widgetProps.value, fieldMeta.value?.fieldType));
   const isDeviceField = computed(() => fieldInfo.value?.type === FIELD_TYPE.DEVICE);
   const columns2 = computed(() => getColumns(strategy.value.columnsKey, strategy.value.isTree));
+  const selectedId = computed(() => {
+    if (!runtimeValuePath.value) return void 0;
+    const id = docInst.value.dataManager.get(getIdPath(runtimeValuePath.value));
+    return id != null && id !== "" ? String(id) : void 0;
+  });
   const businessLinkage = computed(
     () => new TableRuntime(docInst.value).resolveSelectLinkage({
       subFieldKey: fieldMeta.value?.subFieldKey,
@@ -136799,7 +136881,7 @@ function useTableDropdown(props, searchFilters) {
       pageNo,
       pageSize
     });
-    const info = transform(res.options ?? [], props.modelValue);
+    const info = transform(res.options ?? [], props.modelValue, selectedId.value);
     return {
       data: info.data || [],
       totalPage: Number(res?.totalPage ?? 0),
@@ -136808,6 +136890,7 @@ function useTableDropdown(props, searchFilters) {
     };
   };
   const allowManualInput = computed(() => strategy.value.allowManualInput ?? false);
+  const persistOptionId = computed(() => !!strategy.value.persistOptionId);
   return {
     fetcher,
     columns: columns2,
@@ -136818,7 +136901,9 @@ function useTableDropdown(props, searchFilters) {
     enableLinkage,
     clearValuePath,
     allowManualInput,
-    isDeviceField
+    isDeviceField,
+    selectedId,
+    persistOptionId
   };
 }
 const _hoisted_1$7 = { class: "table-dropdown" };
@@ -136854,7 +136939,9 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       columns: columns2,
       fetcher: baseFetcher,
       allowManualInput,
-      isDeviceField
+      isDeviceField,
+      selectedId,
+      persistOptionId
     } = useTableDropdown(props, searchFilters);
     const fetcher = (opts) => baseFetcher({ ...opts, deviceTypeId: deviceTypeId.value });
     const showManualInputBtn = computed(() => allowManualInput.value && !!keyword.value?.trim());
@@ -136889,6 +136976,10 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     const onChangeSelect = (row) => {
       const { __VALUE__ } = row || {};
       const data = setValue(__VALUE__ ? __VALUE__ : void 0, runtimeValuePath.value);
+      if (persistOptionId.value) {
+        const idPath = getIdPath(runtimeValuePath.value);
+        Object.assign(data, setValue(row?._item?.id_ ?? void 0, idPath));
+      }
       if (clearValuePath.value) {
         const clearData = setValue(void 0, clearValuePath.value);
         Object.assign(data, clearData);
@@ -136987,10 +137078,11 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
           columns: unref(columns2),
           tableData: unref(tableData),
           modelValue: __props.modelValue,
+          selectedId: unref(selectedId),
           loading: unref(loading),
           "show-row-selection-mode": "",
           onChangeSelect
-        }, null, 8, ["columns", "tableData", "modelValue", "loading"]),
+        }, null, 8, ["columns", "tableData", "modelValue", "selectedId", "loading"]),
         unref(hasData) ? (openBlock(), createBlock(paginationControl, {
           key: 2,
           pagination: unref(pagination),

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

@@ -81,6 +81,4 @@ export declare const apiFetchers: {
     /** 产品但要 ref */
     productRdo2ref: APIFetcher;
 };
-/** 清除指定类型的缓存 */
-export declare function clearApiFetcherCache(type: 'dept' | 'user' | 'ref' | 'lot2sn' | 'ref2lot2sn' | 'all'): void;
 export type { FetcherConfig, RequestParams, OptionResult, Option };

package/dist/runtime/renderer/dropdowns/components/tables/columns/columns.d.ts

@@ -34,15 +34,16 @@ export declare function transformTreeData(options?: any[], currentValue?: string
  * 用于批次/表格数据场景，将原始数据转换为表格行数据
  *
  * @param options - 原始选项数据
- * @param currentValue - 当前选中的值
+ * @param currentValue - 当前选中的值（批次号 name）
+ * @param currentId - companion `_id_`；有值时优先按 id 高亮，老数据无 id 时回退 name
  * @returns 转换后的数据和高亮索引
  *
  * @example
  * ```typescript
- * const { data, highlightIdx } = transformLotData(options, 'lot-123');
+ * const { data, highlightIdx } = transformLotData(options, 'lot-123', 'id-xxx');
  * ```
  */
-export declare function transformLotData(options?: Option[], currentValue?: string | string[]): {
+export declare function transformLotData(options?: Option[], currentValue?: string | string[], currentId?: string): {
     data: any[];
     highlightIdx: {
         index: number[];

package/dist/runtime/renderer/dropdowns/components/tables/component/base-vxe-table.vue.d.ts

@@ -2,6 +2,8 @@ type __VLS_Props = {
     columns: any[];
     tableData: any[];
     modelValue?: string;
+    /** 批次 companion id，优先于 modelValue 做行高亮 */
+    selectedId?: string;
     loading: boolean;
     height?: string;
     autoResize?: boolean;

package/dist/runtime/renderer/dropdowns/components/tables/composables/useTableDropdown.d.ts

@@ -19,4 +19,6 @@ export declare function useTableDropdown(props: any, searchFilters?: MaybeRef<Ta
     clearValuePath: import('vue').ComputedRef<string | undefined>;
     allowManualInput: import('vue').ComputedRef<boolean>;
     isDeviceField: import('vue').ComputedRef<boolean>;
+    selectedId: import('vue').ComputedRef<string | undefined>;
+    persistOptionId: import('vue').ComputedRef<boolean>;
 };

package/dist/runtime/renderer/dropdowns/components/tables/rdo-table-dropdown.vue.d.ts

@@ -202,6 +202,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
             readonly columns: any[];
             readonly tableData: any[];
             readonly modelValue?: string | undefined;
+            readonly selectedId?: string | undefined;
             readonly loading: boolean;
             readonly height?: string | undefined;
             readonly autoResize?: boolean | undefined;
@@ -241,6 +242,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
             columns: any[];
             tableData: any[];
             modelValue?: string;
+            selectedId?: string;
             loading: boolean;
             height?: string;
             autoResize?: boolean;
@@ -287,6 +289,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         columns: any[];
         tableData: any[];
         modelValue?: string;
+        selectedId?: string;
         loading: boolean;
         height?: string;
         autoResize?: boolean;

package/dist/runtime/renderer/dropdowns/components/tables/strategy/selectStrategy.d.ts

@@ -26,8 +26,10 @@ export interface SelectStrategy {
     clearFieldId?: string;
     /** 搜索无匹配时允许将输入关键字作为值写入 */
     allowManualInput?: boolean;
+    /** 下拉选中时同步写入 companion `_id_`（批次字段） */
+    persistOptionId?: boolean;
     buildQuery?: (ctx: SelectQueryContext) => SelectQueryResult;
-    transform: (options: any[], value?: string) => any;
+    transform: (options: any[], value?: string, currentId?: string) => any;
 }
 /**
  * 判断指定字段是否需要开启【报废/不良】分类 ->原因单向数据联动

package/dist/runtime/renderer/dropdowns/components/tables/table-dropdown.vue.d.ts

@@ -197,6 +197,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
             readonly columns: any[];
             readonly tableData: any[];
             readonly modelValue?: string | undefined;
+            readonly selectedId?: string | undefined;
             readonly loading: boolean;
             readonly height?: string | undefined;
             readonly autoResize?: boolean | undefined;
@@ -236,6 +237,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
             columns: any[];
             tableData: any[];
             modelValue?: string;
+            selectedId?: string;
             loading: boolean;
             height?: string;
             autoResize?: boolean;
@@ -282,6 +284,7 @@ declare const _default: import('vue').DefineComponent<__VLS_Props, {
         columns: any[];
         tableData: any[];
         modelValue?: string;
+        selectedId?: string;
         loading: boolean;
         height?: string;
         autoResize?: boolean;

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 } from '../../../../../domain/field/field-props-schema-type';
+import { MapRule, PriorityRule, ResolveRule, HyperlinkRule, LabelRule, IdRule } from '../../../../../domain/field/field-props-schema-type';
 import { FieldNodeRenderers } from '../../../../../domain/widget/component-type';
 export declare const commonDefaultRenderers: FieldNodeRenderers;
 export declare const commonDefaultProps: {
@@ -78,5 +78,9 @@ export declare const optionsMapEnumConfig: MapRule;
 export declare const labelOnValueChangeRule: LabelRule;
 /** 值变化后补全可点击 _href_ */
 export declare const hyperlinkOnValueChangeRule: HyperlinkRule;
+/** 值变化后补全批次唯一标识 _id_ */
+export declare const idOnValueChangeRule: IdRule;
 /** 同时补全 _href_ 与 _lb_（如批次号等追溯字段） */
 export declare const hyperlinkAndLabelOnValueChangeRules: readonly [HyperlinkRule, LabelRule];
+/** 批次号：补全 _href_ 与  _id_ */
+export declare const hyperlinkAndIdOnValueChangeRules: readonly [HyperlinkRule, IdRule];

package/dist/word.css

@@ -12501,7 +12501,7 @@ svg.portrait-icon[data-v-8bdb451e] {
   width: 100%;
   height: 248px;
 }
-.base-vxe-table-wrapper[data-v-8ae65aef] {
+.base-vxe-table-wrapper[data-v-c169ed2c] {
   display: flex;
   flex-direction: column;
   flex: 1;
@@ -12509,10 +12509,10 @@ svg.portrait-icon[data-v-8bdb451e] {
   width: 800px;
   height: 360px;
 }
-.base-vxe-table-wrapper[data-v-8ae65aef] .dropdown-vxe-table .row--active {
+.base-vxe-table-wrapper[data-v-c169ed2c] .dropdown-vxe-table .row--active {
   background: #e6f7ff;
 }
-.base-vxe-table-wrapper .vxe-grid-empty-word[data-v-8ae65aef] {
+.base-vxe-table-wrapper .vxe-grid-empty-word[data-v-c169ed2c] {
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -12520,7 +12520,7 @@ svg.portrait-icon[data-v-8bdb451e] {
   color: rgba(0, 0, 0, 0.45);
   margin: 32px 0;
 }
-.base-vxe-table-wrapper .vxe-grid-empty-word > img[data-v-8ae65aef] {
+.base-vxe-table-wrapper .vxe-grid-empty-word > img[data-v-c169ed2c] {
   width: 60px;
   margin-bottom: 12px;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.57",
+  "version": "0.1.58",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",