android-midscene-automation 0.1.28 → 0.1.30

package/src/appium-recorder/flow-labels.ts

@@ -10,7 +10,7 @@ export function isBooleanCondition(step: Pick<AppiumRecordedStep, 'type'>) {
 }
 
 export function defaultFlowKind(step: AppiumRecordedStep): FlowKind {
-  if (step.type === 'log') return 'action';
+  if (step.type === 'log' || step.type === 'openGallery' || step.type === 'endFlow') return 'action';
   if (isBooleanCondition(step)) return 'condition';
   if (step.flow?.nodeKind) return step.flow.nodeKind;
   if (step.type === 'assertExists' || step.type === 'assertText' || step.type === 'visualChange') return 'assertion';
@@ -40,6 +40,7 @@ export function flowTypeLabel(step: AppiumRecordedStep) {
     waitDisappear: '等待消失',
     assertExists: '断言存在',
     checkboxState: 'Checkbox 状态',
+    checkedState: '判断勾选',
     radioButtonState: 'RadioButton 状态',
     aiRecognition: 'AI 识别',
     textClick: '文字点击',
@@ -51,6 +52,8 @@ export function flowTypeLabel(step: AppiumRecordedStep) {
     swipe: '滑动',
     screenshot: '截图',
     launchApp: '启动 APP',
+    openGallery: '启动相册',
+    endFlow: '终止流程',
     clearAppData: '清理 APP 缓存',
     longPress: '长按',
     pinch: '双指缩放',

package/src/appium-recorder/flow-merge.ts

@@ -0,0 +1,110 @@
+import type { AppiumRecordedStep } from './types';
+import { defaultFlowKind } from './flow-labels';
+
+type Branch = 'yes' | 'no';
+export function branchSteps(steps: AppiumRecordedStep[], conditionId: string, branch: Branch) {
+  return steps.filter((step) => step.flow?.parentConditionId === conditionId && step.flow.parentBranch === branch);
+}
+
+function descendants(steps: AppiumRecordedStep[], roots: string[]) {
+  const ids = new Set(roots);
+  for (let changed = true; changed;) {
+    changed = false;
+    for (const step of steps) {
+      if (step.flow?.parentConditionId && ids.has(step.flow.parentConditionId) && !ids.has(step.id)) {
+        ids.add(step.id);
+        changed = true;
+      }
+    }
+  }
+  return ids;
+}
+
+// 合流仅提升明确选中的分支后缀，不按名称猜测重复节点，也不改写其他判断的分支。
+export function mergeBranches(steps: AppiumRecordedStep[], conditionId: string, commonId: string, duplicateId = '') {
+  const condition = steps.find((step) => step.id === conditionId);
+  const common = steps.find((step) => step.id === commonId);
+  if (!condition || defaultFlowKind(condition) !== 'condition') throw new Error('请选择判断节点');
+  if (condition.flow?.successTargetId) throw new Error('该判断已有后续公共流程，不能重复合流');
+  if (!common || common.flow?.parentConditionId !== conditionId || !common.flow.parentBranch) throw new Error('公共起点必须属于当前判断的直接分支');
+  const side = common.flow.parentBranch;
+  const otherSide = side === 'yes' ? 'no' : 'yes';
+  const source = branchSteps(steps, conditionId, side);
+  const other = branchSteps(steps, conditionId, otherSide);
+  const commonRoots = source.slice(source.findIndex((step) => step.id === commonId));
+  const commonIds = descendants(steps, commonRoots.map((step) => step.id));
+  const duplicateIndex = other.findIndex((step) => step.id === duplicateId);
+  if (duplicateId && duplicateIndex < 0) throw new Error('重复部分必须属于另一侧直接分支');
+  const removedIds = descendants(steps, duplicateId ? other.slice(duplicateIndex).map((step) => step.id) : []);
+  const ownedIds = descendants(steps, [conditionId]);
+  const keys = ['yesTargetId', 'noTargetId', 'successTargetId', 'failureTargetId'] as const;
+  for (const step of steps) {
+    for (const key of keys) {
+      const target = step.flow?.[key];
+      if (!target) continue;
+      if (commonIds.has(step.id) && ownedIds.has(target) && !commonIds.has(target)) throw new Error('公共流程存在返回分支的连接，合流会形成循环');
+      if (!ownedIds.has(step.id) && removedIds.has(target)) throw new Error('待删除节点被其他流程引用，不能合并');
+      if (ownedIds.has(step.id) && !commonIds.has(step.id) && !removedIds.has(step.id) && !ownedIds.has(target)) throw new Error('分支已有外部连接，请先处理该连接');
+    }
+  }
+  const next = steps.filter((step) => !removedIds.has(step.id)).map((step) => ({ ...step, flow: { ...step.flow } }));
+  const byId = new Map(next.map((step) => [step.id, step]));
+  const mergedCondition = byId.get(conditionId)!;
+  mergedCondition.flow.successTargetId = commonId;
+  // 只改变公共后缀的直接归属；后缀内部的嵌套判断仍拥有自己的子节点。
+  for (const root of commonRoots) {
+    const flow = byId.get(root.id)!.flow;
+    delete flow.parentConditionId;
+    delete flow.parentBranch;
+    if (condition.flow?.parentConditionId) {
+      flow.parentConditionId = condition.flow.parentConditionId;
+      flow.parentBranch = condition.flow.parentBranch;
+    }
+  }
+  function connectEnd(step: typeof next[number]) {
+    if (step.type === 'endFlow') return;
+    step.flow.successTargetId = commonId;
+    if (defaultFlowKind(step) === 'condition') {
+      for (const branch of ['yes', 'no'] as const) {
+        const children = branchSteps(next, step.id, branch);
+        if (children.length) connectEnd(byId.get(children[children.length - 1]!.id)!);
+        else step.flow[branch === 'yes' ? 'yesTargetId' : 'noTargetId'] = commonId;
+      }
+    }
+  }
+  for (const branch of ['yes', 'no'] as const) {
+    const remaining = branchSteps(next, conditionId, branch);
+    mergedCondition.flow[branch === 'yes' ? 'yesTargetId' : 'noTargetId'] = remaining[0]?.id || commonId;
+    if (remaining.length) connectEnd(byId.get(remaining[remaining.length - 1]!.id)!);
+  }
+  // 公共节点排在整个分支子树之后，保存和顺序回放不会插入到另一侧分支中。
+  const commonBlock = next.filter((step) => commonIds.has(step.id));
+  const rest = next.filter((step) => !commonIds.has(step.id));
+  let after = rest.findIndex((step) => step.id === conditionId);
+  rest.forEach((step, index) => { if (ownedIds.has(step.id)) after = Math.max(after, index); });
+  rest.splice(after + 1, 0, ...commonBlock);
+  for (const step of rest) {
+    for (const key of keys) {
+      if (step.flow[key] && removedIds.has(step.flow[key]!)) step.flow[key] = commonId;
+    }
+  }
+  // 校验完整执行图，包含隐式顺序边，拒绝回边及跨分支错误连接。
+  const visiting = new Set<string>();
+  const visited = new Set<string>();
+  function visit(step: typeof next[number]) {
+    if (visiting.has(step.id)) throw new Error('合流会形成循环，请检查节点连接');
+    if (visited.has(step.id)) return;
+    visiting.add(step.id);
+    const index = rest.indexOf(step);
+    const targets = keys.map((key) => step.flow[key]).filter(Boolean) as string[];
+    if (defaultFlowKind(step) !== 'condition' && step.type !== 'endFlow' && !step.flow.successTargetId) {
+      const sibling = rest.slice(index + 1).find((item) => item.flow.parentConditionId === step.flow.parentConditionId && item.flow.parentBranch === step.flow.parentBranch);
+      if (sibling) targets.push(sibling.id);
+    }
+    for (const id of targets) { const target = byId.get(id); if (target) visit(target); }
+    visiting.delete(step.id);
+    visited.add(step.id);
+  }
+  rest.forEach(visit);
+  return { steps: rest, removedCount: removedIds.size };
+}

package/src/appium-recorder/flow-remove.ts

@@ -4,6 +4,12 @@ type FlowTargetKey = 'yesTargetId' | 'noTargetId' | 'successTargetId' | 'failure
 
 const FLOW_TARGET_KEYS: FlowTargetKey[] = ['yesTargetId', 'noTargetId', 'successTargetId', 'failureTargetId'];
 
+export function removeFlowSteps(steps: AppiumRecordedStep[], indexes: number[]) {
+  const ids = [...new Set(indexes)].sort((a, b) => b - a).map((index) => steps[index]?.id).filter(Boolean);
+  // 使用稳定 ID 逐个删除，避免前一次删除导致后续索引错位。
+  return ids.reduce((current, id) => removeFlowStep(current, current.findIndex((step) => step.id === id)), steps);
+}
+
 function sameBranch(step: AppiumRecordedStep, removed: AppiumRecordedStep) {
   return Boolean(
     removed.flow?.parentConditionId

package/src/appium-recorder/native-control-state.ts

@@ -1,13 +1,13 @@
 import type { AppiumRecordedStep } from './types';
 
-export type NativeStateType = 'checkboxState' | 'radioButtonState';
+export type NativeStateType = 'checkboxState' | 'radioButtonState' | 'checkedState';
 
 export function isNativeStateCondition(step: Pick<AppiumRecordedStep, 'type'>): step is { type: NativeStateType } {
-  return step.type === 'checkboxState' || step.type === 'radioButtonState';
+  return step.type === 'checkboxState' || step.type === 'radioButtonState' || step.type === 'checkedState';
 }
 
 export function nativeControlName(type: NativeStateType) {
-  return type === 'checkboxState' ? 'Checkbox' : 'RadioButton';
+  return type === 'checkedState' ? '勾选组件（Checkbox / RadioButton / Switch）' : type === 'checkboxState' ? 'Checkbox' : 'RadioButton';
 }
 
 export function nativeControlType(className: unknown): NativeStateType | undefined {
@@ -15,9 +15,16 @@ export function nativeControlType(className: unknown): NativeStateType | undefin
   // 识别原生、AppCompat 和 Material 控件；仅有 checkable 的 View 不能证明控件类型。
   if (/(?:^|\.)(?:AppCompat|Material)?CheckBox$/.test(className)) return 'checkboxState';
   if (/(?:^|\.)(?:AppCompat|Material)?RadioButton$/.test(className)) return 'radioButtonState';
+  if (/(?:^|\.)(?:Switch|SwitchCompat|SwitchMaterial|MaterialSwitch)$/.test(className)) return 'checkedState';
   return undefined;
 }
 
+export function matchesNativeControl(type: NativeStateType, className: unknown) {
+  const detected = nativeControlType(className);
+  // 新节点自动识别三类控件，旧节点仍保留原有的类型约束。
+  return type === 'checkedState' ? detected !== undefined : detected === type;
+}
+
 // UIAutomator XML 使用字符串，Appium 属性响应也可能返回布尔值；缺失值不能视为 false。
 export function parseNativeBoolean(value: unknown): boolean | undefined {
   if (value === true || value === 'true') return true;

package/src/appium-recorder/types.ts

@@ -76,6 +76,7 @@ export type AppiumRecordedStep = {
     | 'waitFor'
     | 'assertExists'
     | 'checkboxState'
+    | 'checkedState'
     | 'radioButtonState'
     | 'aiRecognition'
     | 'textClick'
@@ -87,6 +88,8 @@ export type AppiumRecordedStep = {
     | 'swipe'
     | 'screenshot'
     | 'launchApp'
+    | 'openGallery'
+    | 'endFlow'
     | 'clearAppData'
     | 'waitDisappear'
     | 'assertText'

package/src/components/config/AppiumConfigPanel.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import type { ConfigForm } from '../../types';
+import FlowAppearanceSettings from './FlowAppearanceSettings.vue';
+import { DEFAULT_FLOW_BACKGROUND, isHexColor } from '../../appium-recorder/flow-appearance';
 
 defineProps<{
   configForm: ConfigForm;
@@ -15,7 +17,7 @@ defineEmits<{ testModel: []; saveModelConfig: [] }>();
     <template #header>
       <div class="panel-header">
         <span>节点模型配置</span>
-        <el-button type="primary" :loading="isSavingModelConfig" @click="$emit('saveModelConfig')">
+        <el-button type="primary" :loading="isSavingModelConfig" :disabled="!isHexColor(configForm.appium.flowBackgroundColor ?? DEFAULT_FLOW_BACKGROUND)" @click="$emit('saveModelConfig')">
           保存模型配置
         </el-button>
       </div>
@@ -41,6 +43,7 @@ defineEmits<{ testModel: []; saveModelConfig: [] }>();
       </el-form>
     </section>
   </el-card>
+  <FlowAppearanceSettings v-model="configForm.appium.flowBackgroundColor" :saving="isSavingModelConfig" @save="$emit('saveModelConfig')" />
 </template>
 
 <style scoped>

package/src/components/config/FlowAppearanceSettings.vue

@@ -0,0 +1,51 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import { RefreshLeft } from '@element-plus/icons-vue';
+import { DEFAULT_FLOW_BACKGROUND, FLOW_BACKGROUND_PRESETS, isHexColor, normalizeFlowBackground } from '../../appium-recorder/flow-appearance';
+
+const props = defineProps<{ modelValue?: string; saving: boolean }>();
+const emit = defineEmits<{ 'update:modelValue': [color: string]; save: [] }>();
+const color = computed(() => props.modelValue ?? DEFAULT_FLOW_BACKGROUND);
+const error = computed(() => isHexColor(color.value) ? '' : '请输入有效的十六进制颜色，如 #ABC 或 #AABBCC');
+</script>
+
+<template>
+  <el-card shadow="never" class="config-module-card config-appium-card flow-appearance-settings">
+    <template #header>
+      <div class="panel-header">
+        <span>流程背景色</span>
+        <el-button type="primary" :loading="saving" :disabled="Boolean(error)" @click="emit('save')">保存背景色</el-button>
+      </div>
+    </template>
+    <el-form label-position="top">
+      <el-form-item label="预选颜色">
+        <div class="flow-color-presets">
+          <button v-for="preset in FLOW_BACKGROUND_PRESETS" :key="preset" type="button"
+            :style="{ backgroundColor: preset }" :aria-label="`选择颜色 ${preset}`" :title="preset"
+            :aria-pressed="normalizeFlowBackground(color) === preset && !error"
+            @click="emit('update:modelValue', preset)" />
+        </div>
+      </el-form-item>
+      <el-form-item label="自定义颜色" :error="error">
+        <div class="flow-color-input">
+          <el-color-picker :model-value="normalizeFlowBackground(color)" color-format="hex" :predefine="FLOW_BACKGROUND_PRESETS"
+            aria-label="选择流程背景色" @update:model-value="emit('update:modelValue', $event || DEFAULT_FLOW_BACKGROUND)" />
+          <el-input :model-value="color" aria-label="十六进制背景色" placeholder="#D4E8DD"
+            @update:model-value="emit('update:modelValue', String($event))" />
+          <el-button :icon="RefreshLeft" title="恢复默认颜色" aria-label="恢复默认颜色" @click="emit('update:modelValue', DEFAULT_FLOW_BACKGROUND)" />
+        </div>
+      </el-form-item>
+    </el-form>
+  </el-card>
+</template>
+
+<style scoped>
+.flow-appearance-settings { margin-top: 20px; }
+.flow-appearance-settings .el-form { max-width: 640px; }
+.flow-color-presets, .flow-color-input { display: flex; align-items: center; gap: 10px; }
+.flow-color-presets { flex-wrap: wrap; }
+.flow-color-presets button { width: 32px; height: 32px; border: 1px solid var(--el-border-color-darker); border-radius: 4px; cursor: pointer; }
+.flow-color-presets button[aria-pressed="true"] { outline: 2px solid var(--el-color-primary); outline-offset: 2px; }
+.flow-color-input { width: 100%; }
+.flow-color-input .el-input { flex: 1; min-width: 0; }
+</style>

package/src/style.css

@@ -2814,7 +2814,7 @@ select {
   overflow: hidden;
   border: 1px solid #e6edf5;
   border-radius: 12px;
-  background: #d4e8dd;
+  background: var(--flow-background, #d4e8dd);
 }
 
 .appium-flow-canvas--dialog.appium-flow-canvas--vue {
@@ -2827,7 +2827,7 @@ select {
   height: 100%;
   background:
     radial-gradient(circle at 1px 1px, #aecfbd 1px, transparent 0) 0 0 / 22px 22px,
-    #d4e8dd;
+    var(--flow-background, #d4e8dd);
 }
 
 .appium-vue-flow .vue-flow__pane {

package/src/types.ts

@@ -12,7 +12,7 @@ export type GeneratorForm = {
 };
 
 export type ConfigForm = {
-  appium: { model: AiRecognitionModel };
+  appium: { model: AiRecognitionModel; flowBackgroundColor?: string };
   runtime: {
     androidSdkPath: string;
     reportOutputPath: string;