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

Merge branch 'master' of https://github.com/metersphere/metersphere

This commit is contained in:
chenjianxing 2020-11-25 19:48:13 +08:00
parent b5d926e264 7184d551f6
commit a5f2da3104
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/api/parse/JmeterDocumentParser.java
View File

@ -161,7 +161,9 @@ public class JmeterDocumentParser {
break; break;
case "Argument.value": case "Argument.value":
String textContent = ele.getTextContent(); String textContent = ele.getTextContent();
ele.setTextContent(ScriptEngineUtils.calculate(textContent)); if (StringUtils.startsWith(textContent, "@")) {
ele.setTextContent(ScriptEngineUtils.calculate(textContent));
}
break; break;
default: default:
break; break;

4
frontend/src/login/Login.vue
View File

@ -260,6 +260,10 @@ export default {
background: url(../assets/info.png); background: url(../assets/info.png);
height: 560px; height: 560px;
} }
.login-logo {
background: url(../assets/logo-dark-MeterSphere.svg);
}
</style> </style>
<style> <style>