From 23c2c69e40fb8bdc975d707c7c3fcf2a0576edfb Mon Sep 17 00:00:00 2001 From: YeungKhaiChiu <1005935991@qq.com> Date: Sat, 1 Jun 2024 18:24:55 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E6=B7=BB=E5=8A=A0=E5=AE=89=E5=8D=93=E7=AB=AF=E7=9A=84?= =?UTF-8?q?=E6=8B=96=E6=8B=BD=E9=80=89=E9=A1=B9=EF=BC=8C=E5=B9=B6=E6=8A=8A?= =?UTF-8?q?=E5=8E=9F=E6=9C=AC=E7=9A=84=E6=8B=96=E6=8B=BD=E5=90=8D=E8=AF=8D?= =?UTF-8?q?=EF=BC=88swipe=EF=BC=89=E6=94=B9=E6=88=90=E6=9B=B4=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E7=9A=84=E6=BB=91=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/StepShow.vue | 9 ++- src/components/StepUpdate.vue | 104 +++++++++++++++++++++++++++++----- src/locales/lang/en_US.js | 7 ++- src/locales/lang/ja_JP.js | 27 +++++---- src/locales/lang/zh_CN.js | 9 ++- src/locales/lang/zh_TW.js | 9 ++- 6 files changed, 131 insertions(+), 34 deletions(-) diff --git a/src/components/StepShow.vue b/src/components/StepShow.vue index 2a9e8eb1..76a78492 100644 --- a/src/components/StepShow.vue +++ b/src/components/StepShow.vue @@ -332,7 +332,7 @@ const getNotes = (text, type) => { {{ step.elements[0]['eleName'] }} {{ - $t('stepDetail.dragTo') + $t('stepDetail.swipeTo') }} {{ step.elements[1]['eleName'] }} @@ -542,6 +542,13 @@ const getNotes = (text, type) => { {{ step.content }} + {{ step.elements[0]['eleName'] }} + {{ + $t('stepDetail.swipeTo') + }} + {{ step.elements[1]['eleName'] }} + + {{ step.elements[0]['eleName'] }} {{ $t('stepDetail.dragTo') diff --git a/src/components/StepUpdate.vue b/src/components/StepUpdate.vue index 532a8727..400d1d05 100644 --- a/src/components/StepUpdate.vue +++ b/src/components/StepUpdate.vue @@ -594,6 +594,10 @@ const androidOptions = ref([ value: 'swipe2', label: $t('stepDetail.label.androidOptions.element.uiEle.swipe2'), }, + { + value: 'drag2', + label: $t('stepDetail.label.androidOptions.element.uiEle.drag2'), + }, { value: 'scrollToEle', label: $t( @@ -668,6 +672,12 @@ const androidOptions = ref([ 'stepDetail.label.androidOptions.element.coordinate.swipe' ), }, + { + value: 'drag', + label: $t( + 'stepDetail.label.androidOptions.element.coordinate.drag' + ), + }, ], }, { @@ -1568,6 +1578,31 @@ onMounted(() => {
+ + +
+ +
{ style="margin-bottom: 10px" close-text="Get!" type="info" - :title="`${$t('stepDetail.msgTips.variable')}{{${$t('stepDetail.variableName')}}}`" + :title="`${$t('stepDetail.msgTips.variable')}{{${$t( + 'stepDetail.variableName' + )}}}`" /> { style="margin-bottom: 10px" close-text="Get!" type="info" - :title="`${$t('stepDetail.msgTips.variable')}{{${$t('stepDetail.variableName')}}}`" + :title="`${$t('stepDetail.msgTips.variable')}{{${$t( + 'stepDetail.variableName' + )}}}`" /> { style="margin-bottom: 10px" close-text="Get!" type="info" - :title="`${$t('stepDetail.msgTips.variable')}{{${$t('stepDetail.variableName')}}}`" + :title="`${$t('stepDetail.msgTips.variable')}{{${$t( + 'stepDetail.variableName' + )}}}`" /> { style="margin-bottom: 10px" close-text="Get!" type="info" - :title="`${$t('stepDetail.msgTips.variable')}{{${$t('stepDetail.variableName')}}}`" + :title="`${$t('stepDetail.msgTips.variable')}{{${$t( + 'stepDetail.variableName' + )}}}`" /> { {{ $t('stepDetail.msgTips.focus') }}
- {{`${$t('stepDetail.msgTips.variable')}{{${$t('stepDetail.variableName')}}}`}} + {{ + `${$t('stepDetail.msgTips.variable')}{{${$t( + 'stepDetail.variableName' + )}}}` + }}
@@ -2350,6 +2399,29 @@ onMounted(() => {
+ + +
+ +
{ style="margin-bottom: 10px" close-text="Get!" type="info" - :title="`${$t('stepDetail.use')} {{${$t('stepDetail.variableName')}}} ${$t('stepDetail.msgTips.verify')}`" + :title="`${$t('stepDetail.use')} {{${$t( + 'stepDetail.variableName' + )}}} ${$t('stepDetail.msgTips.verify')}`" /> {
- {{ - $t('stepDetail.new') - }} + {{ $t('stepDetail.new') }} +
@@ -3509,8 +3585,8 @@ onMounted(() => {
- {{ - $t('stepDetail.submit') - }} + {{ $t('stepDetail.submit') }} +
diff --git a/src/locales/lang/en_US.js b/src/locales/lang/en_US.js index 59ef8798..6510fcf7 100644 --- a/src/locales/lang/en_US.js +++ b/src/locales/lang/en_US.js @@ -1156,6 +1156,7 @@ const stepDetail = { delete: 'Delete ', detect: 'Detect ', dragTo: 'Drag To ', + swipeTo: 'Swipe To', display: 'Display ', downwards: 'Downwards ', exception: { @@ -1263,8 +1264,9 @@ const stepDetail = { click: 'Click the Control Element', sendKeys: 'Enter Text', sendKeysByActions: 'Enter Text(Actions)', - swipe2: 'Drag Control Element', - scrollToEle: 'Drag to Control Element', + swipe2: 'Swipe Control Element', + drag2: 'Drag Control Element', + scrollToEle: 'Scroll to Control Element', longPress: 'Long Press Control Element', clear: 'Clear InputBox', obtainElementAttr: 'Get Element Attribute', @@ -1279,6 +1281,7 @@ const stepDetail = { tap: 'Tap Coordinate', longPressPoint: 'Long Press Point', swipe: 'Swipe', + drag: 'Drag And Drop', }, webView: { self: 'WebView Control', diff --git a/src/locales/lang/ja_JP.js b/src/locales/lang/ja_JP.js index 0f7fa963..ce9870fd 100644 --- a/src/locales/lang/ja_JP.js +++ b/src/locales/lang/ja_JP.js @@ -349,7 +349,6 @@ const common = { copy: '复制', inuse: '使用済み', inidle: 'アイドル状態', - }; // 路由 const routes = { @@ -467,7 +466,7 @@ const jobsTS = { }, addCron: '添加定时任务', whatCron: '什么是Cron表达式？', - cronNoNext: "N/A", + cronNoNext: 'N/A', cronInfo: { one: '* 第一位，表示秒，取值 0-59', two: '* 第二位，表示分，取值 0-59', @@ -1064,16 +1063,19 @@ const stepDetail = { swipeEvent: '随机两个坐标滑动', systemEvent: 'Home、返回键等等', navEvent: '安卓：随机开关WIFI；iOS：后台运行当前应用', - isOpenPackageListener: '检测当前应用是否为被测应用，为否时将重新拉起被测应用', + isOpenPackageListener: + '检测当前应用是否为被测应用，为否时将重新拉起被测应用', isOpenH5Listener: '检测是否长时间停留在H5页面 (Android Only)', isOpenActivityListener: '检测当前Activity是否在黑名单内 (Android Only)', - isOpenNetworkListener: '检测设备是否处于飞行模式和WIFI网络 (Android Only)', + isOpenNetworkListener: + '检测设备是否处于飞行模式和WIFI网络 (Android Only)', }, }, detailConfigure: '详细配置', delete: '删除', detect: '检测', - dragTo: '滑动拖拽至', + dragTo: '拖拽至', + swipeTo: '滑动至', display: '显示', downwards: '向下', exception: { @@ -1180,7 +1182,8 @@ const stepDetail = { click: '点击控件元素', sendKeys: '输入文本', sendKeysByActions: '输入文本(Actions)', - swipe2: '拖拽控件元素', + swipe2: '滑动控件元素', + drag2: '拖拽控件元素', scrollToEle: '滚动到控件元素', longPress: '长按控件元素', clear: '清空输入框', @@ -1195,7 +1198,8 @@ const stepDetail = { self: '坐标控件', tap: '点击坐标', longPressPoint: '长按坐标', - swipe: '滑动拖拽', + swipe: '直线滑动', + drag: '拖拽滑动', }, webView: { self: 'WebView控件', @@ -1265,7 +1269,7 @@ const stepDetail = { self: '运行设置', stepHold: '步骤间隔设置', switchTouchMode: '触控模式设置', - }, + }, }, iOSOptions: { system: { @@ -1436,7 +1440,7 @@ const stepDetail = { 'TIPS: 传递Android应用的App包名，该步骤可实现自动授权目标App所需要的所有权限', focus: 'TIPS: 在文本框需要先获取焦点，才能进行输入时，使用此方式。', sysKey: - 'TIPS: 本功能需要先唤醒系统键盘。需要临时变量或全局变量时，可以添加', + 'TIPS: 本功能需要先唤醒系统键盘。需要临时变量或全局变量时，可以添加', table: 'TIPS: 长列表的场景下，可通过该方法连续滚动，尝试让目标元素可见', text: 'TIPS: 可以将获取的文本放入临时变量中', controlAttribute: 'TIPS: 可以将获取的控件属性放入临时变量中', @@ -1470,7 +1474,8 @@ const stepDetail = { port: '端口', randomEventsTest: '随机事件测试', refreshPage: '刷新页面', - reminderDisplay: '三个指令前端显示上保留，用于兼容老版本升级上来之后，依然能正常的显示和运行', + reminderDisplay: + '三个指令前端显示上保留，用于兼容老版本升级上来之后，依然能正常的显示和运行', reminderVersion: '大于2.5.0版本，增强的文本断言能力', retries: '重试次数', retriesInterval: '重试间隔', @@ -1498,7 +1503,7 @@ const stepDetail = { textToClipboard: '设置文本至剪切板', stepsInterval: '步骤间隔设置', touchMode: '触控模式设置', -}, + }, swipe: '滑动', switch: { handler: '切换句柄', diff --git a/src/locales/lang/zh_CN.js b/src/locales/lang/zh_CN.js index 953be1a8..43d25a9f 100644 --- a/src/locales/lang/zh_CN.js +++ b/src/locales/lang/zh_CN.js @@ -1133,7 +1133,8 @@ const stepDetail = { detailConfigure: '详细配置', delete: '删除', detect: '检测', - dragTo: '滑动拖拽至', + dragTo: '拖拽至', + swipeTo: '滑动至', display: '显示', downwards: '向下', exception: { @@ -1240,7 +1241,8 @@ const stepDetail = { click: '点击控件元素', sendKeys: '输入文本', sendKeysByActions: '输入文本(Actions)', - swipe2: '拖拽控件元素', + swipe2: '滑动控件元素', + drag2: '拖拽控件元素', scrollToEle: '滚动到控件元素', longPress: '长按控件元素', clear: '清空输入框', @@ -1255,7 +1257,8 @@ const stepDetail = { self: '坐标控件', tap: '点击坐标', longPressPoint: '长按坐标', - swipe: '滑动拖拽', + swipe: '直线滑动', + drag: '拖拽滑动', }, webView: { self: 'WebView控件', diff --git a/src/locales/lang/zh_TW.js b/src/locales/lang/zh_TW.js index 86230a38..e0784dd4 100644 --- a/src/locales/lang/zh_TW.js +++ b/src/locales/lang/zh_TW.js @@ -1070,7 +1070,8 @@ const stepDetail = { detailConfigure: '详细配置', delete: '删除', detect: '检测', - dragTo: '滑动拖拽至', + dragTo: '拖拽至', + swipeTo: '滑动至', display: '显示', downwards: '向下', exception: { @@ -1177,7 +1178,8 @@ const stepDetail = { click: '点击控件元素', sendKeys: '输入文本', sendKeysByActions: '输入文本(Actions)', - swipe2: '拖拽控件元素', + swipe2: '滑动控件元素', + drag2: '拖拽控件元素', scrollToEle: '滚动到控件元素', longPress: '长按控件元素', clear: '清空输入框', @@ -1192,7 +1194,8 @@ const stepDetail = { self: '坐标控件', tap: '点击坐标', longPressPoint: '长按坐标', - swipe: '滑动拖拽', + swipe: '直线滑动', + drag: '拖拽滑动', }, webView: { self: 'WebView控件', From d79b313f48bbc3ff1f966c2c2bcabd9dbd600da2 Mon Sep 17 00:00:00 2001 From: YeungHoiChiu <1005935991@qq.com> Date: Mon, 3 Jun 2024 20:32:04 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=AE=89?= =?UTF-8?q?=E5=8D=93=E6=B5=8B=E8=AF=95=E6=AD=A5=E9=AA=A4=E4=B9=8B---motion?= =?UTF-8?q?=20event=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=8D=95=E7=8B=AC=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=8C=89=E4=B8=8B=E3=80=81=E6=89=8B=E6=8C=87=E4=BB=8E?= =?UTF-8?q?=E5=B1=8F=E5=B9=95=E6=9F=90=E4=B8=AA=E5=9C=B0=E6=96=B9=E6=8A=AC?= =?UTF-8?q?=E8=B5=B7=E3=80=81=E6=BB=91=E5=8A=A8=EF=BC=88=E4=B8=80=E8=88=AC?= =?UTF-8?q?=E9=9C=80=E7=BB=93=E5=90=88down=E4=B8=80=E8=B5=B7=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=EF=BC=89=E4=B8=89=E4=B8=AA=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/StepShow.vue | 17 +++++++ src/components/StepUpdate.vue | 86 ++++++++++++++++++++++++++++++++++- src/locales/lang/en_US.js | 8 +++- src/locales/lang/ja_JP.js | 8 +++- src/locales/lang/zh_CN.js | 12 +++-- src/locales/lang/zh_TW.js | 10 +++- 6 files changed, 132 insertions(+), 9 deletions(-) diff --git a/src/components/StepShow.vue b/src/components/StepShow.vue index 76a78492..e5a94a25 100644 --- a/src/components/StepShow.vue +++ b/src/components/StepShow.vue @@ -555,6 +555,23 @@ const getNotes = (text, type) => { }} {{ step.elements[1]['eleName'] }} + + {{ step.elements[0]['eleName'] }} + {{ + $t('stepDetail.motionType.Exec') + }} + + {{ step.text.toUpperCase() }} + diff --git a/src/components/StepUpdate.vue b/src/components/StepUpdate.vue index 400d1d05..7d1f52dd 100644 --- a/src/components/StepUpdate.vue +++ b/src/components/StepUpdate.vue @@ -598,6 +598,10 @@ const androidOptions = ref([ value: 'drag2', label: $t('stepDetail.label.androidOptions.element.uiEle.drag2'), }, + { + value: 'motionEvent', + label: $t('stepDetail.label.androidOptions.element.uiEle.motion'), + }, { value: 'scrollToEle', label: $t( @@ -678,6 +682,12 @@ const androidOptions = ref([ 'stepDetail.label.androidOptions.element.coordinate.drag' ), }, + { + value: 'motionEventByPoint', + label: $t( + 'stepDetail.label.androidOptions.element.coordinate.motion' + ), + }, ], }, { @@ -2388,7 +2398,9 @@ onMounted(() => { style="margin-bottom: 10px" close-text="Get!" type="info" - :title="`${$t('stepDetail.msgTips.sysKey')}{{${$t('stepDetail.variableName')}}}`" + :title="`${$t('stepDetail.msgTips.sysKey')}{{${$t( + 'stepDetail.variableName' + )}}}`" /> { :step="step" />
- +
+ + + + + + + + +
+
+ + + + + + + + +
Date: Thu, 13 Jun 2024 22:31:18 +0800 Subject: [PATCH 3/7] Create devtoolsBuilder.yml 1 Signed-off-by: KamiYeung <1005935991@qq.com> --- .github/workflows/devtoolsBuilder.yml | 58 +++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/devtoolsBuilder.yml diff --git a/.github/workflows/devtoolsBuilder.yml b/.github/workflows/devtoolsBuilder.yml new file mode 100644 index 00000000..f7226957 --- /dev/null +++ b/.github/workflows/devtoolsBuilder.yml @@ -0,0 +1,58 @@ +name: build + +on: + workflow_dispatch: + schedule: + - cron: "0 0 * * 0" + +permissions: + contents: write + pull-requests: write + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install -y \ + python3 \ + git \ + curl \ + gn \ + npm + + - name: Install Depot Tools + uses: newkdev/setup-depot-tools@v1.0.1 + + - name: Fetch devtools-frontend + run: fetch --no-history devtools-frontend + + - name: Build devtools-frontend + run: | + cd devtools-frontend + gclient sync + gn gen out/Default + autoninja -C out/Default + + - name: Create commit + id: create_commit + run: | + # Copy built files + rsync -a ./devtools-frontend/out/Default/gen/front_end ./public/ + # Create commit info with latest devtools-frontend commit + current_date=$(date +"%d-%m-%Y") + latest_commit_full=$(git ls-remote https://chromium.googlesource.com/devtools/devtools-frontend.git HEAD | cut -f 1) + latest_commit_short=${latest_commit_full:0:7} + commit_title="Build $current_date" + commit_description="Latest devtools frontend commit: [${latest_commit_short}](https://chromium.googlesource.com/devtools/devtools-frontend.git/+/${latest_commit_full})" + branch_name="build/${current_date}" + # Create step outputs + echo "branch_name=${branch_name}" >> $GITHUB_OUTPUT + echo "commit_title=${commit_title}" >> $GITHUB_OUTPUT + echo "commit_description=${commit_description}" >> $GITHUB_OUTPUT From bbedb821e7b702b1925a67dd224ba936b8a8574d Mon Sep 17 00:00:00 2001 From: KamiYeung <1005935991@qq.com> Date: Thu, 13 Jun 2024 22:36:20 +0800 Subject: [PATCH 4/7] Revert "Create devtoolsBuilder.yml" --- .github/workflows/devtoolsBuilder.yml | 58 --------------------------- 1 file changed, 58 deletions(-) delete mode 100644 .github/workflows/devtoolsBuilder.yml diff --git a/.github/workflows/devtoolsBuilder.yml b/.github/workflows/devtoolsBuilder.yml deleted file mode 100644 index f7226957..00000000 --- a/.github/workflows/devtoolsBuilder.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: build - -on: - workflow_dispatch: - schedule: - - cron: "0 0 * * 0" - -permissions: - contents: write - pull-requests: write - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y \ - python3 \ - git \ - curl \ - gn \ - npm - - - name: Install Depot Tools - uses: newkdev/setup-depot-tools@v1.0.1 - - - name: Fetch devtools-frontend - run: fetch --no-history devtools-frontend - - - name: Build devtools-frontend - run: | - cd devtools-frontend - gclient sync - gn gen out/Default - autoninja -C out/Default - - - name: Create commit - id: create_commit - run: | - # Copy built files - rsync -a ./devtools-frontend/out/Default/gen/front_end ./public/ - # Create commit info with latest devtools-frontend commit - current_date=$(date +"%d-%m-%Y") - latest_commit_full=$(git ls-remote https://chromium.googlesource.com/devtools/devtools-frontend.git HEAD | cut -f 1) - latest_commit_short=${latest_commit_full:0:7} - commit_title="Build $current_date" - commit_description="Latest devtools frontend commit: [${latest_commit_short}](https://chromium.googlesource.com/devtools/devtools-frontend.git/+/${latest_commit_full})" - branch_name="build/${current_date}" - # Create step outputs - echo "branch_name=${branch_name}" >> $GITHUB_OUTPUT - echo "commit_title=${commit_title}" >> $GITHUB_OUTPUT - echo "commit_description=${commit_description}" >> $GITHUB_OUTPUT From e9800508d8573574d20bcb232324d3410c840cc8 Mon Sep 17 00:00:00 2001 From: YeungHoiChiu <1005935991@qq.com> Date: Thu, 20 Jun 2024 23:04:57 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=AF=B9=E5=8E=9F?= =?UTF-8?q?=E6=9C=89=E6=AD=A5=E9=AA=A4=E6=8F=8F=E8=BF=B0=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E4=BB=85=E6=96=B0=E5=A2=9E=20drag=E3=80=81mo?= =?UTF-8?q?tionEvent=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/StepShow.vue | 4 +- src/components/StepUpdate.vue | 104 +++++++--------------------------- src/http/axios.js | 2 +- src/locales/lang/en_US.js | 9 ++- src/locales/lang/ja_JP.js | 25 ++++---- src/locales/lang/zh_CN.js | 15 +++-- src/locales/lang/zh_TW.js | 17 +++--- 7 files changed, 52 insertions(+), 124 deletions(-) diff --git a/src/components/StepShow.vue b/src/components/StepShow.vue index e5a94a25..8c10ce25 100644 --- a/src/components/StepShow.vue +++ b/src/components/StepShow.vue @@ -332,7 +332,7 @@ const getNotes = (text, type) => { {{ step.elements[0]['eleName'] }} {{ - $t('stepDetail.swipeTo') + $t('stepDetail.dragTo') }} {{ step.elements[1]['eleName'] }} @@ -544,7 +544,7 @@ const getNotes = (text, type) => { {{ step.elements[0]['eleName'] }} {{ - $t('stepDetail.swipeTo') + $t('stepDetail.dragTo') }} {{ step.elements[1]['eleName'] }} diff --git a/src/components/StepUpdate.vue b/src/components/StepUpdate.vue index eacde647..f01765e2 100644 --- a/src/components/StepUpdate.vue +++ b/src/components/StepUpdate.vue @@ -1587,32 +1587,7 @@ onMounted(() => {
-
- - -
- -
+
{ style="margin-bottom: 10px" close-text="Get!" type="info" - :title="`${$t('stepDetail.msgTips.variable')}{{${$t( - 'stepDetail.variableName' - )}}}`" + :title="`${$t('stepDetail.msgTips.variable')}{{${$t('stepDetail.variableName')}}}`" /> { style="margin-bottom: 10px" close-text="Get!" type="info" - :title="`${$t('stepDetail.msgTips.variable')}{{${$t( - 'stepDetail.variableName' - )}}}`" + :title="`${$t('stepDetail.msgTips.variable')}{{${$t('stepDetail.variableName')}}}`" /> { style="margin-bottom: 10px" close-text="Get!" type="info" - :title="`${$t('stepDetail.msgTips.variable')}{{${$t( - 'stepDetail.variableName' - )}}}`" + :title="`${$t('stepDetail.msgTips.variable')}{{${$t('stepDetail.variableName')}}}`" /> { style="margin-bottom: 10px" close-text="Get!" type="info" - :title="`${$t('stepDetail.msgTips.variable')}{{${$t( - 'stepDetail.variableName' - )}}}`" + :title="`${$t('stepDetail.msgTips.variable')}{{${$t('stepDetail.variableName')}}}`" /> { {{ $t('stepDetail.msgTips.focus') }}
- {{ - `${$t('stepDetail.msgTips.variable')}{{${$t( - 'stepDetail.variableName' - )}}}` - }} + {{`${$t('stepDetail.msgTips.variable')}{{${$t('stepDetail.variableName')}}}`}}
@@ -2398,9 +2359,7 @@ onMounted(() => { style="margin-bottom: 10px" close-text="Get!" type="info" - :title="`${$t('stepDetail.msgTips.sysKey')}{{${$t( - 'stepDetail.variableName' - )}}}`" + :title="`${$t('stepDetail.msgTips.sysKey')}{{${$t('stepDetail.variableName')}}}`" /> {
-
- - -
- -
+
+ +
{ style="margin-bottom: 10px" close-text="Get!" type="info" - :title="`${$t('stepDetail.msgTips.variable')}{{${$t( - 'stepDetail.variableName' - )}}}`" + :title="`${$t('stepDetail.msgTips.variable')}{{${$t('stepDetail.variableName')}}}`" /> { style="margin-bottom: 10px" close-text="Get!" type="info" - :title="`${$t('stepDetail.use')} {{${$t( - 'stepDetail.variableName' - )}}} ${$t('stepDetail.msgTips.verify')}`" + :title="`${$t('stepDetail.use')} {{${$t('stepDetail.variableName')}}} ${$t('stepDetail.msgTips.verify')}`" /> {
- {{ $t('stepDetail.new') }} - + {{ + $t('stepDetail.new') + }}
@@ -3668,8 +3602,8 @@ onMounted(() => {
- {{ $t('stepDetail.submit') }} - + {{ + $t('stepDetail.submit') + }}
diff --git a/src/http/axios.js b/src/http/axios.js index 59038163..7a832b39 100644 --- a/src/http/axios.js +++ b/src/http/axios.js @@ -23,7 +23,7 @@ import { router } from '../router/index.js'; let baseURL = ''; if (process.env.NODE_ENV === 'development') { - baseURL = 'http://localhost:3000/server/api'; + baseURL = 'http://172.16.2.144:3000/server/api'; } if (process.env.NODE_ENV === 'production') { baseURL = 'http://SONIC_SERVER_HOST:SONIC_SERVER_PORT/server/api'; diff --git a/src/locales/lang/en_US.js b/src/locales/lang/en_US.js index 25bb2656..2536d259 100644 --- a/src/locales/lang/en_US.js +++ b/src/locales/lang/en_US.js @@ -1263,10 +1263,10 @@ const stepDetail = { click: 'Click the Control Element', sendKeys: 'Enter Text', sendKeysByActions: 'Enter Text(Actions)', - swipe2: 'Swipe Control Element', - drag2: 'Drag Control Element', + swipe2: 'Drag Control Element', + drag2: 'Drag And Drop Control Element', motion: 'Motion Event', - scrollToEle: 'Scroll to Control Element', + scrollToEle: 'Drag to Control Element', longPress: 'Long Press Control Element', clear: 'Clear InputBox', obtainElementAttr: 'Get Element Attribute', @@ -1352,7 +1352,7 @@ const stepDetail = { self: 'Runtime Settings', stepHold: 'Step Interval setting', switchTouchMode: 'Touch Mode Setting', - }, + }, }, iOSOptions: { system: { @@ -1602,7 +1602,6 @@ const stepDetail = { touchMode: 'Set Touch Mode', }, swipe: 'Swipe', - swipeTo: 'Swipe To', switch: { handler: 'Switch Handler', webview: 'Switch Webview', diff --git a/src/locales/lang/ja_JP.js b/src/locales/lang/ja_JP.js index 5d963359..d2fcd282 100644 --- a/src/locales/lang/ja_JP.js +++ b/src/locales/lang/ja_JP.js @@ -349,6 +349,7 @@ const common = { copy: '复制', inuse: '使用済み', inidle: 'アイドル状態', + }; // 路由 const routes = { @@ -466,7 +467,7 @@ const jobsTS = { }, addCron: '添加定时任务', whatCron: '什么是Cron表达式？', - cronNoNext: 'N/A', + cronNoNext: "N/A", cronInfo: { one: '* 第一位，表示秒，取值 0-59', two: '* 第二位，表示分，取值 0-59', @@ -1063,18 +1064,16 @@ const stepDetail = { swipeEvent: '随机两个坐标滑动', systemEvent: 'Home、返回键等等', navEvent: '安卓：随机开关WIFI；iOS：后台运行当前应用', - isOpenPackageListener: - '检测当前应用是否为被测应用，为否时将重新拉起被测应用', + isOpenPackageListener: '检测当前应用是否为被测应用，为否时将重新拉起被测应用', isOpenH5Listener: '检测是否长时间停留在H5页面 (Android Only)', isOpenActivityListener: '检测当前Activity是否在黑名单内 (Android Only)', - isOpenNetworkListener: - '检测设备是否处于飞行模式和WIFI网络 (Android Only)', + isOpenNetworkListener: '检测设备是否处于飞行模式和WIFI网络 (Android Only)', }, }, detailConfigure: '详细配置', delete: '删除', detect: '检测', - dragTo: '拖拽至', + dragTo: '滑动拖拽至', display: '显示', downwards: '向下', exception: { @@ -1181,8 +1180,8 @@ const stepDetail = { click: '点击控件元素', sendKeys: '输入文本', sendKeysByActions: '输入文本(Actions)', - swipe2: '滑动控件元素', - drag2: '拖拽控件元素', + swipe2: '拖拽控件元素', + drag2: '(长按)控件元素拖拽移动', motion: '触控动作事件(MotionEvent)', scrollToEle: '滚动到控件元素', longPress: '长按控件元素', @@ -1198,8 +1197,8 @@ const stepDetail = { self: '坐标控件', tap: '点击坐标', longPressPoint: '长按坐标', - swipe: '直线滑动', - drag: '拖拽滑动', + swipe: '滑动拖拽', + drag: '(长按)坐标拖拽滑动', motion: '触控动作事件(MotionEvent)', }, webView: { @@ -1479,8 +1478,7 @@ const stepDetail = { port: '端口', randomEventsTest: '随机事件测试', refreshPage: '刷新页面', - reminderDisplay: - '三个指令前端显示上保留，用于兼容老版本升级上来之后，依然能正常的显示和运行', + reminderDisplay: '三个指令前端显示上保留，用于兼容老版本升级上来之后，依然能正常的显示和运行', reminderVersion: '大于2.5.0版本，增强的文本断言能力', retries: '重试次数', retriesInterval: '重试间隔', @@ -1508,9 +1506,8 @@ const stepDetail = { textToClipboard: '设置文本至剪切板', stepsInterval: '步骤间隔设置', touchMode: '触控模式设置', - }, +}, swipe: '滑动', - swipeTo: '滑动至', switch: { handler: '切换句柄', webview: '切换webview', diff --git a/src/locales/lang/zh_CN.js b/src/locales/lang/zh_CN.js index 315479b9..5a8c962e 100644 --- a/src/locales/lang/zh_CN.js +++ b/src/locales/lang/zh_CN.js @@ -1133,7 +1133,7 @@ const stepDetail = { detailConfigure: '详细配置', delete: '删除', detect: '检测', - dragTo: '拖拽至', + dragTo: '滑动拖拽至', display: '显示', downwards: '向下', exception: { @@ -1240,8 +1240,8 @@ const stepDetail = { click: '点击控件元素', sendKeys: '输入文本', sendKeysByActions: '输入文本(Actions)', - swipe2: '滑动控件元素', - drag2: '拖拽控件元素', + swipe2: '拖拽控件元素', + drag2: '(长按)控件元素拖拽移动', motion: '触控动作事件(MotionEvent)', scrollToEle: '滚动到控件元素', longPress: '长按控件元素', @@ -1257,8 +1257,8 @@ const stepDetail = { self: '坐标控件', tap: '点击坐标', longPressPoint: '长按坐标', - swipe: '直线滑动', - drag: '拖拽滑动', + swipe: '滑动拖拽', + drag: '(长按)坐标拖拽滑动', motion: '触控动作事件(MotionEvent)', }, webView: { @@ -1504,7 +1504,7 @@ const stepDetail = { 'TIPS: 传递Android应用的App包名，该步骤可实现自动授权目标App所需要的所有权限', focus: 'TIPS: 在文本框需要先获取焦点，才能进行输入时，使用此方式。', sysKey: - 'TIPS: 本功能需要先唤醒系统键盘。需要临时变量或全局变量时，可以添加', + 'TIPS: 本功能需要先唤醒系统键盘。需要临时变量或全局变量时，可以添加', table: 'TIPS: 长列表的场景下，可通过该方法连续滚动，尝试让目标元素可见', text: 'TIPS: 可以将获取的文本放入临时变量中', controlAttribute: 'TIPS: 可以将获取的控件属性放入临时变量中', @@ -1566,9 +1566,8 @@ const stepDetail = { textToClipboard: '设置文本至剪切板', stepsInterval: '步骤间隔设置', touchMode: '触控模式设置', - }, +}, swipe: '滑动', - swipeTo: '滑动至', switch: { handler: '切换句柄', webview: '切换webview', diff --git a/src/locales/lang/zh_TW.js b/src/locales/lang/zh_TW.js index 69647b46..c0d729d2 100644 --- a/src/locales/lang/zh_TW.js +++ b/src/locales/lang/zh_TW.js @@ -1070,7 +1070,7 @@ const stepDetail = { detailConfigure: '详细配置', delete: '删除', detect: '检测', - dragTo: '拖拽至', + dragTo: '滑动拖拽至', display: '显示', downwards: '向下', exception: { @@ -1177,8 +1177,8 @@ const stepDetail = { click: '点击控件元素', sendKeys: '输入文本', sendKeysByActions: '输入文本(Actions)', - swipe2: '滑动控件元素', - drag2: '拖拽控件元素', + swipe2: '拖拽控件元素', + drag2: '(长按)控件元素拖拽移动', motion: '触控动作事件(MotionEvent)', scrollToEle: '滚动到控件元素', longPress: '长按控件元素', @@ -1194,8 +1194,8 @@ const stepDetail = { self: '坐标控件', tap: '点击坐标', longPressPoint: '长按坐标', - swipe: '直线滑动', - drag: '拖拽滑动', + swipe: '滑动拖拽', + drag: '(长按)坐标拖拽滑动', motion: '触控动作事件(MotionEvent)', }, webView: { @@ -1266,7 +1266,7 @@ const stepDetail = { self: '运行设置', stepHold: '步骤间隔设置', switchTouchMode: '触控模式设置', - }, + }, }, iOSOptions: { system: { @@ -1441,7 +1441,7 @@ const stepDetail = { 'TIPS: 传递Android应用的App包名，该步骤可实现自动授权目标App所需要的所有权限', focus: 'TIPS: 在文本框需要先获取焦点，才能进行输入时，使用此方式。', sysKey: - 'TIPS: 本功能需要先唤醒系统键盘。需要临时变量或全局变量时，可以添加', + 'TIPS: 本功能需要先唤醒系统键盘。需要临时变量或全局变量时，可以添加', table: 'TIPS: 长列表的场景下，可通过该方法连续滚动，尝试让目标元素可见', text: 'TIPS: 可以将获取的文本放入临时变量中', controlAttribute: 'TIPS: 可以将获取的控件属性放入临时变量中', @@ -1503,9 +1503,8 @@ const stepDetail = { textToClipboard: '设置文本至剪切板', stepsInterval: '步骤间隔设置', touchMode: '触控模式设置', - }, +}, swipe: '滑动', - swipeTo: '滑动至', switch: { handler: '切换句柄', webview: '切换webview', From 27b4a94bed763c7315d06f39f37458ec86148663 Mon Sep 17 00:00:00 2001 From: YeungHoiChiu <1005935991@qq.com> Date: Thu, 20 Jun 2024 23:06:30 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=AF=B9=E5=8E=9F?= =?UTF-8?q?=E6=9C=89=E6=AD=A5=E9=AA=A4=E6=8F=8F=E8=BF=B0=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E4=BB=85=E6=96=B0=E5=A2=9E=20drag=E3=80=81mo?= =?UTF-8?q?tionEvent=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/http/axios.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/http/axios.js b/src/http/axios.js index 7a832b39..59038163 100644 --- a/src/http/axios.js +++ b/src/http/axios.js @@ -23,7 +23,7 @@ import { router } from '../router/index.js'; let baseURL = ''; if (process.env.NODE_ENV === 'development') { - baseURL = 'http://172.16.2.144:3000/server/api'; + baseURL = 'http://localhost:3000/server/api'; } if (process.env.NODE_ENV === 'production') { baseURL = 'http://SONIC_SERVER_HOST:SONIC_SERVER_PORT/server/api'; From 05c30bc379abec81a51992ae1e86184ac735f4bb Mon Sep 17 00:00:00 2001 From: YeungHoiChiu <1005935991@qq.com> Date: Fri, 21 Jun 2024 15:46:01 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=92=8Cswipe?= =?UTF-8?q?=E3=80=81swipe2=E5=8C=BA=E5=88=AB=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/StepShow.vue | 14 ++++++++------ src/locales/lang/en_US.js | 3 +++ src/locales/lang/ja_JP.js | 3 +++ src/locales/lang/zh_CN.js | 3 +++ src/locales/lang/zh_TW.js | 3 +++ 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/components/StepShow.vue b/src/components/StepShow.vue index 8c10ce25..4b88462d 100644 --- a/src/components/StepShow.vue +++ b/src/components/StepShow.vue @@ -549,11 +549,17 @@ const getNotes = (text, type) => { {{ step.elements[1]['eleName'] }} + + {{ $t('stepDetail.dragUp') }} {{ step.elements[0]['eleName'] }} {{ - $t('stepDetail.dragTo') + $t('stepDetail.dragMove') }} {{ step.elements[1]['eleName'] }} + + {{ $t('stepDetail.dragDown') }} {{ $t('stepDetail.motionType.Exec') }} - + {{ step.text.toUpperCase() }} diff --git a/src/locales/lang/en_US.js b/src/locales/lang/en_US.js index 2536d259..cc560fb4 100644 --- a/src/locales/lang/en_US.js +++ b/src/locales/lang/en_US.js @@ -1156,6 +1156,9 @@ const stepDetail = { delete: 'Delete ', detect: 'Detect ', dragTo: 'Drag To ', + dragUp: 'Analog long press', + dragMove: 'Then drag to', + dragDown: 'And drop', display: 'Display ', downwards: 'Downwards ', exception: { diff --git a/src/locales/lang/ja_JP.js b/src/locales/lang/ja_JP.js index d2fcd282..fb30806b 100644 --- a/src/locales/lang/ja_JP.js +++ b/src/locales/lang/ja_JP.js @@ -1074,6 +1074,9 @@ const stepDetail = { delete: '删除', detect: '检测', dragTo: '滑动拖拽至', + dragUp: '模拟长按', + dragMove: '后拖拽移动到', + dragDown: '松手', display: '显示', downwards: '向下', exception: { diff --git a/src/locales/lang/zh_CN.js b/src/locales/lang/zh_CN.js index 5a8c962e..05a1dcd6 100644 --- a/src/locales/lang/zh_CN.js +++ b/src/locales/lang/zh_CN.js @@ -1134,6 +1134,9 @@ const stepDetail = { delete: '删除', detect: '检测', dragTo: '滑动拖拽至', + dragUp: '模拟长按', + dragMove: '后拖拽移动到', + dragDown: '松手', display: '显示', downwards: '向下', exception: { diff --git a/src/locales/lang/zh_TW.js b/src/locales/lang/zh_TW.js index c0d729d2..78f4e228 100644 --- a/src/locales/lang/zh_TW.js +++ b/src/locales/lang/zh_TW.js @@ -1071,6 +1071,9 @@ const stepDetail = { delete: '删除', detect: '检测', dragTo: '滑动拖拽至', + dragUp: '模拟长按', + dragMove: '后拖拽移动到', + dragDown: '松手', display: '显示', downwards: '向下', exception: {