Merge remote-tracking branch 'origin/master'

This commit is contained in:
Captain.B 2021-03-12 10:48:43 +08:00
commit 17fff4a326
5 changed files with 9 additions and 6 deletions

View File

@ -299,8 +299,8 @@
select test_plan_test_case.*, test_case.* select test_plan_test_case.*, test_case.*
from test_plan_test_case from test_plan_test_case
inner join test_case on test_plan_test_case.case_id = test_case.id inner join test_case on test_plan_test_case.case_id = test_case.id
where status != 'Prepare' where test_plan_test_case.status != 'Prepare'
and status != 'Underway' and test_plan_test_case.status != 'Underway'
and test_plan_test_case.Executor = #{request.executor} and test_plan_test_case.Executor = #{request.executor}
and test_plan_test_case.plan_id in and test_plan_test_case.plan_id in
<foreach collection="request.planIds" item="planId" separator="," open="(" close=")"> <foreach collection="request.planIds" item="planId" separator="," open="(" close=")">

View File

@ -42,7 +42,7 @@ export default {
url: [ url: [
{ {
required: true, required: true,
message: this.$t('system_par'), message: this.$t('system_config.base.url_is_null'),
trigger: ['change', 'blur'] trigger: ['change', 'blur']
}, },
], ],

View File

@ -240,7 +240,8 @@ export default {
base_config: 'Base Config', base_config: 'Base Config',
base: { base: {
url: 'Website URL', url: 'Website URL',
url_tip: 'examplehttp://localhost:8081' url_tip: 'examplehttp://localhost:8081',
url_is_null: 'The current site URL cannot be empty'
} }
}, },
workspace: { workspace: {

View File

@ -241,7 +241,8 @@ export default {
base_config: '基本配置', base_config: '基本配置',
base: { base: {
url: '当前站点URL', url: '当前站点URL',
url_tip: '例如http://localhost:8081' url_tip: '例如http://localhost:8081',
url_is_null: '当前站点URL不能为空'
} }
}, },
workspace: { workspace: {

View File

@ -241,7 +241,8 @@ export default {
base_config: '基本配置', base_config: '基本配置',
base: { base: {
url: '當前站點URL', url: '當前站點URL',
url_tip: '例如http://localhost:8081' url_tip: '例如http://localhost:8081',
url_is_null: '當前站點URL不能為空'
} }
}, },
workspace: { workspace: {