openyida 2026.9.7 → 2026.9.8

package/lib/core/locales/en.js

@@ -414,9 +414,9 @@ Examples:
     create_opt_spec: '  --spec <file.json>            Use a structured flow spec for complex automation nodes (dataUpdate/route, etc.)',
     create_opt_data_form_uuid: '  --data-form-uuid <uuid>     Target form UUID for a get-single-data node',
     create_opt_data_condition: '  --data-condition <rule>     Get-data condition: targetField:label:triggerField[:component[:opCode[:valueType]]]',
-    create_opt_get_self: '  --get-self                    Insert a get-self node (pid equals trigger form instance ID)',
+    create_opt_get_self: '  --get-self                    Insert a get-self node (process runtime uses pid, designer uses proc_inst_id; ordinary forms use form_inst_id on both sides)',
     create_opt_get_self_field: '  --get-self-field <field>     Override the trigger-side system field, default __masterdata_form_inst_id',
-    create_opt_get_self_query_field: '  --get-self-query-field <f>  Override the query-side system field, default pid',
+    create_opt_get_self_query_field: '  --get-self-query-field <f>  Override the query-side system field (process: pid runtime / proc_inst_id designer; ordinary: form_inst_id)',
     create_opt_add_data_form_uuid: '  --add-data-form-uuid <uuid> Target form UUID for an add-data node',
     create_opt_add_data_assignment: '  --add-data-assignment <rule> Add-data assignment: targetField:valueType:value',
     create_opt_initiate_approval_form_uuid: '  --initiate-approval-form-uuid <uuid> Target process-form UUID for an initiate-approval node',
@@ -432,6 +432,11 @@ Examples:
     create_example2: '  openyida integration create APP_XXX FORM-XXX "Get self then notify" --get-self --publish',
     create_missing_args: 'Missing required arguments.',
     create_replace_required: 'Using --process-code fully replaces the existing flow. Pass --replace explicitly. Safe editing is not currently available; integration update only reports capability status.',
+    create_source_form_fetch_failed: 'Could not read the data-source form metadata; remote write stopped: {0}',
+    create_source_form_not_found: 'Could not find data-source form {0} in navigation; remote write stopped.',
+    create_source_form_type_unknown: 'Navigation did not return a verifiable data-source form type; remote write stopped.',
+    create_source_form_type_invalid: 'Navigation returned unsupported data-source form type "{0}"; remote write stopped.',
+    create_source_form_type_mismatch: 'Explicit formType={0} conflicts with navigation metadata {1}; remote write stopped.',
     create_flow_name_too_long: 'Logic-flow names cannot exceed {0} characters (received {1}).',
     create_invalid_events: 'No valid trigger event was recognized.',
     create_no_receivers: 'No notification receiver or user field specified; no message node will be generated.',
@@ -449,7 +454,7 @@ Examples:
     create_notify_content: 'Notification content: {0}',
     create_data_form: 'Get-data form: {0}',
     create_data_conditions: 'Get-data condition count: {0}',
-    create_get_self_summary: 'Get-self guardrail: {0} equals field {1}',
+    create_get_self_summary: 'Get-self guardrail: runtime query field {0} equals field {1}; process-form designer maps it to proc_inst_id, while ordinary forms keep the same field',
     create_op_mode_publish: 'Mode: save and publish',
     create_op_mode_draft: 'Mode: save draft only',
     create_step: '[{0}/{1}] {2}',

package/lib/core/locales/zh.js

@@ -410,9 +410,9 @@ openyida - 宜搭命令行工具
     create_opt_spec: '  --spec <file.json>            使用结构化编排文件创建复杂自动化（dataUpdate/route 等）',
     create_opt_data_form_uuid: '  --data-form-uuid <uuid>     插入获取单条数据节点的目标表单 UUID',
     create_opt_data_condition: '  --data-condition <rule>     获取数据过滤条件：目标字段:字段名:触发字段[:组件[:操作符[:值类型]]]',
-    create_opt_get_self: '  --get-self                    自动插入获取自身节点（pid 等于触发事件表单实例ID）',
+    create_opt_get_self: '  --get-self                    自动插入获取自身节点（流程表单运行态使用 pid、设计器使用 proc_inst_id；普通表单两侧使用 form_inst_id）',
     create_opt_get_self_field: '  --get-self-field <field>     覆盖右侧触发事件系统字段，默认 __masterdata_form_inst_id',
-    create_opt_get_self_query_field: '  --get-self-query-field <f>  覆盖左侧查询系统字段，默认 pid',
+    create_opt_get_self_query_field: '  --get-self-query-field <f>  覆盖左侧查询系统字段（流程表单默认 pid，普通表单默认 form_inst_id）',
     create_opt_add_data_form_uuid: '  --add-data-form-uuid <uuid> 插入新增数据节点的目标表单 UUID',
     create_opt_add_data_assignment: '  --add-data-assignment <rule> 新增数据赋值：目标字段:valueType:value',
     create_opt_initiate_approval_form_uuid: '  --initiate-approval-form-uuid <uuid> 发起审批节点的目标流程表单 UUID',
@@ -428,6 +428,11 @@ openyida - 宜搭命令行工具
     create_example2: '  openyida integration create APP_XXX FORM-XXX "获取自身后通知" --get-self --publish',
     create_missing_args: '缺少必要参数。',
     create_replace_required: '使用 --process-code 会整图替换已有逻辑流；必须显式传入 --replace。安全二次编辑当前不可用，integration update 仅报告 capability 状态。',
+    create_source_form_fetch_failed: '获取取数来源表单信息失败，已停止远端写入: {0}',
+    create_source_form_not_found: '获取取数来源表单信息失败，导航中未找到表单 {0}，已停止远端写入',
+    create_source_form_type_unknown: '获取取数来源表单信息失败，导航未返回可确认的表单类型，已停止远端写入',
+    create_source_form_type_invalid: '获取取数来源表单信息失败，导航返回的表单类型“{0}”不是可取数表单，已停止远端写入',
+    create_source_form_type_mismatch: '获取取数来源表单信息失败，显式 formType={0} 与导航元数据 {1} 不一致，已停止远端写入',
     create_flow_name_too_long: '逻辑流名称不能超过 {0} 个字符（当前 {1} 个）。',
     create_invalid_events: '未识别到有效触发事件。',
     create_no_receivers: '未指定通知接收人或成员字段，将不会生成消息通知节点。',
@@ -445,7 +450,7 @@ openyida - 宜搭命令行工具
     create_notify_content: '通知内容: {0}',
     create_data_form: '获取数据表单: {0}',
     create_data_conditions: '获取数据条件数: {0}',
-    create_get_self_summary: '获取自身闭坑: {0} 等于 字段 {1}',
+    create_get_self_summary: '获取自身闭坑: 运行态查询字段 {0} 等于字段 {1}；流程表单设计器对应 proc_inst_id，普通表单设计器保持一致',
     create_op_mode_publish: '操作模式: 保存并发布',
     create_op_mode_draft: '操作模式: 仅保存草稿',
     create_step: '[{0}/{1}] {2}',

package/lib/integration/integration-create.js

@@ -17,9 +17,16 @@ const {
   validateIntegrationSpec,
   buildSpecProcessAndViewJson,
   collectAddDataFormUuids,
+  collectDataSourceFormDescriptors,
   collectInitiateApprovalFormUuids,
   hasSpecNodeType,
 } = require('./integration-spec-builder');
+const {
+  normalizeSourceFormType,
+  toRuntimeDataQueryField,
+  toDesignerDataQueryField,
+  normalizeDataQueryFieldName,
+} = require('./integration-form-metadata');
 const { t } = require('../core/i18n');
 const { warn } = require('../core/chalk');
 const { CliError } = require('../core/cli-error');
@@ -415,7 +422,7 @@ async function run(args) {
   const getSelfTriggerField = parseFlag(subArgs, '--get-self-field')
     || parseFlag(subArgs, '--get-self-trigger-field')
     || '__masterdata_form_inst_id';
-  const getSelfQueryField = parseFlag(subArgs, '--get-self-query-field') || 'pid';
+  const getSelfQueryFieldOverride = parseFlag(subArgs, '--get-self-query-field');
   const shouldPublish = hasFlag(subArgs, '--publish');
   let integrationSpec = null;
   if (specPath) {
@@ -439,6 +446,11 @@ async function run(args) {
   const formEventTypes = mapEventTypes(
     eventsRaw.split(',').map((event) => event.trim()).filter(Boolean)
   );
+  let getSelfQueryField = getSelfQueryFieldOverride || (
+    formEventTypes.includes('processFinish') || formEventTypes.includes('activityTask')
+      ? 'pid'
+      : 'form_inst_id'
+  );
   const approvalActions = normalizeApprovalActions(approvalActionsRaw
     ? approvalActionsRaw.split(',').map((item) => item.trim()).filter(Boolean)
     : []);
@@ -453,7 +465,7 @@ async function run(args) {
 
   if (integrationSpec) {
     try {
-      validateIntegrationSpec(integrationSpec, formEventTypes);
+      validateIntegrationSpec(integrationSpec, formEventTypes, { formUuid });
     } catch (error) {
       throw new CliError(`读取 --spec 失败：${error.message}`, {
         code: 'INTEGRATION_SPEC_INVALID',
@@ -674,7 +686,13 @@ async function run(args) {
     totalSteps++;
   } // 获取目标表单 Schema
   const specAddDataFormUuids = integrationSpec
-    ? collectAddDataFormUuids(integrationSpec).filter((uuid) => uuid !== addDataFormUuid)
+    ? collectAddDataFormUuids(integrationSpec, formUuid).filter((uuid) => uuid !== addDataFormUuid)
+    : [];
+  const specDirectAddDataFormUuids = integrationSpec
+    ? collectAddDataFormUuids(integrationSpec, formUuid, { kind: 'direct' })
+    : [];
+  const specSubTableParentFormUuids = integrationSpec
+    ? collectAddDataFormUuids(integrationSpec, formUuid, { kind: 'sub_table' })
     : [];
   const specInitiateApprovalFormUuids = integrationSpec
     ? collectInitiateApprovalFormUuids(integrationSpec).filter((uuid) => uuid !== initiateApprovalFormUuid)
@@ -756,6 +774,13 @@ async function run(args) {
     ...(addDataFormUuid ? [addDataFormUuid.toString()] : []),
     ...specAddDataFormUuids.map((uuid) => uuid.toString()),
   ]));
+  const directAddDataTargetUuidSet = new Set([
+    ...(addDataFormUuid ? [addDataFormUuid.toString()] : []),
+    ...specDirectAddDataFormUuids.map((uuid) => uuid.toString()),
+  ]);
+  const subTableParentFormUuidSet = new Set(
+    specSubTableParentFormUuids.map((uuid) => uuid.toString())
+  );
   const addDataTargetFormsByUuid = new Map();
   for (const targetFormUuid of addDataTargetUuids) {
     let targetForm;
@@ -765,7 +790,9 @@ async function run(args) {
       throw new Error(`获取目标表单信息失败，无法确认 ${targetFormUuid} 是否为普通表单: ${error.message}`);
     }
     const targetFormType = normalizeFormType(targetForm && targetForm.formType);
-    if (targetFormType !== 'receipt') {
+    const isSubTableOnlyParent = subTableParentFormUuidSet.has(targetFormUuid)
+      && !directAddDataTargetUuidSet.has(targetFormUuid);
+    if (targetFormType !== 'receipt' && !(isSubTableOnlyParent && targetFormType === 'process')) {
       const errorMessage = targetFormType === 'process'
         ? buildProcessAddDataTargetError(targetForm, targetFormUuid)
         : `无法确认 ${targetFormUuid} 是普通表单，已停止创建“新增数据”节点。`;
@@ -788,6 +815,118 @@ async function run(args) {
     ? addDataTargetFormsByUuid.get(addDataFormUuid.toString())
     : null;
 
+  const sourceFormDescriptors = integrationSpec
+    ? collectDataSourceFormDescriptors(integrationSpec, formUuid)
+    : (dataFormUuid ? [{ formUuid: dataFormUuid.toString() }] : []);
+  const dataSourceFormsByUuid = new Map();
+  // Source metadata is part of the write preflight. Never silently downgrade an
+  // unverified source to a receipt; a spec may continue only with a validated
+  // explicit formType (and uses its declared name as the designer title).
+  for (const descriptor of sourceFormDescriptors) {
+    const explicitType = normalizeSourceFormType(descriptor.formType);
+    let dataSourceForm;
+    let navigationReadSuccessfully = false;
+    try {
+      dataSourceForm = await findFormNavigationItem(
+        authRef,
+        appType,
+        descriptor.formUuid,
+        getFormNavigationItems,
+      );
+      navigationReadSuccessfully = true;
+    } catch (error) {
+      if (!explicitType) {
+        throw new Error(t('integration.create_source_form_fetch_failed', error.message));
+      }
+      dataSourceForm = {
+        formUuid: descriptor.formUuid,
+        formName: descriptor.formName || descriptor.formUuid,
+        formType: explicitType,
+      };
+    }
+
+    if (navigationReadSuccessfully && !dataSourceForm) {
+      throw new Error(t('integration.create_source_form_not_found', descriptor.formUuid));
+    }
+
+    const rawRemoteFormType = dataSourceForm && dataSourceForm.formType !== undefined
+      && dataSourceForm.formType !== null
+      ? String(dataSourceForm.formType).trim()
+      : '';
+    const remoteFormType = normalizeSourceFormType(rawRemoteFormType);
+    if (navigationReadSuccessfully && (!rawRemoteFormType || !remoteFormType)) {
+      throw new Error(
+        dataSourceForm && rawRemoteFormType
+          ? t('integration.create_source_form_type_invalid', dataSourceForm.formType)
+          : t('integration.create_source_form_type_unknown')
+      );
+    }
+    if (explicitType && remoteFormType && explicitType !== remoteFormType) {
+      throw new Error(t(
+        'integration.create_source_form_type_mismatch',
+        descriptor.formType,
+        dataSourceForm.formType,
+      ));
+    }
+    const sourceFormType = remoteFormType || explicitType;
+    if (!dataSourceForm || !sourceFormType) {
+      const reason = dataSourceForm
+        ? `表单类型“${dataSourceForm.formType || '未知'}”无法确认`
+        : `导航中未找到表单 ${descriptor.formUuid}`;
+      if (!explicitType) {
+        throw new Error(t('integration.create_source_form_fetch_failed', reason));
+      }
+      dataSourceForm = {
+        formUuid: descriptor.formUuid,
+        formName: descriptor.formName || descriptor.formUuid,
+        formType: explicitType,
+      };
+    }
+    dataSourceFormsByUuid.set(String(descriptor.formUuid), {
+      ...dataSourceForm,
+      formUuid: String(descriptor.formUuid),
+      formType: sourceFormType,
+      formName: dataSourceForm.formName || descriptor.formName || descriptor.formUuid,
+    });
+  }
+
+  const dataSourceForm = dataFormUuid
+    ? dataSourceFormsByUuid.get(String(dataFormUuid))
+    : null;
+  if (dataSourceForm && getSelf && !getSelfQueryFieldOverride) {
+    getSelfQueryField = normalizeSourceFormType(dataSourceForm.formType) === 'process'
+      ? 'pid'
+      : 'form_inst_id';
+    dataConditions[0].bFieldId = getSelfQueryField;
+    dataConditions[0].bFieldName = getSelfQueryField === 'pid' ? '流程实例ID' : '表单实例ID';
+  }
+  if (dataSourceForm) {
+    for (const condition of dataConditions) {
+      if (!condition) {
+        continue;
+      }
+      const runtimeFieldId = toRuntimeDataQueryField(condition.bFieldId, dataSourceForm.formType);
+      condition.bFieldId = runtimeFieldId;
+      condition.bFieldName = normalizeDataQueryFieldName(
+        runtimeFieldId,
+        dataSourceForm.formType,
+        condition.bFieldName,
+      );
+    }
+  }
+  const viewDataConditions = dataConditions.map((condition) => {
+    if (!condition) {
+      return condition;
+    }
+    const designerFieldId = toDesignerDataQueryField(
+      condition.bFieldId,
+      dataSourceForm && dataSourceForm.formType,
+    );
+    return designerFieldId === condition.bFieldId
+      ? condition
+      : { ...condition, bFieldId: designerFieldId };
+  });
+
   // Step 2（新建模式）：调用 createLogicflow 接口新建绑定关系，获取真实 processCode
   const initiateApprovalTargetUuids = Array.from(new Set([
     ...(initiateApprovalFormUuid ? [initiateApprovalFormUuid.toString()] : []),
@@ -931,6 +1070,7 @@ async function run(args) {
       toUsers,
       userFields,
       formSchemasByUuid,
+      dataSourceFormsByUuid,
       formNamesByUuid,
       currentUserId: authRef.userId,
     });
@@ -957,6 +1097,9 @@ async function run(args) {
       initiateApprovalInitiator,
       initiateApprovalAssignments,
       dataFormUuid: dataFormUuid ?? undefined,
+      dataFormType: dataSourceForm ? dataSourceForm.formType : undefined,
+      dataFormName: dataSourceForm ? dataSourceForm.formName : undefined,
+      dataSourceFormsByUuid,
       dataConditions,
       hasMessageNode,
       approvalActions,
@@ -990,7 +1133,11 @@ async function run(args) {
       initiateApprovalInitiator,
       initiateApprovalAssignments,
       dataFormUuid: dataFormUuid ?? undefined,
+      dataFormType: dataSourceForm ? dataSourceForm.formType : undefined,
+      dataFormName: dataSourceForm ? dataSourceForm.formName : undefined,
+      dataSourceFormsByUuid,
       dataConditions,
+      viewDataConditions,
       hasMessageNode,
       approvalActions,
       approvalNodeIds,

package/lib/integration/integration-diagnostics.js

@@ -24,16 +24,16 @@ const PITFALL_RULES = [
     id: 'get-self-form-inst-id',
     severity: 'info',
     title: {
-      zh: '获取自身应使用表单实例ID精确匹配',
-      en: 'Use form instance ID for get-self',
+      zh: '获取自身应使用来源表单的唯一实例字段精确匹配',
+      en: 'Use the source form unique instance field for get-self',
     },
     summary: {
-      zh: '获取当前触发记录时，推荐用同表的表单实例ID等于触发记录表单实例ID。',
-      en: 'When reading the current trigger record, match the same form by form instance ID.',
+      zh: '获取当前触发记录时，按来源表单类型使用对应的唯一实例字段精确匹配。',
+      en: 'When reading the current trigger record, match the appropriate unique instance field for the source form type.',
     },
     recommendation: {
-      zh: '标准配置：获取单条数据，来源表单为当前触发表，过滤条件用查询侧系统字段 pid 等于触发事件字段 __masterdata_form_inst_id。CLI 可使用 --get-self 生成该节点。',
-      en: 'Recommended setup: Get single data from the trigger form with query-side system field pid equal to trigger field __masterdata_form_inst_id. The CLI can generate this via --get-self.',
+      zh: '标准配置：获取单条数据，来源表单为当前触发表；流程表单运行态使用查询侧系统字段 pid、设计器使用 proc_inst_id，普通表单两侧使用 form_inst_id，均等于触发事件字段 __masterdata_form_inst_id。CLI 可使用 --get-self 生成该节点。',
+      en: 'Recommended setup: Get single data from the trigger form. Process forms use query-side pid at runtime and proc_inst_id in the designer; ordinary forms use form_inst_id on both sides. All match the trigger field __masterdata_form_inst_id. The CLI can generate this via --get-self.',
     },
     patterns: [/获取自身/i, /表单实例ID/i, /formInstId/i, /__masterdata_form_inst_id/i, /form instance/i, /get.?self/i],
   },
@@ -49,8 +49,8 @@ const PITFALL_RULES = [
       en: 'Reading a serial number directly from trigger payload can return empty or stale values.',
     },
     recommendation: {
-      zh: '需要消费流水号时，先用获取自身节点按表单实例ID重新获取最新记录，再引用该节点里的流水号字段。',
-      en: 'Before using a serial number, add a get-self node by form instance ID and read the serial number from that node output.',
+      zh: '需要消费流水号时，先用获取自身节点按来源表单对应的唯一实例字段重新获取最新记录，再引用该节点里的流水号字段。',
+      en: 'Before using a serial number, add a get-self node using the source form type\'s unique instance field and read the serial number from that node output.',
     },
     patterns: [/流水号/i, /serialNumber/i, /SerialNumberField/i],
   },
@@ -66,8 +66,8 @@ const PITFALL_RULES = [
       en: 'A "field is null" log usually means the data retrieve filter uses a missing field ID, an event field on the query side, or an unsupported field type.',
     },
     recommendation: {
-      zh: '检查获取数据节点左侧字段必须是被查询表单里的字段。获取自身时标准配置是查询侧 pid 等于触发事件字段 __masterdata_form_inst_id；不要把 __masterdata_form_inst_id 或 formInstId 放在查询侧。',
-      en: 'Check that the left-side field belongs to the queried form. For get-self, use query-side pid equals trigger field __masterdata_form_inst_id; do not put __masterdata_form_inst_id or formInstId on the query side.',
+      zh: '检查获取数据节点左侧字段必须是被查询表单里的字段。获取自身时，流程表单运行态使用查询侧 pid、设计器使用 proc_inst_id，普通表单两侧使用 form_inst_id；均等于触发事件字段 __masterdata_form_inst_id。不要把 __masterdata_form_inst_id 或 formInstId 放在查询侧。',
+      en: 'Check that the left-side field belongs to the queried form. For get-self, process forms use query-side pid at runtime and proc_inst_id in the designer; ordinary forms use form_inst_id on both sides. Do not put __masterdata_form_inst_id or formInstId on the query side.',
     },
     patterns: [/field is null/i, /暂时不支持其他类型Field/i, /selectListException/i],
   },
@@ -306,7 +306,7 @@ function buildCheckHints(options = {}) {
       {
         id: 'get-self-standard',
         severity: 'info',
-        message: '获取自身的标准配置是：查询侧系统字段 pid 等于触发事件字段 __masterdata_form_inst_id；创建时可使用 --get-self。',
+        message: '获取自身的标准配置是：流程表单运行态查询侧 pid、设计器 proc_inst_id，普通表单两侧 form_inst_id，均等于触发事件字段 __masterdata_form_inst_id；创建时可使用 --get-self。',
       },
     ];
   }
@@ -319,7 +319,7 @@ function buildCheckHints(options = {}) {
     {
       id: 'get-self-standard',
       severity: 'info',
-      message: 'Recommended get-self setup: query-side system field pid equals trigger field __masterdata_form_inst_id; use --get-self when creating flows.',
+      message: 'Recommended get-self setup: process forms use query-side pid at runtime and proc_inst_id in the designer; ordinary forms use form_inst_id on both sides. Use --get-self when creating flows.',
     },
   ];
 }

package/lib/integration/integration-form-metadata.js

@@ -0,0 +1,136 @@
+'use strict';
+
+function normalizeSourceFormType(value) {
+  const normalized = String(value || '').trim().toLowerCase();
+  if (normalized === 'process' || normalized === 'process_form') {
+    return 'process';
+  }
+  if (normalized === 'form' || normalized === 'receipt' || normalized === 'normal' || normalized === 'normal_form') {
+    return 'receipt';
+  }
+  return '';
+}
+
+function isGetSelfNode(node = {}) {
+  return node.type === 'getSelf' || node.getSelf;
+}
+
+function resolveSourceFormUuid(node = {}, context = {}) {
+  return node.formUuid || node.sourceId || (isGetSelfNode(node) ? context.formUuid : '');
+}
+
+function resolveContextSourceForm(node = {}, context = {}) {
+  const formUuid = resolveSourceFormUuid(node, context);
+  if (!formUuid) {
+    return null;
+  }
+  const forms = context.dataSourceFormsByUuid;
+  if (forms instanceof Map) {
+    return forms.get(String(formUuid)) || forms.get(formUuid) || null;
+  }
+  if (forms && typeof forms === 'object') {
+    return forms[String(formUuid)] || null;
+  }
+  if (context.dataSourceForm && String(context.dataSourceForm.formUuid) === String(formUuid)) {
+    return context.dataSourceForm;
+  }
+  return null;
+}
+
+function resolveDataSourceFormType(node = {}, context = {}) {
+  const explicitType = normalizeSourceFormType(
+    node.formType || node.sourceFormType || node.originalType,
+  );
+  if (explicitType) {
+    return explicitType;
+  }
+
+  const sourceForm = resolveContextSourceForm(node, context);
+  const sourceType = normalizeSourceFormType(sourceForm && sourceForm.formType);
+  if (sourceType) {
+    return sourceType;
+  }
+
+  return normalizeSourceFormType(context.defaultFormType);
+}
+
+function resolveDataSourceFormName(node = {}, context = {}) {
+  const sourceForm = resolveContextSourceForm(node, context);
+  if (sourceForm && sourceForm.formName) {
+    return String(sourceForm.formName);
+  }
+  const explicitName = node.formName || node.sourceFormName || node.dataFormName;
+  if (explicitName) {
+    return String(explicitName);
+  }
+  return context.defaultFormName ? String(context.defaultFormName) : '';
+}
+
+function resolveDataOriginalType(sourceFormType) {
+  return normalizeSourceFormType(sourceFormType) === 'process' ? 'process_form' : 'form';
+}
+
+function resolveDataFormItemType(sourceFormType) {
+  return normalizeSourceFormType(sourceFormType) === 'process' ? 'process' : 'receipt';
+}
+
+function isSubTableOriginalType(value) {
+  return String(value || '').trim().toLowerCase() === 'sub_table';
+}
+
+function resolveDataQueryField(node = {}, sourceFormType) {
+  if (node.queryField) {
+    return toRuntimeDataQueryField(node.queryField, sourceFormType);
+  }
+  if (isGetSelfNode(node)) {
+    return normalizeSourceFormType(sourceFormType) === 'process' ? 'pid' : 'form_inst_id';
+  }
+  return '';
+}
+
+function toRuntimeDataQueryField(fieldId, sourceFormType) {
+  if (normalizeSourceFormType(sourceFormType) === 'process' && fieldId === 'proc_inst_id') {
+    return 'pid';
+  }
+  return fieldId;
+}
+
+function toDesignerDataQueryField(fieldId, sourceFormType) {
+  if (normalizeSourceFormType(sourceFormType) === 'process' && fieldId === 'pid') {
+    return 'proc_inst_id';
+  }
+  return fieldId;
+}
+
+function normalizeDataQueryFieldName(fieldId, sourceFormType, fieldName) {
+  const isProcessInstanceField = fieldId === 'pid' || fieldId === 'proc_inst_id';
+  if (normalizeSourceFormType(sourceFormType) === 'process' && isProcessInstanceField) {
+    return resolveDataQueryFieldName(sourceFormType);
+  }
+  return fieldName;
+}
+
+function resolveDesignerDataQueryField(node = {}, sourceFormType) {
+  return toDesignerDataQueryField(resolveDataQueryField(node, sourceFormType), sourceFormType);
+}
+
+function resolveDataQueryFieldName(sourceFormType) {
+  return normalizeSourceFormType(sourceFormType) === 'process' ? '流程实例ID' : '表单实例ID';
+}
+
+module.exports = {
+  normalizeSourceFormType,
+  isGetSelfNode,
+  resolveSourceFormUuid,
+  resolveDataSourceFormName,
+  resolveDataSourceFormType,
+  resolveDataOriginalType,
+  resolveDataFormItemType,
+  isSubTableOriginalType,
+  resolveDataQueryField,
+  toRuntimeDataQueryField,
+  toDesignerDataQueryField,
+  normalizeDataQueryFieldName,
+  resolveDesignerDataQueryField,
+  resolveDataQueryFieldName,
+};

package/lib/integration/integration-process-builder.js

@@ -1,6 +1,12 @@
 'use strict';
 
 const { generateRuleGroupId, generateRuleItemId, generateDataRuleId, generateButtonUuid } = require('./integration-node-ids');
+const {
+  resolveDataSourceFormType,
+  resolveDataOriginalType,
+  toRuntimeDataQueryField,
+  normalizeDataQueryFieldName,
+} = require('./integration-form-metadata');
 
 const ALLOWED_ASSIGNMENT_VALUE_TYPES = new Set(['literal', 'processVar', 'column']);
 const ALLOWED_APPROVAL_ACTIONS = new Set(['agree', 'disagree', 'terminated']);
@@ -325,7 +331,7 @@ function buildProcessJson(options) {
     addDataFormUuid, addDataAssignments, addDataFormSchema,
     initiateApprovalFormUuid, initiateApprovalFormName,
     initiateApprovalInitiator, initiateApprovalAssignments,
-    dataFormUuid, dataConditions, hasMessageNode, approvalActions,
+    dataFormUuid, dataFormType, dataConditions, hasMessageNode, approvalActions,
     approvalNodeIds, triggerRecursively, triggerConditions,
     // ConnectorCall 节点（可选）：用于在集成自动化内调用任意连接器动作（如"钉钉待办/创建待办任务"）
     connectorId, actionId, connectorAssignments, connectorDescription,
@@ -413,8 +419,29 @@ function buildProcessJson(options) {
 
   // 获取单条数据节点（可选）
   if (hasDataNode && dataNodeId) {
-    const conditions = dataConditions && dataConditions.length > 0
-      ? buildDataRetrieveCondition(dataConditions)
+    const dataSourceFormType = resolveDataSourceFormType(
+      { formUuid: dataFormUuid, formType: dataFormType },
+      { defaultFormType: dataFormType, formEventTypes },
+    );
+    const normalizedDataConditions = Array.isArray(dataConditions)
+      ? dataConditions.map((condition) => {
+        if (!condition) {
+          return condition;
+        }
+        const runtimeFieldId = toRuntimeDataQueryField(condition.bFieldId, dataSourceFormType);
+        return {
+          ...condition,
+          bFieldId: runtimeFieldId,
+          bFieldName: normalizeDataQueryFieldName(
+            runtimeFieldId,
+            dataSourceFormType,
+            condition.bFieldName,
+          ),
+        };
+      })
+      : dataConditions;
+    const conditions = normalizedDataConditions && normalizedDataConditions.length > 0
+      ? buildDataRetrieveCondition(normalizedDataConditions)
       : { condition: 'AND', rules: [], ruleId: generateRuleGroupId(), conditionCode: '&&' };
 
     const dataRetrieveNextId = hasAddDataNode
@@ -440,7 +467,7 @@ function buildProcessJson(options) {
         sort: { type: 'none', column: '' },
         sourceId: dataFormUuid,
         appType,
-        originalType: 'form',
+        originalType: resolveDataOriginalType(dataSourceFormType),
         subSourceId: '',
         condition: conditions,
         quantity: '1',