Merge branch 'master' of https://github.com/metersphere/metersphere
This commit is contained in:
commit
e23c4d84a8
|
@ -73,6 +73,10 @@ public class MsScenario extends MsTestElement {
|
|||
|
||||
@Override
|
||||
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
|
||||
// 非导出操作,且不是启用状态则跳过执行
|
||||
if (!config.isOperating() && !this.isEnable()) {
|
||||
return;
|
||||
}
|
||||
if (this.getReferenced() != null && this.getReferenced().equals("Deleted")) {
|
||||
return;
|
||||
} else if (this.getReferenced() != null && this.getReferenced().equals("REF")) {
|
||||
|
@ -198,6 +202,8 @@ public class MsScenario extends MsTestElement {
|
|||
config.getConfig().get(this.getProjectId()).getCommonConfig().getVariables().stream().filter(KeyValue::isValid).filter(KeyValue::isEnable).forEach(keyValue ->
|
||||
arguments.addArgument(keyValue.getName(), keyValue.getValue(), "=")
|
||||
);
|
||||
// 清空变量,防止重复添加
|
||||
config.getConfig().get(this.getProjectId()).getCommonConfig().getVariables().clear();
|
||||
}
|
||||
if (arguments.getArguments() != null && arguments.getArguments().size() > 0) {
|
||||
return arguments;
|
||||
|
|
|
@ -27,6 +27,10 @@ public class MsAssertions extends MsTestElement {
|
|||
|
||||
@Override
|
||||
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
|
||||
// 非导出操作,且不是启用状态则跳过执行
|
||||
if (!config.isOperating() && !this.isEnable()) {
|
||||
return;
|
||||
}
|
||||
addAssertions(tree);
|
||||
}
|
||||
|
||||
|
|
|
@ -26,6 +26,10 @@ public class MsIfController extends MsTestElement {
|
|||
|
||||
@Override
|
||||
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
|
||||
// 非导出操作,且不是启用状态则跳过执行
|
||||
if (!config.isOperating() && !this.isEnable()) {
|
||||
return;
|
||||
}
|
||||
final HashTree groupTree = tree.add(ifController());
|
||||
if (CollectionUtils.isNotEmpty(hashTree)) {
|
||||
hashTree.forEach(el -> {
|
||||
|
|
|
@ -44,6 +44,10 @@ public class MsLoopController extends MsTestElement {
|
|||
|
||||
@Override
|
||||
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
|
||||
// 非导出操作,且不是启用状态则跳过执行
|
||||
if (!config.isOperating() && !this.isEnable()) {
|
||||
return;
|
||||
}
|
||||
final HashTree groupTree = controller(tree);
|
||||
if (CollectionUtils.isNotEmpty(config.getVariables())) {
|
||||
this.addCsvDataSet(groupTree, config.getVariables());
|
||||
|
|
|
@ -26,7 +26,8 @@ public class MsDNSCacheManager extends MsTestElement {
|
|||
|
||||
@Override
|
||||
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
|
||||
if (!this.isEnable()) {
|
||||
// 非导出操作,且不是启用状态则跳过执行
|
||||
if (!config.isOperating() && !this.isEnable()) {
|
||||
return;
|
||||
}
|
||||
for (MsTestElement el : hashTree) {
|
||||
|
|
|
@ -30,6 +30,10 @@ public class MsExtract extends MsTestElement {
|
|||
|
||||
@Override
|
||||
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
|
||||
// 非导出操作,且不是启用状态则跳过执行
|
||||
if (!config.isOperating() && !this.isEnable()) {
|
||||
return;
|
||||
}
|
||||
addRequestExtractors(tree);
|
||||
}
|
||||
|
||||
|
|
|
@ -29,6 +29,10 @@ public class MsJSR223Processor extends MsTestElement {
|
|||
|
||||
@Override
|
||||
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
|
||||
// 非导出操作,且不是启用状态则跳过执行
|
||||
if (!config.isOperating() && !this.isEnable()) {
|
||||
return;
|
||||
}
|
||||
JSR223Sampler processor = new JSR223Sampler();
|
||||
processor.setEnabled(this.isEnable());
|
||||
if (StringUtils.isNotEmpty(this.getName())) {
|
||||
|
|
|
@ -29,6 +29,10 @@ public class MsJSR223PostProcessor extends MsTestElement {
|
|||
|
||||
@Override
|
||||
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
|
||||
// 非导出操作,且不是启用状态则跳过执行
|
||||
if (!config.isOperating() && !this.isEnable()) {
|
||||
return;
|
||||
}
|
||||
JSR223PostProcessor processor = new JSR223PostProcessor();
|
||||
processor.setEnabled(this.isEnable());
|
||||
if (StringUtils.isNotEmpty(this.getName())) {
|
||||
|
|
|
@ -30,6 +30,10 @@ public class MsJSR223PreProcessor extends MsTestElement {
|
|||
|
||||
@Override
|
||||
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
|
||||
// 非导出操作,且不是启用状态则跳过执行
|
||||
if (!config.isOperating() && !this.isEnable()) {
|
||||
return;
|
||||
}
|
||||
final HashTree jsr223PreTree = tree.add(getJSR223PreProcessor());
|
||||
if (CollectionUtils.isNotEmpty(hashTree)) {
|
||||
hashTree.forEach(el -> {
|
||||
|
|
|
@ -60,6 +60,10 @@ public class MsDubboSampler extends MsTestElement {
|
|||
|
||||
@Override
|
||||
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
|
||||
// 非导出操作,且不是启用状态则跳过执行
|
||||
if (!config.isOperating() && !this.isEnable()) {
|
||||
return;
|
||||
}
|
||||
if (this.getReferenced() != null && "Deleted".equals(this.getReferenced())) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -93,7 +93,10 @@ public class MsHTTPSamplerProxy extends MsTestElement {
|
|||
|
||||
@Override
|
||||
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
|
||||
|
||||
// 非导出操作,且不是启用状态则跳过执行
|
||||
if (!config.isOperating() && !this.isEnable()) {
|
||||
return;
|
||||
}
|
||||
if (this.getReferenced() != null && MsTestElementConstants.REF.name().equals(this.getReferenced())) {
|
||||
this.getRefElement(this);
|
||||
}
|
||||
|
@ -315,7 +318,9 @@ public class MsHTTPSamplerProxy extends MsTestElement {
|
|||
headers.stream().filter(KeyValue::isValid).filter(KeyValue::isEnable).forEach(keyValue ->
|
||||
headerManager.add(new Header(keyValue.getName(), keyValue.getValue()))
|
||||
);
|
||||
tree.add(headerManager);
|
||||
if (headerManager.getHeaders().size() > 0) {
|
||||
tree.add(headerManager);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isURL(String str) {
|
||||
|
|
|
@ -58,6 +58,10 @@ public class MsJDBCSampler extends MsTestElement {
|
|||
|
||||
@Override
|
||||
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
|
||||
// 非导出操作,且不是启用状态则跳过执行
|
||||
if (!config.isOperating() && !this.isEnable()) {
|
||||
return;
|
||||
}
|
||||
if (this.getReferenced() != null && MsTestElementConstants.REF.name().equals(this.getReferenced())) {
|
||||
this.getRefElement(this);
|
||||
}
|
||||
|
|
|
@ -72,6 +72,10 @@ public class MsTCPSampler extends MsTestElement {
|
|||
|
||||
@Override
|
||||
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
|
||||
// 非导出操作,且不是启用状态则跳过执行
|
||||
if (!config.isOperating() && !this.isEnable()) {
|
||||
return;
|
||||
}
|
||||
if (this.getReferenced() != null && MsTestElementConstants.REF.name().equals(this.getReferenced())) {
|
||||
this.getRefElement(this);
|
||||
}
|
||||
|
|
|
@ -26,7 +26,10 @@ public class MsConstantTimer extends MsTestElement {
|
|||
|
||||
@Override
|
||||
public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
|
||||
|
||||
// 非导出操作,且不是启用状态则跳过执行
|
||||
if (!config.isOperating() && !this.isEnable()) {
|
||||
return;
|
||||
}
|
||||
final HashTree groupTree = tree.add(constantTimer());
|
||||
if (CollectionUtils.isNotEmpty(hashTree)) {
|
||||
hashTree.forEach(el -> {
|
||||
|
|
|
@ -3,6 +3,7 @@ package io.metersphere.api.dto.definition.request.unknown;
|
|||
import com.alibaba.fastjson.annotation.JSONType;
|
||||
import io.metersphere.api.dto.definition.request.MsTestElement;
|
||||
import io.metersphere.api.dto.definition.request.ParameterConfig;
|
||||
import io.metersphere.commons.utils.LogUtil;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
|
@ -36,17 +37,22 @@ public class MsJmeterElement extends MsTestElement {
|
|||
Object scriptWrapper = SaveService.loadElement(inputSource);
|
||||
HashTree elementTree = tree;
|
||||
this.setElementType(scriptWrapper.getClass().getName());
|
||||
if (scriptWrapper instanceof TestElement) {
|
||||
((TestElement) scriptWrapper).setName(this.getName());
|
||||
((TestElement) scriptWrapper).setEnabled(this.isEnable());
|
||||
}
|
||||
if (config.isOperating()) {
|
||||
elementTree = tree.add(scriptWrapper);
|
||||
} else if (!(scriptWrapper instanceof TestPlan) && !(scriptWrapper instanceof ThreadGroup)) {
|
||||
elementTree = tree.add(scriptWrapper);
|
||||
}
|
||||
if (scriptWrapper instanceof TestElement) {
|
||||
((TestElement) scriptWrapper).setName(this.getName());
|
||||
}
|
||||
if (CollectionUtils.isNotEmpty(hashTree)) {
|
||||
for (MsTestElement el : hashTree) {
|
||||
el.toHashTree(elementTree, el.getHashTree(), config);
|
||||
if (!config.isOperating() && scriptWrapper instanceof ThreadGroup && !((ThreadGroup) scriptWrapper).isEnabled()) {
|
||||
LogUtil.info(((ThreadGroup) scriptWrapper).getName() + "是被禁用线程组不加入执行");
|
||||
} else {
|
||||
if (CollectionUtils.isNotEmpty(hashTree)) {
|
||||
for (MsTestElement el : hashTree) {
|
||||
el.toHashTree(elementTree, el.getHashTree(), config);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -115,7 +115,9 @@ public class ApiAutomationService {
|
|||
if (map != null) {
|
||||
if (map.isEmpty()) {
|
||||
List<String> ids = (List<String>) JSONPath.read(definition, "$..projectId");
|
||||
idList.addAll(new HashSet<>(ids));
|
||||
if (CollectionUtils.isNotEmpty(ids)) {
|
||||
idList.addAll(new HashSet<>(ids));
|
||||
}
|
||||
} else {
|
||||
Set<String> set = d.getEnvironmentMap().keySet();
|
||||
idList = new ArrayList<>(set);
|
||||
|
@ -601,6 +603,7 @@ public class ApiAutomationService {
|
|||
ParameterConfig config = new ParameterConfig();
|
||||
config.setConfig(envConfig);
|
||||
HashTree hashTree = request.getTestElement().generateHashTree(config);
|
||||
System.out.println(request.getTestElement().getJmx(hashTree));
|
||||
// 调用执行方法
|
||||
APIScenarioReportResult reportResult = createScenarioReport(request.getId(), request.getScenarioId(), request.getScenarioName(), ReportTriggerMode.MANUAL.name(), request.getExecuteType(), request.getProjectId(),
|
||||
SessionUtils.getUserId());
|
||||
|
|
|
@ -161,12 +161,12 @@
|
|||
#{value}
|
||||
</foreach>
|
||||
</when>
|
||||
<otherwise>
|
||||
and test_case_review_test_case.status in
|
||||
<when test="key=='status'">
|
||||
and test_case.review_status in
|
||||
<foreach collection="values" item="value" separator="," open="(" close=")">
|
||||
#{value}
|
||||
</foreach>
|
||||
</otherwise>
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
</foreach>
|
||||
|
|
|
@ -5,7 +5,7 @@ import io.metersphere.security.ApiKeyFilter;
|
|||
import io.metersphere.security.CsrfFilter;
|
||||
import io.metersphere.security.UserModularRealmAuthenticator;
|
||||
import io.metersphere.security.realm.LdapRealm;
|
||||
import io.metersphere.security.realm.ShiroDBRealm;
|
||||
import io.metersphere.security.realm.LocalRealm;
|
||||
import org.apache.shiro.authc.pam.FirstSuccessfulStrategy;
|
||||
import org.apache.shiro.authc.pam.ModularRealmAuthenticator;
|
||||
import org.apache.shiro.cache.MemoryConstrainedCacheManager;
|
||||
|
@ -70,7 +70,7 @@ public class ShiroConfig implements EnvironmentAware {
|
|||
}
|
||||
|
||||
/**
|
||||
* securityManager 不用直接注入shiroDBRealm,可能会导致事务失效
|
||||
* securityManager 不用直接注入 Realm,可能会导致事务失效
|
||||
* 解决方法见 handleContextRefresh
|
||||
* http://www.debugrun.com/a/NKS9EJQ.html
|
||||
*/
|
||||
|
@ -85,8 +85,8 @@ public class ShiroConfig implements EnvironmentAware {
|
|||
|
||||
@Bean
|
||||
@DependsOn("lifecycleBeanPostProcessor")
|
||||
public ShiroDBRealm shiroDBRealm() {
|
||||
return new ShiroDBRealm();
|
||||
public LocalRealm localRealm() {
|
||||
return new LocalRealm();
|
||||
}
|
||||
|
||||
@Bean
|
||||
|
@ -135,10 +135,10 @@ public class ShiroConfig implements EnvironmentAware {
|
|||
public void handleContextRefresh(ContextRefreshedEvent event) {
|
||||
ApplicationContext context = event.getApplicationContext();
|
||||
List<Realm> realmList = new ArrayList<>();
|
||||
ShiroDBRealm shiroDBRealm = context.getBean(ShiroDBRealm.class);
|
||||
LocalRealm localRealm = context.getBean(LocalRealm.class);
|
||||
LdapRealm ldapRealm = context.getBean(LdapRealm.class);
|
||||
// 基本realm
|
||||
realmList.add(shiroDBRealm);
|
||||
realmList.add(localRealm);
|
||||
realmList.add(ldapRealm);
|
||||
context.getBean(DefaultWebSecurityManager.class).setRealms(realmList);
|
||||
}
|
||||
|
|
|
@ -68,7 +68,7 @@ public class LdapController {
|
|||
userService.addLdapUser(user);
|
||||
}
|
||||
|
||||
// 执行 ShiroDBRealm 中 LDAP 登录逻辑
|
||||
// 执行 LocalRealm 中 LDAP 登录逻辑
|
||||
LoginRequest loginRequest = new LoginRequest();
|
||||
loginRequest.setUsername(userId);
|
||||
return userService.login(loginRequest);
|
||||
|
|
|
@ -34,9 +34,9 @@ import java.util.stream.Collectors;
|
|||
* set realm
|
||||
* </p>
|
||||
*/
|
||||
public class ShiroDBRealm extends AuthorizingRealm {
|
||||
public class LocalRealm extends AuthorizingRealm {
|
||||
|
||||
private Logger logger = LoggerFactory.getLogger(ShiroDBRealm.class);
|
||||
private Logger logger = LoggerFactory.getLogger(LocalRealm.class);
|
||||
@Resource
|
||||
private UserService userService;
|
||||
|
|
@ -551,8 +551,8 @@ public class TestPlanService {
|
|||
queryTestPlanRequest.setId(planId);
|
||||
|
||||
TestPlanDTO testPlan = extTestPlanMapper.list(queryTestPlanRequest).get(0);
|
||||
String projectName = getProjectNameByPlanId(planId);
|
||||
testPlan.setProjectName(projectName);
|
||||
Project project = projectMapper.selectByPrimaryKey(testPlan.getProjectId());
|
||||
testPlan.setProjectName(project.getName());
|
||||
|
||||
TestCaseReport testCaseReport = testCaseReportMapper.selectByPrimaryKey(testPlan.getReportId());
|
||||
JSONObject content = JSONObject.parseObject(testCaseReport.getContent());
|
||||
|
@ -708,8 +708,8 @@ public class TestPlanService {
|
|||
queryTestPlanRequest.setId(planId);
|
||||
|
||||
TestPlanDTO testPlan = extTestPlanMapper.list(queryTestPlanRequest).get(0);
|
||||
String projectName = getProjectNameByPlanId(planId);
|
||||
testPlan.setProjectName(projectName);
|
||||
Project project = projectMapper.selectByPrimaryKey(testPlan.getProjectId());
|
||||
testPlan.setProjectName(project.getName());
|
||||
|
||||
TestCaseReport testCaseReport = testCaseReportMapper.selectByPrimaryKey(testPlan.getReportId());
|
||||
JSONObject content = JSONObject.parseObject(testCaseReport.getContent());
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit adefde265ff12d4ea909353c3f46008f8a8e17e7
|
||||
Subproject commit c9fd084c8f4453d7697677a79d9a0a953c045e38
|
|
@ -8,8 +8,7 @@
|
|||
<div class="ms-drawer-header">
|
||||
<slot name="header"></slot>
|
||||
<i v-if="isShowClose" class="el-icon-close" @click="close"/>
|
||||
<font-awesome-icon v-if="!isFullScreen && showFullScreen" class="alt-ico" :icon="['fa', 'expand-alt']" size="lg" @click="fullScreen"/>
|
||||
<font-awesome-icon v-if="isFullScreen && showFullScreen" class="alt-ico" :icon="['fa', 'compress-alt']" size="lg" @click="unFullScreen"/>
|
||||
<ms-full-screen-button v-if="showFullScreen" :is-full-screen.sync="isFullScreen"/>
|
||||
</div>
|
||||
<div class="ms-drawer-body">
|
||||
<slot></slot>
|
||||
|
@ -23,9 +22,10 @@
|
|||
import MsRight2LeftDragBar from "./dragbar/MsRight2LeftDragBar";
|
||||
import MsLeft2RightDragBar from "./dragbar/MsLeft2RightDragBar";
|
||||
import MsBottom2TopDragBar from "./dragbar/MsBottom2TopDragBar";
|
||||
import MsFullScreenButton from "@/business/components/common/components/MsFullScreenButton";
|
||||
export default {
|
||||
name: "MsDrawer",
|
||||
components: {MsBottom2TopDragBar, MsLeft2RightDragBar, MsRight2LeftDragBar},
|
||||
components: {MsFullScreenButton, MsBottom2TopDragBar, MsLeft2RightDragBar, MsRight2LeftDragBar},
|
||||
data() {
|
||||
return {
|
||||
x: 0,
|
||||
|
@ -74,6 +74,15 @@
|
|||
mounted() {
|
||||
this.init();
|
||||
},
|
||||
watch: {
|
||||
isFullScreen() {
|
||||
if (this.isFullScreen) {
|
||||
this.fullScreen()
|
||||
} else {
|
||||
this.unFullScreen();
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
init() {
|
||||
// todo 其他方向待优化
|
||||
|
@ -123,12 +132,10 @@
|
|||
this.originalH = this.h;
|
||||
this.w = document.body.clientWidth;
|
||||
this.h = document.body.clientHeight;
|
||||
this.isFullScreen = true;
|
||||
},
|
||||
unFullScreen() {
|
||||
this.w = this.originalW;
|
||||
this.h = this.originalH;
|
||||
this.isFullScreen = false;
|
||||
},
|
||||
close() {
|
||||
this.$emit('close')
|
||||
|
@ -206,18 +213,10 @@
|
|||
color: red;
|
||||
}
|
||||
|
||||
.alt-ico {
|
||||
/deep/ .alt-ico {
|
||||
position: absolute;
|
||||
font-size: 15px;
|
||||
right: 40px;
|
||||
top: 15px;
|
||||
color: #8c939d;
|
||||
}
|
||||
|
||||
.alt-ico:hover {
|
||||
color: black;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
<template>
|
||||
<span class="fulls-screen-btn">
|
||||
<font-awesome-icon v-if="!isFullScreen" class="alt-ico" :icon="['fa', 'expand-alt']" size="lg" @click="change(true)"/>
|
||||
<font-awesome-icon v-if="isFullScreen" class="alt-ico" :icon="['fa', 'compress-alt']" size="lg" @click="change(false)"/>
|
||||
</span>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "MsFullScreenButton",
|
||||
props: {
|
||||
isFullScreen: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
change(bool) {
|
||||
this.$emit("update:isFullScreen", bool);
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
.alt-ico:hover {
|
||||
color: black;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
.alt-ico {
|
||||
font-size: 15px;
|
||||
color: #8c939d;
|
||||
}
|
||||
|
||||
</style>
|
|
@ -1,10 +1,10 @@
|
|||
<template>
|
||||
<div class="minder">
|
||||
<div class="minder" :class="{'full-screen': isFullScreen}">
|
||||
<ms-full-screen-button :is-full-screen.sync="isFullScreen"/>
|
||||
<minder-editor
|
||||
v-if="isActive"
|
||||
class="minder-container"
|
||||
:import-json="importJson"
|
||||
:height="700"
|
||||
:progress-enable="false"
|
||||
:tags="tags"
|
||||
:distinct-tags="distinctTags"
|
||||
|
@ -15,9 +15,10 @@
|
|||
|
||||
<script>
|
||||
|
||||
import MsFullScreenButton from "@/business/components/common/components/MsFullScreenButton";
|
||||
export default {
|
||||
name: "MsModuleMinder",
|
||||
components: {},
|
||||
components: {MsFullScreenButton},
|
||||
props: {
|
||||
treeNodes: {
|
||||
type: Array,
|
||||
|
@ -58,10 +59,11 @@ export default {
|
|||
},
|
||||
"template":"default"
|
||||
},
|
||||
isActive: true
|
||||
isActive: true,
|
||||
isFullScreen: false
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
created() {
|
||||
},
|
||||
watch: {
|
||||
dataMap() {
|
||||
|
@ -128,4 +130,33 @@ export default {
|
|||
bottom: auto;
|
||||
top: 30px;
|
||||
}
|
||||
|
||||
.minder {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.fulls-screen-btn {
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
right: 10px;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.full-screen {
|
||||
position: fixed;
|
||||
top: 0px;
|
||||
left: 0px;
|
||||
width: 100%;
|
||||
background: white;
|
||||
height: 100vh;
|
||||
z-index: 999999;
|
||||
}
|
||||
|
||||
.full-screen >>> .minder-container {
|
||||
height: calc(100vh - 109px) !important;
|
||||
}
|
||||
|
||||
.full-screen .fulls-screen-btn {
|
||||
right: 30px;
|
||||
}
|
||||
</style>
|
||||
|
|
|
@ -42,12 +42,11 @@
|
|||
<br>
|
||||
<div v-if="threadGroup.threadType === 'DURATION'">
|
||||
<el-form-item :label="$t('load_test.duration')">
|
||||
<!-- 最多两天的测试时长 -->
|
||||
<el-input-number
|
||||
:disabled="isReadOnly"
|
||||
v-model="threadGroup.duration"
|
||||
:min="1"
|
||||
:max="99999"
|
||||
:max="9999"
|
||||
@change="calculateChart(threadGroup)"
|
||||
size="mini"/>
|
||||
</el-form-item>
|
||||
|
|
|
@ -310,8 +310,6 @@ export default {
|
|||
}
|
||||
item.passRate=item.passRate+'%'
|
||||
})
|
||||
console.log(this.tableData)
|
||||
|
||||
});
|
||||
},
|
||||
copyData(status) {
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
import MsDialogFooter from '../../../../../common/components/MsDialogFooter'
|
||||
import SelectMenu from "../../../../common/SelectMenu";
|
||||
import RelevanceDialog from "./RelevanceDialog";
|
||||
import {getCurrentProjectID} from "@/common/js/utils";
|
||||
|
||||
export default {
|
||||
name: "TestCaseRelevanceBase",
|
||||
|
@ -93,10 +94,17 @@
|
|||
this.result = this.$get("/project/listAll", res => {
|
||||
let data = res.data;
|
||||
if (data) {
|
||||
const index = data.findIndex(d => d.id === getCurrentProjectID());
|
||||
this.projects = data;
|
||||
this.projectId = data[0].id;
|
||||
this.projectName = data[0].name;
|
||||
this.changeProject(data[0]);
|
||||
if (index !== -1) {
|
||||
this.projectId = data[index].id;
|
||||
this.projectName = data[index].name;
|
||||
this.changeProject(data[index]);
|
||||
} else {
|
||||
this.projectId = data[0].id;
|
||||
this.projectName = data[0].name;
|
||||
this.changeProject(data[0]);
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
|
|
|
@ -591,17 +591,23 @@ export default {
|
|||
const project = res.data;
|
||||
if (project.tapdId) {
|
||||
this.hasTapdId = true;
|
||||
this.result = this.$get("/issues/tapd/user/" + this.testCase.caseId, response => {
|
||||
this.users = response.data;
|
||||
this.result = this.$get("/issues/tapd/user/" + this.testCase.caseId).then(response => {
|
||||
this.users = response.data.data;
|
||||
}).catch(() => {
|
||||
console.log("get tapd user error.");
|
||||
})
|
||||
}
|
||||
if (project.zentaoId) {
|
||||
this.hasZentaoId = true;
|
||||
this.result = this.$get("/issues/zentao/builds/" + this.testCase.caseId, response => {
|
||||
this.Builds = response.data;
|
||||
this.result = this.$get("/issues/zentao/builds/" + this.testCase.caseId).then(response => {
|
||||
this.Builds = response.data.data;
|
||||
}).catch(() => {
|
||||
console.log("get zentao builds error.");
|
||||
})
|
||||
this.result = this.$get("/issues/zentao/user/" + this.testCase.caseId, response => {
|
||||
this.zentaoUsers = response.data;
|
||||
this.result = this.$get("/issues/zentao/user/" + this.testCase.caseId).then(response => {
|
||||
this.zentaoUsers = response.data.data;
|
||||
}).catch(() => {
|
||||
console.log("get zentao user error.");
|
||||
})
|
||||
}
|
||||
})
|
||||
|
@ -649,8 +655,10 @@ export default {
|
|||
this.testCase.zentaoAssigned = "";
|
||||
},
|
||||
getIssues(caseId) {
|
||||
this.result = this.$get("/issues/get/" + caseId, response => {
|
||||
this.issues = response.data;
|
||||
this.result = this.$get("/issues/get/" + caseId).then(response => {
|
||||
this.issues = response.data.data;
|
||||
}).catch(() => {
|
||||
console.log("get issues error")
|
||||
})
|
||||
},
|
||||
closeIssue(row) {
|
||||
|
|
Loading…
Reference in New Issue