test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(UI自动化): 去除场景导入拖拽图标、去掉运行环境及版本

This commit is contained in:
nathan.liu 2022-04-23 18:02:02 +08:00 committed by zhangdahai112
parent d069fb4482
commit 75130add3e
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit bdfba7d9f60a4a0fc6b31441c6bc6dbbfbf1b7ac Subproject commit b9bbc67a4e477bb0f6a169c27f8e9ea8060c1e1d

8
frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
View File

@ -32,7 +32,7 @@
:title="$t('commons.reference_settings')" :title="$t('commons.reference_settings')"
:visible.sync="dialogVisible" width="400px"> :visible.sync="dialogVisible" width="400px">
<ul> <ul>
<el-tooltip :content="$t('commons.enable_scene_info')" placement="top">--> <el-tooltip :content="$t('commons.enable_scene_info')" placement="top" v-if = 'showEnableScence'>
<el-checkbox v-model="data.environmentEnable" @change="checkEnv" :disabled="data.disabled"> <el-checkbox v-model="data.environmentEnable" @change="checkEnv" :disabled="data.disabled">
{{ $t('commons.enable_scene') }} {{ $t('commons.enable_scene') }}
</el-checkbox> </el-checkbox>
@ -62,6 +62,12 @@ export default {
return false; return false;
} }
}, },
showEnableScence: {
type: Boolean,
default() {
return true;
}
},
data: Object, data: Object,
environmentType: String, environmentType: String,
environmentGroupId: String, environmentGroupId: String,

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 74a23130a1a04e3cd1db0fd4f770f083e5609bc1 Subproject commit 1b855b6ac11b593f252b6dd013735372b38d992c

4
frontend/src/common/js/default-table-header.js
View File

@ -89,10 +89,10 @@ export let CUSTOM_TABLE_HEADER = {
{id: 'level', key: '3', label: 'api_test.automation.case_level'}, {id: 'level', key: '3', label: 'api_test.automation.case_level'},
{id: 'status', key: '4', label: 'test_track.plan.plan_status'}, {id: 'status', key: '4', label: 'test_track.plan.plan_status'},
{id: 'tags', key: '5', label: 'commons.tag'}, {id: 'tags', key: '5', label: 'commons.tag'},
{id: 'versionId', key: 'f', label: 'project.version.name', xpack: true}, // {id: 'versionId', key: 'f', label: 'project.version.name', xpack: true},
{id: 'creatorName', key: 'd', label: 'api_test.automation.creator'}, {id: 'creatorName', key: 'd', label: 'api_test.automation.creator'},
{id: 'principalName', key: '6', label: 'api_test.definition.api_principal'}, {id: 'principalName', key: '6', label: 'api_test.definition.api_principal'},
{id: 'environmentMap', key: 'e', label: 'commons.environment'}, // {id: 'environmentMap', key: 'e', label: 'commons.environment'},
{id: 'updateTime', key: '7', label: 'api_test.definition.api_last_time'}, {id: 'updateTime', key: '7', label: 'api_test.definition.api_last_time'},
{id: 'stepTotal', key: '8', label: 'api_test.automation.step'}, {id: 'stepTotal', key: '8', label: 'api_test.automation.step'},
{id: 'lastResult', key: 'a', label: 'api_test.automation.last_result'}, {id: 'lastResult', key: 'a', label: 'api_test.automation.last_result'},