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',