Skip to content
This repository was archived by the owner on Mar 25, 2025. It is now read-only.

Commit 342cfa1

Browse files
authored
Merge pull request #259 from caofengbin/feature/get_ele_attr
feat:增加获取控件属性到自定义变量的能力
2 parents 0588656 + 81845d6 commit 342cfa1

File tree

2 files changed

+71
-4
lines changed

2 files changed

+71
-4
lines changed

src/components/StepShow.vue

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,21 @@ const getNotes = (text, type) => {
468468
>
469469
获取到变量:{{ step.content }}
470470
</span>
471+
<span
472+
v-if="
473+
step.stepType === 'obtainElementAttr' ||
474+
step.stepType === 'obtainPocoElementAttr'
475+
"
476+
>
477+
<el-tag size="small">获取{{ getEleResult(step.stepType) }}控件属性</el-tag>
478+
<el-tag
479+
type="info"
480+
size="small"
481+
style="margin-left: 10px; margin-right: 10px"
482+
>{{ step.elements[0]['eleName'] }}</el-tag
483+
>
484+
的 {{ step.text }} 属性到变量:{{ step.content }}
485+
</span>
471486
<span v-if="step.stepType === 'getClipperByKeyboard'">
472487
<el-tag size="small">获取剪切板文本</el-tag>
473488
获取到变量:{{ step.content }}

src/components/StepUpdate.vue

Lines changed: 56 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,10 @@ const androidOptions = ref([
553553
value: 'clear',
554554
label: '清空输入框',
555555
},
556+
{
557+
value: 'obtainElementAttr',
558+
label: '获取控件属性',
559+
},
556560
{
557561
value: 'getElementAttr',
558562
label: '验证控件属性',
@@ -711,6 +715,10 @@ const androidOptions = ref([
711715
value: 'closePocoDriver',
712716
label: '关闭PocoDriver',
713717
},
718+
{
719+
value: 'obtainPocoElementAttr',
720+
label: '获取控件属性',
721+
},
714722
{
715723
value: 'getPocoElementAttr',
716724
label: '验证控件属性',
@@ -959,6 +967,10 @@ const iOSOptions = ref([
959967
value: 'clear',
960968
label: '清空输入框',
961969
},
970+
{
971+
value: 'obtainElementAttr',
972+
label: '获取控件属性',
973+
},
962974
{
963975
value: 'getElementAttr',
964976
label: '验证控件属性',
@@ -1051,6 +1063,10 @@ const iOSOptions = ref([
10511063
value: 'closePocoDriver',
10521064
label: '关闭PocoDriver',
10531065
},
1066+
{
1067+
value: 'obtainPocoElementAttr',
1068+
label: '获取控件属性',
1069+
},
10541070
{
10551071
value: 'getPocoElementAttr',
10561072
label: '验证控件属性',
@@ -2367,7 +2383,15 @@ onMounted(() => {
23672383
</el-form-item>
23682384
</div>
23692385

2370-
<div v-if="step.stepType === 'getElementAttr'">
2386+
<div v-if="step.stepType === 'getElementAttr' || step.stepType === 'obtainElementAttr'">
2387+
<el-alert
2388+
v-show="step.stepType === 'obtainElementAttr'"
2389+
show-icon
2390+
style="margin-bottom: 10px"
2391+
close-text="Get!"
2392+
type="info"
2393+
title="TIPS: 可以将获取的控件属性放入临时变量中"
2394+
/>
23712395
<element-select
23722396
label="控件元素"
23732397
place="请选择控件元素"
@@ -2431,15 +2455,33 @@ onMounted(() => {
24312455
<el-option value="visible"></el-option>
24322456
</el-select>
24332457
</el-form-item>
2434-
<el-form-item label="期望值" prop="content">
2458+
<el-form-item
2459+
v-if="step.stepType === 'getElementAttr'"
2460+
label="期望值" prop="content">
24352461
<el-input
24362462
v-model="step.content"
24372463
placeholder="请输入期望值"
24382464
></el-input>
24392465
</el-form-item>
2466+
<el-form-item
2467+
v-else
2468+
label="变量名" prop="content">
2469+
<el-input
2470+
v-model="step.content"
2471+
placeholder="请输入变量名"
2472+
></el-input>
2473+
</el-form-item>
24402474
</div>
24412475

2442-
<div v-if="step.stepType === 'getPocoElementAttr'">
2476+
<div v-if="step.stepType === 'getPocoElementAttr' || step.stepType === 'obtainPocoElementAttr'">
2477+
<el-alert
2478+
v-show="step.stepType === 'obtainPocoElementAttr'"
2479+
show-icon
2480+
style="margin-bottom: 10px"
2481+
close-text="Get!"
2482+
type="info"
2483+
title="TIPS: 可以将获取的控件属性放入临时变量中"
2484+
/>
24432485
<element-select
24442486
label="控件元素"
24452487
place="请选择控件元素"
@@ -2481,12 +2523,22 @@ onMounted(() => {
24812523
<el-option value="clickable"></el-option>
24822524
</el-select>
24832525
</el-form-item>
2484-
<el-form-item label="期望值" prop="content">
2526+
<el-form-item
2527+
v-if="step.stepType === 'getPocoElementAttr'"
2528+
label="期望值" prop="content">
24852529
<el-input
24862530
v-model="step.content"
24872531
placeholder="请输入期望值"
24882532
></el-input>
24892533
</el-form-item>
2534+
<el-form-item
2535+
v-else
2536+
label="变量名" prop="content">
2537+
<el-input
2538+
v-model="step.content"
2539+
placeholder="请输入变量名"
2540+
></el-input>
2541+
</el-form-item>
24902542
</div>
24912543

24922544
<div v-if="step.stepType === 'siriCommand'">

0 commit comments

Comments
 (0)