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

fix (场景步骤): 场景步骤 启用/禁用 图标修改。

This commit is contained in:
fit2-zhao 2021-06-21 11:40:58 +08:00 committed by fit2-zhao
parent caeb561b6f
commit 4f674176d0
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
View File

@ -166,11 +166,11 @@
<el-tooltip :content="$t('api_test.automation.close_expansion')" placement="top" effect="light">
<i class="el-icon-remove-outline ms-open-btn" size="mini" v-prevent-re-click @click="closeExpansion"/>
</el-tooltip>
<el-tooltip :content="$t('api_test.scenario.enable')" placement="top" effect="light" v-if="!stepEnable">
<font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-on']" v-prevent-re-click @click="enableAll"/>
<el-tooltip :content="$t('api_test.scenario.disable')" placement="top" effect="light" v-if="!stepEnable">
<font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-off']" v-prevent-re-click @click="enableAll"/>
</el-tooltip>
<el-tooltip :content="$t('api_test.scenario.disable')" placement="top" effect="light" v-else>
<font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-off']" v-prevent-re-click @click="disableAll"/>
<el-tooltip :content="$t('api_test.scenario.enable')" placement="top" effect="light" v-else>
<font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-on']" v-prevent-re-click @click="disableAll"/>
</el-tooltip>
<el-tree node-key="resourceId" :props="props" :data="scenarioDefinition" class="ms-tree"
@ -256,7 +256,7 @@
</template>
<maximize-scenario :scenario-definition="scenarioDefinition" :envMap="projectEnvMap" :moduleOptions="moduleOptions"
:currentScenario="currentScenario" :type="type" ref="maximizeScenario" @openScenario="openScenario"/>
:currentScenario="currentScenario" :type="type" :stepReEnable="stepEnable" ref="maximizeScenario" @openScenario="openScenario"/>
</ms-drawer>
<ms-change-history ref="changeHistory"/>
@ -389,7 +389,7 @@ export default {
drawer: false,
isFullUrl: true,
expandedStatus: false,
stepEnable: false,
stepEnable: true,
envResult: {
loading: false
}

14
frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
View File

@ -11,11 +11,11 @@
<el-tooltip :content="$t('api_test.automation.close_expansion')" placement="top" effect="light">
<i class="el-icon-remove-outline ms-open-btn" size="mini" @click="closeExpansion"/>
</el-tooltip>
<el-tooltip :content="$t('api_test.scenario.enable')" placement="top" effect="light" v-if="!stepEnable">
<font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-on']" @click="enableAll"/>
<el-tooltip :content="$t('api_test.scenario.disable')" placement="top" effect="light" v-if="!stepEnable">
<font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-off']" @click="enableAll"/>
</el-tooltip>
<el-tooltip :content="$t('api_test.scenario.disable')" placement="top" effect="light" v-else>
<font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-off']" @click="disableAll"/>
<el-tooltip :content="$t('api_test.scenario.enable')" placement="top" effect="light" v-else>
<font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-on']" @click="disableAll"/>
</el-tooltip>
<el-tree node-key="resourceId"
:props="props"
@ -175,6 +175,7 @@ export default {
moduleOptions: Array,
currentScenario: {},
type: String,
stepReEnable: Boolean,
scenarioDefinition: Array,
envMap: Map,
},
@ -240,7 +241,7 @@ export default {
projectList: [],
debugResult: new Map,
expandedStatus: false,
stepEnable: false,
stepEnable: true,
}
},
created() {
@ -249,6 +250,7 @@ export default {
}
this.operatingElements = ELEMENTS.get("ALL");
this.projectEnvMap = this.envMap;
this.stepEnable = this.stepReEnable;
},
watch: {
envMap() {
@ -969,7 +971,7 @@ export default {
}
}
});
}else{
} else {
this.expandedNode = [];
this.expandedStatus = true;
this.shrinkTreeNode();