fix(UI自动化): 修复UI列表表头字段内容
--bug=1016858 --user=刘瑶 【UI测试】指令列表-表头字段设置字段与需求不符 https://www.tapd.cn/55049933/s/1245293 --bug=1016880 --user=刘瑶 【UI测试】场景/指令查看引用-所属项目-重置报sql异常 https://www.tapd.cn/55049933/s/1245365
This commit is contained in:
parent
e24c97d5c9
commit
58b4c5196a
|
@ -249,13 +249,13 @@
|
||||||
WHERE usf.reference_id = #{request.scenarioId}
|
WHERE usf.reference_id = #{request.scenarioId}
|
||||||
AND usf.reference_type = "REF"
|
AND usf.reference_type = "REF"
|
||||||
AND us.scenario_type = #{request.scenarioType}
|
AND us.scenario_type = #{request.scenarioType}
|
||||||
<if test="request.workspace != null">
|
<if test="request.workspace != null and request.workspace.size() > 0">
|
||||||
AND w.id in
|
AND w.id in
|
||||||
<foreach close=")" collection="request.workspace" item="listItem" open="(" separator=",">
|
<foreach close=")" collection="request.workspace" item="listItem" open="(" separator=",">
|
||||||
#{listItem}
|
#{listItem}
|
||||||
</foreach>
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
<if test="request.project != null">
|
<if test="request.project != null and request.project.size() > 0">
|
||||||
AND p.id in
|
AND p.id in
|
||||||
<foreach close=")" collection="request.project" item="listItem" open="(" separator=",">
|
<foreach close=")" collection="request.project" item="listItem" open="(" separator=",">
|
||||||
#{listItem}
|
#{listItem}
|
||||||
|
@ -285,13 +285,13 @@
|
||||||
|
|
||||||
WHERE
|
WHERE
|
||||||
us.ui_scenario_id = #{request.scenarioId}
|
us.ui_scenario_id = #{request.scenarioId}
|
||||||
<if test="request.workspace != null">
|
<if test="request.workspace != null and request.workspace.size() > 0">
|
||||||
AND w.id in
|
AND w.id in
|
||||||
<foreach close=")" collection="request.workspace" item="listItem" open="(" separator=",">
|
<foreach close=")" collection="request.workspace" item="listItem" open="(" separator=",">
|
||||||
#{listItem}
|
#{listItem}
|
||||||
</foreach>
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
<if test="request.project != null">
|
<if test="request.project != null and request.project.size() > 0">
|
||||||
AND p.id in
|
AND p.id in
|
||||||
<foreach close=")" collection="request.project" item="listItem" open="(" separator=",">
|
<foreach close=")" collection="request.project" item="listItem" open="(" separator=",">
|
||||||
#{listItem}
|
#{listItem}
|
||||||
|
|
|
@ -239,7 +239,9 @@ task_notification=Result notification
|
||||||
message_task_already_exists=Task recipient already exists
|
message_task_already_exists=Task recipient already exists
|
||||||
#automation
|
#automation
|
||||||
automation_name_already_exists=the scenario already exists in the module of the same project
|
automation_name_already_exists=the scenario already exists in the module of the same project
|
||||||
|
automation_command_name_already_exists=the command already exists in the module of the same project
|
||||||
automation_name=Scenario
|
automation_name=Scenario
|
||||||
|
command_name=Command
|
||||||
automation_exec_info=There are no test steps to execute
|
automation_exec_info=There are no test steps to execute
|
||||||
delete_check_reference_by=be referenced by Scenario
|
delete_check_reference_by=be referenced by Scenario
|
||||||
not_execute=Not execute
|
not_execute=Not execute
|
||||||
|
|
|
@ -239,7 +239,9 @@ task_notification=任务通知
|
||||||
message_task_already_exists=任务接收人已经存在
|
message_task_already_exists=任务接收人已经存在
|
||||||
#automation
|
#automation
|
||||||
automation_name_already_exists=同一个项目的同一模块下,场景名称不能重复
|
automation_name_already_exists=同一个项目的同一模块下,场景名称不能重复
|
||||||
|
automation_command_name_already_exists=同一个项目的同一模块下,指令名称不能重复
|
||||||
automation_name=场景
|
automation_name=场景
|
||||||
|
command_name=指令
|
||||||
automation_exec_info=没有测试步骤,无法执行
|
automation_exec_info=没有测试步骤,无法执行
|
||||||
delete_check_reference_by=被场景引用
|
delete_check_reference_by=被场景引用
|
||||||
not_execute=未执行
|
not_execute=未执行
|
||||||
|
|
|
@ -238,7 +238,9 @@ task_notification=任務通知
|
||||||
message_task_already_exists=任務接收人已經存在
|
message_task_already_exists=任務接收人已經存在
|
||||||
#automation
|
#automation
|
||||||
automation_name_already_exists=同一個項目同一模塊下,場景名稱不能重復
|
automation_name_already_exists=同一個項目同一模塊下,場景名稱不能重復
|
||||||
|
automation_command_name_already_exists=同一個項目同一模塊下,指令名稱不能重復
|
||||||
automation_name=場景
|
automation_name=場景
|
||||||
|
command_name=指令
|
||||||
automation_exec_info=沒有測試步驟,無法執行
|
automation_exec_info=沒有測試步驟,無法執行
|
||||||
delete_check_reference_by=被場景引用
|
delete_check_reference_by=被場景引用
|
||||||
not_execute=未執行
|
not_execute=未執行
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 80cf85c741f08c6e448ed051dea30aa193e01988
|
Subproject commit a93dfd4ffcde2e8344d38bd218b63c9a76e989d5
|
|
@ -97,6 +97,17 @@ export let CUSTOM_TABLE_HEADER = {
|
||||||
{id: 'passRate', key: 'b', label: 'api_test.automation.passing_rate'},
|
{id: 'passRate', key: 'b', label: 'api_test.automation.passing_rate'},
|
||||||
{id: 'createTime', key: 'c', label: 'commons.create_time'},
|
{id: 'createTime', key: 'c', label: 'commons.create_time'},
|
||||||
],
|
],
|
||||||
|
//自定义指令
|
||||||
|
UI_CUSTOM_COMMAND: [
|
||||||
|
{id: 'num', key: '1', label: "ID"},
|
||||||
|
{id: 'name', key: '2', label: 'ui.command_name_label'},
|
||||||
|
{id: 'tags', key: '5', label: 'commons.tag'},
|
||||||
|
{id: 'creatorName', key: 'd', label: 'api_test.automation.creator'},
|
||||||
|
{id: 'principalName', key: '6', label: 'api_test.definition.api_principal'},
|
||||||
|
{id: 'updateTime', key: '7', label: 'api_test.definition.api_last_time'},
|
||||||
|
{id: 'lastResult', key: 'a', label: 'ui.debug_result_label'},
|
||||||
|
{id: 'createTime', key: 'c', label: 'commons.create_time'},
|
||||||
|
],
|
||||||
//用例评审
|
//用例评审
|
||||||
TEST_CASE_REVIEW: [
|
TEST_CASE_REVIEW: [
|
||||||
{id: 'name', key: '1', label: 'test_track.review.review_name'},
|
{id: 'name', key: '1', label: 'test_track.review.review_name'},
|
||||||
|
|
|
@ -2976,6 +2976,7 @@ export default {
|
||||||
test_plan_ref_label: "Test plan reference",
|
test_plan_ref_label: "Test plan reference",
|
||||||
delete_scenario_lable: "Delete scenario",
|
delete_scenario_lable: "Delete scenario",
|
||||||
delete_command_lable: "Delete command",
|
delete_command_lable: "Delete command",
|
||||||
|
command_name_label: "Command name",
|
||||||
},
|
},
|
||||||
project_application: {
|
project_application: {
|
||||||
workstation: {
|
workstation: {
|
||||||
|
|
|
@ -2986,6 +2986,7 @@ export default {
|
||||||
test_plan_ref_label: "测试计划引用",
|
test_plan_ref_label: "测试计划引用",
|
||||||
delete_scenario_lable: "删除场景",
|
delete_scenario_lable: "删除场景",
|
||||||
delete_command_lable: "删除指令",
|
delete_command_lable: "删除指令",
|
||||||
|
command_name_label: "指令名称",
|
||||||
},
|
},
|
||||||
project_application: {
|
project_application: {
|
||||||
workstation: {
|
workstation: {
|
||||||
|
|
|
@ -2965,6 +2965,7 @@ export default {
|
||||||
test_plan_ref_label: "測試計劃引用",
|
test_plan_ref_label: "測試計劃引用",
|
||||||
delete_scenario_lable: "刪除場景",
|
delete_scenario_lable: "刪除場景",
|
||||||
delete_command_lable: "刪除指令",
|
delete_command_lable: "刪除指令",
|
||||||
|
command_name_label: "指令名稱",
|
||||||
},
|
},
|
||||||
project_application: {
|
project_application: {
|
||||||
workstation: {
|
workstation: {
|
||||||
|
|
Loading…
Reference in New Issue