android-midscene-automation 0.1.34 → 0.1.36

package/src/appium-recorder/AppiumPage.vue

@@ -10,6 +10,7 @@ import LoopSettings from './components/LoopSettings.vue';
 import BreakLoopSettings from './components/BreakLoopSettings.vue';
 import VisualChangeEndPicker from './components/VisualChangeEndPicker.vue';
 import PresetVariables from './components/PresetVariables.vue';
+import { insertBeforeSharedStep } from './flow-insert';
 import VariableExtractionSettings from './components/VariableExtractionSettings.vue';
 import ScriptParameterSettings from './components/ScriptParameterSettings.vue';
 import { validateVariables, validateExtraction, validateReturns, type TestVariable } from './variables';
@@ -39,6 +40,8 @@ import { DEFAULT_LOG_PREFIX, validateStageLog } from './stage-log';
 import RecordedSteps from './components/RecordedSteps.vue';
 import NewScriptDialog from './components/NewScriptDialog.vue';
 import VisualChangeDialog from './components/VisualChangeDialog.vue';
+import ImageCheckDialog from './components/ImageCheckDialog.vue';
+import { createImageCheckConfig, validateImageCheck, type ImageCheckConfig } from './image-check';
 import AiRecognitionTestDialog from './components/AiRecognitionTestDialog.vue';
 import { validateAiRecognitionPrompt } from './ai-recognition';
 import {
@@ -57,6 +60,7 @@ import {
   boundsToVisualRegion,
   createStepId,
   normalizeVisualChangeConfig,
+  syncVisualChangeThreshold,
   visualRegionToBounds,
 } from './visual-change';
 import {
@@ -77,6 +81,7 @@ type LegacyFlow = NonNullable<AppiumRecordedStep['flow']> & { scope?: string };
 type SwipeGesture = NonNullable<AppiumRecordedStep['swipe']>;
 type SwipeForm = SwipeGesture & { direction: string };
 type BranchTarget = {
+  beforeStepId?: string;
   stepId: string;
   branch: BranchName;
   updateTarget?: boolean;
@@ -105,6 +110,7 @@ const insertableRecorderActions: RecorderAction[] = [
   'checkedState',
   'radioButtonState',
   'aiRecognition',
+  'imageCheck',
   'textClick',
   'runScript',
   'keyBack',
@@ -177,6 +183,7 @@ const currentActivity = shallowRef('');
 const replayOutput = shallowRef('');
 const replayOutputDialogVisible = shallowRef(false);
 const linkedScriptDialogVisible = shallowRef(false);
+const linkedScriptEditingId = shallowRef('');
 const linkedScriptTargetId = shallowRef('');
 const linkedParameters = reactive<AppiumRecordedStep>({ id: 'link-parameters', type: 'runScript', label: '', parameters: [], returns: [] });
 const linkedScriptInsertIndex = shallowRef<number | undefined>();
@@ -186,6 +193,11 @@ const linkedScriptPreviewVisible = shallowRef(false);
 const linkedScriptPreviewScriptId = shallowRef('');
 const linkedScriptPreviewResetToken = shallowRef(0);
 const visualChangeDialogVisible = shallowRef(false);
+const imageCheckDraft = shallowRef<AppiumRecordedStep | null>(null);
+let imageCheckIndex: number | undefined;
+let imageCheckBranch: BranchTarget | undefined;
+let imageCheckEditing = false;
+const imageCheckPicking = shallowRef(false);
 const visualChangePicking = shallowRef(false);
 const visualChangeInsertIndex = shallowRef<number | undefined>();
 const visualChangeBranchTarget = shallowRef<BranchTarget | null>(null);
@@ -291,11 +303,12 @@ const selectedBounds = computed(() => {
   return bounds && selectedNode.value ? { id: selectedNode.value.id, ...bounds } : undefined;
 });
 const visualChangeSelectedRegion = computed(() => {
+  if (imageCheckDraft.value?.imageCheck?.target === 'region') return visualRegionToBounds('image-check-region', imageCheckDraft.value.imageCheck.region);
   if (!visualChangeDialogVisible.value || visualChangeConfig.value.mode !== 'region') return undefined;
   return visualRegionToBounds('visual-change-region', visualChangeConfig.value.region);
 });
 const visualChangeRegionSelectionEnabled = computed(() => (
-  visualChangeDialogVisible.value && visualChangeConfig.value.mode === 'region'
+  (visualChangeDialogVisible.value && visualChangeConfig.value.mode === 'region') || imageCheckDraft.value?.imageCheck?.target === 'region'
 ));
 
 function stepWithBranchTarget(step: AppiumRecordedStep, branchTarget: BranchTarget) {
@@ -311,6 +324,10 @@ function stepWithBranchTarget(step: AppiumRecordedStep, branchTarget: BranchTarg
 }
 
 function insertStep(step: AppiumRecordedStep, index?: number, branchTarget?: BranchTarget) {
+  if (branchTarget?.beforeStepId) {
+    steps.value = insertBeforeSharedStep(steps.value, branchTarget.beforeStepId, [step], [step.id]);
+    return steps.value.find(item => item.id === step.id)!;
+  }
   let nextSteps = [...steps.value];
   let insertedStep = branchTarget ? stepWithBranchTarget(step, branchTarget) : step;
   if (index === -1) {
@@ -369,7 +386,7 @@ function copyFlowNodes(indexes: number[]) {
   }
 }
 
-function pasteFlowNodes(index: number, branch?: BranchName) {
+function pasteFlowNodes(index: number, branch?: BranchName, beforeStepId?: string) {
   if (!flowClipboard.value) {
     ElMessage.warning('请先复制节点');
     return;
@@ -382,6 +399,7 @@ function pasteFlowNodes(index: number, branch?: BranchName) {
     const nextSteps = pasteFlowClipboard(steps.value, flowClipboard.value, {
       afterIndex: index,
       branch,
+      beforeStepId,
     });
     validateLoopSteps(nextSteps);
     steps.value = nextSteps;
@@ -631,6 +649,35 @@ function defaultVisualChangeRegion(): AppiumVisualChangeRegion {
   };
 }
 
+function updateImageCheck(config: ImageCheckConfig) {
+  if (imageCheckDraft.value) imageCheckDraft.value = { ...imageCheckDraft.value, imageCheck: config };
+}
+
+function useImageCheckElement() {
+  const node = selectedNode.value;
+  if (!node?.bounds || !imageCheckDraft.value?.imageCheck) return;
+  const located = createNodeActionStep('imageCheck', '图像判断', node);
+  imageCheckDraft.value = { ...imageCheckDraft.value, selector: located.selector, contextSelector: located.contextSelector,
+    selectorChain: located.selectorChain, fallback: undefined,
+    imageCheck: { ...imageCheckDraft.value.imageCheck, target: 'element', region: boundsToVisualRegion(node.bounds) } };
+}
+
+function confirmImageCheck() {
+  const draft = imageCheckDraft.value;
+  if (!draft || recordingLocked.value) return;
+  try {
+    validateImageCheck(draft.imageCheck);
+    if (draft.imageCheck?.target === 'element' && (!draft.selector || draft.selector.strategy === 'bounds')) throw new Error('请选择具有有效定位信息的组件');
+    if (imageCheckEditing) {
+      const index = steps.value.findIndex(step => step.id === draft.id);
+      if (index < 0) throw new Error('原节点已删除');
+      updateStep(index, draft);
+    } else insertStep(draft, imageCheckIndex, imageCheckBranch);
+    imageCheckDraft.value = null;
+    imageCheckPicking.value = false;
+  } catch (error) { ElMessage.warning((error as Error).message); }
+}
+
 function currentVisualChangeConfig() {
   const bounds = selectedNode.value?.bounds;
   return normalizeVisualChangeConfig({
@@ -1121,6 +1168,7 @@ async function addSwipeStep(index?: number, branchTarget?: BranchTarget) {
 }
 
 function openLinkedScriptDialog(index?: number, branchTarget?: BranchTarget) {
+  linkedScriptEditingId.value = '';
   if (!linkableScripts.value.length) {
     ElMessage.warning('暂无可连接的已保存脚本');
     return;
@@ -1170,7 +1218,14 @@ function addLinkedScriptStep() {
     );
     return;
   }
-  insertStep(
+  const editingIndex = linkedScriptEditingId.value ? steps.value.findIndex(step => step.id === linkedScriptEditingId.value) : -1;
+  if (linkedScriptEditingId.value && editingIndex < 0) { ElMessage.warning('原节点已删除，请重新打开'); return; }
+  if (editingIndex >= 0) {
+    const original = steps.value[editingIndex]!;
+    updateStep(editingIndex, { ...original, value: script.id,
+      ...(original.label.startsWith('连接脚本 ') ? { label: `连接脚本 ${script.name}` } : {}),
+      parameters: JSON.parse(JSON.stringify(linkedParameters.parameters || [])), returns: JSON.parse(JSON.stringify(linkedParameters.returns || [])) });
+  } else insertStep(
     { ...createRunScriptStep(script), parameters: JSON.parse(JSON.stringify(linkedParameters.parameters || [])), returns: JSON.parse(JSON.stringify(linkedParameters.returns || [])) },
     linkedScriptInsertIndex.value,
     linkedScriptBranchTarget.value || undefined,
@@ -1179,10 +1234,12 @@ function addLinkedScriptStep() {
   linkedScriptBranchTarget.value = null;
   linkedScriptExpectedActivity.value = '';
   linkedScriptDialogVisible.value = false;
-  ElMessage.success('已添加连接脚本步骤');
+  ElMessage.success(editingIndex >= 0 ? '已修改连接脚本' : '已添加连接脚本步骤');
+  linkedScriptEditingId.value = '';
 }
 
 function closeLinkedScriptDialog() {
+  linkedScriptEditingId.value = '';
   linkedScriptDialogVisible.value = false;
   linkedScriptInsertIndex.value = undefined;
   linkedScriptBranchTarget.value = null;
@@ -1245,6 +1302,11 @@ function pickVisualChangeRegion() {
 }
 
 function applyVisualChangeRegion(region: AppiumVisualChangeRegion) {
+  if (imageCheckDraft.value?.imageCheck) {
+    updateImageCheck({ ...imageCheckDraft.value.imageCheck, region, screenWidth: props.deviceWidth || 0, screenHeight: props.deviceHeight || 0 });
+    imageCheckPicking.value = false;
+    return;
+  }
   visualChangeConfig.value = normalizeVisualChangeConfig({
     ...visualChangeConfig.value,
     mode: 'region',
@@ -1282,6 +1344,13 @@ function isReadonlyFlowCopySelected(_index: number) {
   return false;
 }
 
+function addSharedAction(action: RecorderAction, index: number, beforeStepId?: string) {
+  if (!beforeStepId) return addAction(action, index);
+  const target = steps.value.find(step => step.id === beforeStepId);
+  if (!target) return;
+  return addAction(action, index, { beforeStepId, stepId: target.flow?.parentConditionId || '', branch: target.flow?.parentBranch || 'yes' });
+}
+
 async function addAction(
   action: RecorderAction,
   index?: number,
@@ -1350,6 +1419,16 @@ async function addAction(
     if (result) return insertStep({ ...step, breakLoopTargetId: scoped.breakLoopTargetId }, index, branchTarget);
     return;
   }
+  if (action === 'imageCheck') {
+    imageCheckIndex = index;
+    imageCheckBranch = branchTarget;
+    imageCheckEditing = false;
+    imageCheckPicking.value = false;
+    imageCheckDraft.value = { id: createStepId(), type: 'imageCheck', label: '图像判断', flow: { nodeKind: 'condition' },
+      imageCheck: { ...createImageCheckConfig(), region: defaultVisualChangeRegion(), screenWidth: props.deviceWidth || 0, screenHeight: props.deviceHeight || 0 } };
+    if (selectedNode.value?.bounds) useImageCheckElement();
+    return;
+  }
   if (action === 'aiRecognition') {
     const input = await ElMessageBox.prompt('识别内容', '添加 AI 识别', {
       inputType: 'textarea',
@@ -1724,11 +1803,28 @@ function updateStep(index: number, step: AppiumRecordedStep) {
         ? syncVisualChangePairConfig(candidate, visualChange)
         : candidate
   ));
-  steps.value = nextSteps;
+  steps.value = syncVisualChangeThreshold(nextSteps, step);
 }
 
 async function editInputStep(index: number) {
   const step = steps.value[index];
+  if (step?.type === 'runScript' && !recordingBusy.value) {
+    const parentId = step.flow?.parentConditionId;
+    openLinkedScriptDialog(index - 1, parentId && step.flow?.parentBranch ? { stepId: parentId, branch: step.flow.parentBranch } : undefined);
+    if (!linkedScriptDialogVisible.value) return;
+    linkedScriptEditingId.value = step.id;
+    linkedScriptTargetId.value = step.value || '';
+    linkedParameters.parameters = JSON.parse(JSON.stringify(step.parameters || []));
+    linkedParameters.returns = JSON.parse(JSON.stringify(step.returns || []));
+    return;
+  }
+  if (step?.type === 'imageCheck' && !recordingBusy.value) {
+    imageCheckIndex = index;
+    imageCheckEditing = true;
+    imageCheckPicking.value = false;
+    imageCheckDraft.value = JSON.parse(JSON.stringify(step));
+    return;
+  }
   if (!step || (step.type !== 'input' && step.type !== 'inputIfExists') || recordingBusy.value) return;
   const input = await ElMessageBox.prompt('', '修改输入内容', {
     inputValue: step.value || '',
@@ -2142,7 +2238,7 @@ watch(
         :selected-bounds="selectedBounds"
         :selected-region="visualChangeSelectedRegion"
         :region-selection="visualChangeRegionSelectionEnabled"
-        :region-draw-mode="visualChangePicking"
+        :region-draw-mode="visualChangePicking || imageCheckPicking"
         :device-width="deviceWidth"
         :device-height="deviceHeight"
         @switch-device="switchDevice"
@@ -2216,7 +2312,7 @@ watch(
                   @copy="copyFlowNodes"
                   @paste="pasteFlowNodes"
                   @add-delay="addDelayStep"
-                  @insert-action="(index, action) => addAction(action, index)"
+                  @insert-action="(index, action, beforeStepId) => addSharedAction(action, index, beforeStepId)"
                   @insert-branch-action="addBranchAction"
                   @edit-input="editInputStep"
                   @preview-linked-script="previewLinkedScriptStep"
@@ -2331,6 +2427,14 @@ watch(
       @close="aiRecognitionTestStep = null"
     />
 
+    <ImageCheckDialog
+      v-if="imageCheckDraft?.imageCheck"
+      :config="imageCheckDraft.imageCheck" :device-id="selectedDeviceId"
+      :has-element="Boolean(selectedNode?.bounds)" :editing="imageCheckEditing" :picking="imageCheckPicking"
+      @update="updateImageCheck" @close="imageCheckDraft = null; imageCheckPicking = false"
+      @confirm="confirmImageCheck" @use-element="useImageCheckElement"
+      @pick="imageCheckPicking = true; workspaceRef?.showPreview()"
+    />
     <VisualChangeDialog
       :model-value="visualChangeDialogVisible"
       :config="visualChangeConfig"
@@ -2409,7 +2513,7 @@ watch(
       </el-form>
       <template #footer>
         <el-button @click="closeLinkedScriptDialog">取消</el-button>
-        <el-button type="primary" @click="addLinkedScriptStep">添加连接</el-button>
+        <el-button type="primary" @click="addLinkedScriptStep">{{ linkedScriptEditingId ? '保存' : '添加连接' }}</el-button>
       </template>
     </el-dialog>
 

package/src/appium-recorder/action-descriptions.ts

@@ -0,0 +1,46 @@
+import type { InsertAction } from './flow-graph';
+
+// 普通画布、嵌套分支及流程总览共用说明，新增操作时必须补齐。
+export const actionDescriptions: Record<InsertAction, string> = {
+  imageCheck: '使用 OpenCV 在本地判断指定区域，不调用 AI。适合固定图标、图片勾选状态、黑屏、颜色及多帧变化；不适合业务语义或任意文字识别，不能仅凭外观证明按钮可用或视频卡死。原生属性可读取时优先使用属性判断，证据不足报告无法判定。',
+  tap: '记录点击当前选中的组件，回放时重新定位后点击。',
+  input: '向当前选中的输入组件写入指定文字，支持 {{变量名}} 引用。',
+  extractVariable: '读取组件文字或属性，保存到当前脚本变量供后续节点引用。',
+  clearInput: '清空当前选中输入组件的内容。',
+  coordinateTap: '点击设备屏幕上的指定 X、Y 坐标。节点中可修改坐标，页面位置变化后需重新确认。',
+  longPress: '长按指定元素或屏幕坐标，可设置按住时长，默认按元素定位。',
+  keyBack: '执行 Android 系统返回操作。',
+  keyHome: '按 Home 键返回设备桌面，不等同于关闭应用。',
+  keyRecent: '打开 Android 最近任务列表。',
+  keyPower: '发送电源键操作，实际锁屏或唤醒行为由设备当前状态决定。',
+  swipe: '按指定起点、终点和时长滑动屏幕。',
+  pinch: '执行双指放大或缩小手势，需要当前页面支持缩放。',
+  launchApp: '启动指定应用，可放在流程中途或分支中执行。',
+  openGallery: '打开设备相册应用，不自动选择照片或视频。',
+  endFlow: '立即结束当前回放流程，后续节点不再执行。',
+  loop: '重复执行循环体，支持固定次数或条件退出，必须设置最大次数。',
+  breakLoop: '退出指定的当前或外层循环，继续执行该循环的结束路径。',
+  clearAppData: '清除目标应用数据并重置应用状态，可能删除登录信息和本地设置，仅允许在流程开始处添加。',
+  popupCondition: '判断目标组件是否存在，可进一步配置指定文本及精确或模糊匹配，按结果进入是或否分支。',
+  checkboxState: '读取原生 Checkbox 的 checked 状态，按 true/false 分支执行。',
+  radioButtonState: '读取原生 RadioButton 的 checked 状态，按 true/false 分支执行。',
+  checkedState: '读取 Checkbox、RadioButton 或 Switch 的真实勾选状态，按 true/false 分支执行。不支持仅用图片表示状态的普通 ImageView。',
+  aiRecognition: '用配置的模型判断当前画面，返回 true/false。适合语义、提示含义和复杂画面判断；可直接读取的组件属性优先使用原生判断。需要配置 AI 节点模型。',
+  textClick: '在组件树中按指定文字精确或模糊匹配并点击，进入匹配到文字或未匹配到文字分支。不识别图片或自绘画面中的文字。',
+  tapIfExists: '找到目标组件时点击，未找到则跳过并继续后续流程。',
+  inputIfExists: '找到目标输入组件时写入文字，未找到则跳过。支持 {{变量名}} 引用。',
+  clearIfExists: '找到目标输入组件时清空内容，未找到则跳过。',
+  backIfExists: '目标组件出现时执行系统返回，未出现则跳过。',
+  waitFor: '等待目标组件出现，超过配置的等待时间仍未出现则失败。',
+  assertExists: '校验目标组件是否存在，不满足时记录执行失败。旧脚本兼容操作。',
+  assertText: '校验组件文字是否满足预期，不满足时记录执行失败。旧脚本兼容操作。',
+  waitDisappear: '等待目标组件消失，超时仍存在则失败。',
+  waitActivity: '等待设备切换到指定的 Activity，适合确认页面跳转是否完成。',
+  delay: '暂停指定的毫秒数后继续执行，不判断页面是否已经准备完成。',
+  runScript: '执行连接的子脚本，支持显式传入参数并将返回变量映射到当前脚本。',
+  noop: '不执行设备操作，作为流程占位节点。',
+  log: '输出自定义内容和日志关键字，默认前缀为 stageLog，支持 {{变量名}} 引用。',
+  visualChangeStart: '截取指定组件或区域作为基准，与对应结束节点的截图比较。未添加对应结束节点时不比较。',
+  visualChangeEnd: '与同一可达路径上对应的开始截图比较，报告变化结果；多组检测可选择对应的开始节点。',
+  visualChange: '比较指定区域的截图变化，不直接判断业务状态或图片单选框是否勾选。',
+};

package/src/appium-recorder/api.ts

@@ -2,6 +2,11 @@ import { APP_BASE } from '../api';
 import type { AppiumRecordedScript, AppiumRecordedStep } from './types';
 import type { AiRecognitionResult } from './ai-recognition';
 import type { TestVariable } from './variables';
+import type { AppiumVisualChangeRegion } from './types';
+
+export function captureImageCheckRegion(deviceId: string, region: AppiumVisualChangeRegion, screenWidth: number, screenHeight: number) {
+  return postJson<{ base64: string; screenWidth: number; screenHeight: number }>(`${APP_BASE}/api/appium-recorder/image-check/capture`, { deviceId, region, screenWidth, screenHeight });
+}
 
 // 队列跨组件挂载保留，切换脚本或清空草稿时仍按编辑顺序写入。
 const variableWrites = new Map<string, Promise<unknown>>();

package/src/appium-recorder/components/ComponentInspector.vue

@@ -12,7 +12,13 @@ defineEmits<{ refresh: []; select: [node: AppiumNode] }>();
     <template #header><div class="panel-header"><span>App 组件树</span><el-tooltip content="刷新组件树" placement="top" :show-after="200"><el-button class="recorder-panel-tool" :icon="Refresh" size="small" aria-label="刷新组件树" :loading="loading" :disabled="disabled" @click="$emit('refresh')" /></el-tooltip></div></template>
     <ComponentTree :tree="tree" :selected-id="node?.id || ''" @select="$emit('select', $event)" />
     <NodeDetail :node="node" :current-activity="activity" :loading="recording" />
-    <div class="component-inspector__activity"><span>Activity</span><code :title="activity">{{ activity || '-' }}</code></div>
+    <div class="component-inspector__activity">
+      <span>Activity</span>
+      <el-tooltip :content="activity" :disabled="!activity" placement="top" effect="dark" :show-after="200"
+        :popper-style="{ maxWidth: 'min(480px, calc(100vw - 24px))', overflowWrap: 'anywhere', fontSize: '12px' }">
+        <code :tabindex="activity ? 0 : undefined">{{ activity || '-' }}</code>
+      </el-tooltip>
+    </div>
   </el-card>
 </template>
 
@@ -22,5 +28,6 @@ defineEmits<{ refresh: []; select: [node: AppiumNode] }>();
 .component-inspector :deep(.appium-node-summary) { flex: none; }
 .panel-header { font-size: 14px; gap: 4px; }
 .component-inspector__activity { flex: none; display: flex; min-width: 0; gap: 6px; padding-top: 8px; border-top: 1px solid #e4e7ed; font-size: 12px; color: #606266; }
-.component-inspector__activity code { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.component-inspector__activity > span { flex-shrink: 0; }
+.component-inspector__activity code { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 </style>

package/src/appium-recorder/components/FlowActionMenu.vue

@@ -2,6 +2,7 @@
 import { nextTick, shallowRef } from 'vue';
 import type { MenuInstance, PopoverInstance } from 'element-plus';
 import { PASTE_COMMAND, type FlowActionGroup, type InsertAction } from '../flow-graph';
+import { actionDescriptions } from '../action-descriptions';
 
 const props = defineProps<{
   groups: FlowActionGroup[];
@@ -118,14 +119,25 @@ function selectAction(value: string) {
             @click="openGroupOnClick($event, group.title)"
           >
             <template #title>{{ group.title }}</template>
-            <el-menu-item
+            <el-tooltip
               v-for="action in group.actions"
               :key="action.type"
-              :index="action.type"
-              :disabled="isActionDisabled(action.type)"
+              :content="actionDescriptions[action.type]"
+              placement="right"
+              effect="dark"
+              :show-after="350"
+              :hide-after="0"
+              :enterable="false"
+              :popper-options="{ modifiers: [{ name: 'preventOverflow', options: { altAxis: true, padding: 8 } }] }"
+              popper-class="appium-action-description"
             >
-              {{ action.label }}
-            </el-menu-item>
+              <el-menu-item
+                :index="action.type"
+                :disabled="isActionDisabled(action.type)"
+              >
+                {{ action.label }}
+              </el-menu-item>
+            </el-tooltip>
           </el-sub-menu>
           <el-menu-item v-if="clipboardCount" :index="PASTE_COMMAND" class="appium-action-paste">
             粘贴 {{ clipboardCount }} 个节点
@@ -137,6 +149,15 @@ function selectAction(value: string) {
 </template>
 
 <style>
+.appium-action-description.el-popper {
+  max-width: min(300px, calc(100vw - 32px));
+  padding: 8px 10px;
+  font-size: 12px;
+  line-height: 1.6;
+  overflow-wrap: anywhere;
+  pointer-events: none;
+}
+
 .appium-action-menu-trigger {
   display: inline-flex;
 }

package/src/appium-recorder/components/FlowCanvas.vue

@@ -47,9 +47,9 @@ const emit = defineEmits<{
   nodeClick: [index: number];
   merge: [index: number];
   copy: [indexes: number[]];
-  paste: [index: number, branch?: FlowBranch];
+  paste: [index: number, branch?: FlowBranch, beforeStepId?: string];
   remove: [index: number];
-  insertAction: [index: number, action: InsertAction];
+  insertAction: [index: number, action: InsertAction, beforeStepId?: string];
   insertBranchAction: [index: number, branch: FlowBranch, action: InsertAction];
   editInput: [index: number];
   previewLinkedScript: [index: number];
@@ -180,16 +180,17 @@ function handleInsert(payload: {
   action: InsertAction | typeof PASTE_COMMAND;
   branch?: FlowBranch;
   conditionIndex?: number;
+  beforeStepId?: string;
 }) {
   if (payload.action === PASTE_COMMAND) {
-    emit('paste', payload.afterIndex, payload.branch);
+    emit('paste', payload.afterIndex, payload.branch, payload.beforeStepId);
     return;
   }
   if (payload.branch && payload.conditionIndex !== undefined) {
     emit('insertBranchAction', payload.afterIndex, payload.branch, payload.action);
     return;
   }
-  emit('insertAction', payload.afterIndex, payload.action);
+  emit('insertAction', payload.afterIndex, payload.action, payload.beforeStepId);
 }
 </script>
 

package/src/appium-recorder/components/FlowNodeCard.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, nextTick, onBeforeUnmount, onMounted, shallowRef, watch } from 'vue';
 import { Handle, Position } from '@vue-flow/core';
-import { CopyDocument, Delete, Edit, Plus, VideoPlay, View, WarningFilled, Connection } from '@element-plus/icons-vue';
+import { CopyDocument, Delete, Edit, Plus, VideoPlay, View, WarningFilled, Connection, RefreshLeft } from '@element-plus/icons-vue';
 import { AI_MODEL_CONFIG_HINT } from '../ai-recognition';
 import type { AppiumRecordedStep } from '../types';
 import {
@@ -29,7 +29,7 @@ const emit = defineEmits<{
   editInput: [index: number];
   previewLinkedScript: [index: number];
   execute: [index: number];
-  insert: [payload: { afterIndex: number; action: InsertAction | typeof PASTE_COMMAND; branch?: FlowBranch; conditionIndex?: number }];
+  insert: [payload: { afterIndex: number; action: InsertAction | typeof PASTE_COMMAND; branch?: FlowBranch; conditionIndex?: number; beforeStepId?: string }];
   updateStep: [payload: { index: number; step: AppiumRecordedStep }];
   resize: [payload: { id: string; height: number }];
 }>();
@@ -39,6 +39,7 @@ let resizeObserver: ResizeObserver | null = null;
 
 const insertTitle = computed(() => {
   if (props.data.kind !== 'insert') return '';
+  if (props.data.beforeStepId) return '在合流后插入操作';
   if (props.data.branch) return `在“${props.data.branchLabel || (props.data.branch === 'yes' ? '是' : '否')}”分支插入操作`;
   return props.data.afterIndex < 0 ? '在开始后插入操作' : '插入操作';
 });
@@ -47,6 +48,7 @@ function emitInsert(command: string | number | object) {
   if (props.readonly || props.data.kind !== 'insert') return;
   emit('insert', {
     afterIndex: props.data.afterIndex,
+    beforeStepId: props.data.beforeStepId,
     action: command === PASTE_COMMAND ? PASTE_COMMAND : command as InsertAction,
     branch: props.data.branch,
     conditionIndex: props.data.conditionIndex,
@@ -185,9 +187,9 @@ watch(() => props.data, () => {
         </span>
       </button>
       <span v-if="!props.readonly && !data.deleteMode" class="appium-flow-step-card__actions nodrag nopan" @click.stop>
-        <el-tooltip v-if="data.flowKind === 'condition' && data.step.type !== 'loop' && !data.copyMode" content="合并分支：将两侧后续节点汇入公共流程" placement="top" :show-after="200">
-        <span class="appium-node-action-tooltip"><el-button text size="small" :icon="Connection"
-          title="合并分支" aria-label="合并分支" :disabled="data.mergeDisabled || Boolean(data.step.flow?.successTargetId)"
+        <el-tooltip v-if="data.flowKind === 'condition' && data.step.type !== 'loop' && !data.copyMode" :content="data.step.flow?.successTargetId ? '取消合并：还原分支并保留后续编辑' : '合并分支：将两侧后续节点汇入公共流程'" placement="top" :show-after="200">
+        <span class="appium-node-action-tooltip"><el-button text size="small" :icon="data.step.flow?.successTargetId ? RefreshLeft : Connection"
+          :title="data.step.flow?.successTargetId ? '取消合并' : '合并分支'" :aria-label="data.step.flow?.successTargetId ? '取消合并' : '合并分支'" :disabled="data.mergeDisabled"
           @click="emit('merge', data.index)" />
         </span></el-tooltip>
         <el-tooltip v-if="!data.copyMode && data.canCopy" content="复制节点：复制后可在插入位置粘贴" placement="top" :show-after="200">
@@ -213,14 +215,14 @@ watch(() => props.data, () => {
           @click="emit('execute', data.index)"
         />
         </span></el-tooltip>
-        <el-tooltip v-if="data.canEditInput" content="修改输入内容：编辑此节点要输入的文字" placement="top" :show-after="200">
+        <el-tooltip v-if="data.canEditInput" :content="data.step.type === 'runScript' ? '修改连接脚本' : data.step.type === 'imageCheck' ? '修改图像判断配置' : '修改输入内容：编辑此节点要输入的文字'" placement="top" :show-after="200">
         <span class="appium-node-action-tooltip">
         <el-button
           text
           size="small"
           :icon="Edit"
           :disabled="data.disabled"
-          title="修改输入内容"
+          :title="data.step.type === 'runScript' ? '修改连接脚本' : data.step.type === 'imageCheck' ? '修改图像判断配置' : '修改输入内容'"
           @click="emit('editInput', data.index)"
         />
         </span></el-tooltip>

package/src/appium-recorder/components/FlowStepEditor.vue

@@ -5,7 +5,6 @@ import { normalizeVisualChangeConfig } from '../visual-change';
 import { longPressMode } from '../long-press';
 import { defaultFlowKind, isBooleanCondition } from '../flow-labels';
 import TextClickSettings from './TextClickSettings.vue';
-import { isNativeStateCondition } from '../native-control-state';
 import LongPressSettings from './LongPressSettings.vue';
 import StageLogSettings from './StageLogSettings.vue';
 import LoopSettings from './LoopSettings.vue';
@@ -47,7 +46,7 @@ function defaultKind(): FlowKind {
 function patchStep(patch: Partial<AppiumRecordedStep>) {
   emit('update', {
     index: props.index,
-    step: { ...props.step, ...patch },
+    step: { ...props.step, ...patch, ...('contextSelector' in patch ? { selectorChain: undefined } : {}) },
   });
 }
 
@@ -79,6 +78,10 @@ function patchSwipe(patch: Partial<SwipeGesture>) {
   });
 }
 
+function patchPinch(patch: Partial<NonNullable<AppiumRecordedStep['pinch']>>) {
+  patchStep({ pinch: { direction: 'out', centerX: 0, centerY: 0, percent: 0.5, ...props.step.pinch, ...patch } });
+}
+
 function patchTapCoordinate(axis: 'centerX' | 'centerY', value: number | undefined) {
   if (value === undefined || !Number.isFinite(value)) return;
   const fallback = {
@@ -125,7 +128,7 @@ function patchSelector(patch: Partial<AppiumSelector>) {
   patchStep({
     selector: { ...props.step.selector!, ...patch },
     // 修改元素目标后，不能继续优先使用录制时的备用 XPath。
-    ...(props.step.type === 'longPress' || props.step.type === 'extractVariable' || isNativeStateCondition(props.step) ? { selectorChain: undefined } : {}),
+    selectorChain: undefined,
   });
 }
 </script>
@@ -173,6 +176,22 @@ function patchSelector(patch: Partial<AppiumSelector>) {
         </el-form-item>
       </div>
       <LongPressSettings v-if="step.type === 'longPress'" :step="step" :disabled="disabled" @update="patchStep" />
+      <el-form-item v-if="['waitActivity', 'launchApp', 'clearAppData'].includes(step.type)" :label="step.type === 'waitActivity' ? '目标 Activity' : '目标 APP 包名'">
+        <el-input :model-value="step.value || ''" :disabled="disabled" @update:model-value="patchStep({ value: String($event) })" />
+      </el-form-item>
+      <template v-if="step.type === 'pinch'">
+        <el-form-item label="缩放方向">
+          <el-select :model-value="step.pinch?.direction || 'out'" :disabled="disabled" @update:model-value="patchPinch({ direction: $event })">
+            <el-option label="放大" value="out" /><el-option label="缩小" value="in" />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-for="axis in (['centerX', 'centerY'] as const)" :key="axis" :label="axis === 'centerX' ? '中心 X' : '中心 Y'">
+          <el-input-number :model-value="step.pinch?.[axis] ?? 0" :disabled="disabled" :min="0" :max="99999" :precision="0" controls-position="right" @update:model-value="patchPinch({ [axis]: $event ?? 0 })" />
+        </el-form-item>
+        <el-form-item label="缩放比例">
+          <el-input-number :model-value="step.pinch?.percent ?? 0.5" :disabled="disabled" :min="0.01" :max="1" :step="0.05" controls-position="right" @update:model-value="patchPinch({ percent: $event ?? 0.5 })" />
+        </el-form-item>
+      </template>
       <div v-if="step.type === 'coordinateTap'" class="appium-flow-editor__grid">
         <el-form-item label="坐标 X">
           <el-input-number :model-value="step.fallback?.centerX ?? 0" :disabled="disabled" :min="0" :max="99999" :precision="0" controls-position="right" aria-label="坐标 X" @update:model-value="patchTapCoordinate('centerX', $event)" />
@@ -221,7 +240,7 @@ function patchSelector(patch: Partial<AppiumSelector>) {
           <el-form-item label="变化阈值 %">
             <el-input-number
               :model-value="visualChangeConfig.changeRatioThreshold"
-              :disabled="visualChangeConfigDisabled"
+              :disabled="disabled"
               :min="0.01"
               :max="100"
               :step="0.1"