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

fix(接口测试): #1006851 #1006860 #1006703 修复jsonschema 删除子项未删除值、tcp mock开启状态查询出错、回复接口用例失败问题 

【【github#6196】恢复接口用例失败】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006703；【【Mock】Mock的Tcp开启后依然提示没开启Mock服务】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006851；【【接口定义】json-schema删除只删了字段名，没删除字段值】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006860；
This commit is contained in:
song-tianyang 2021-09-23 16:22:35 +08:00 committed by song-tianyang
parent 8d53378626
commit fbfab6b1f3
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/tcp/server/TCPServer.java
View File

@ -34,7 +34,7 @@ public class TCPServer implements Runnable {
}
public boolean isSocketOpen(){
if (this.serverSocket != null && !this.serverSocket.isClosed() &&this.servicer != null) {
if (this.serverSocket != null && !this.serverSocket.isClosed()) {
return true;
}else {
return false;

2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
View File

@ -600,7 +600,7 @@
update api_test_case
set original_status=status,
status = 'Trash',delete_time = #{deleteTime},delete_user_id = #{deleteUserId}
where id IN
where status != 'Trash' AND id IN
<foreach collection="ids" item="v" separator="," open="(" close=")">
#{v}
</foreach>

4
frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
View File

@ -109,7 +109,7 @@
},
created() {
if(!this.environment.config.preProcessor){
this.environment.config.preProcessor = createComponent("JDBCPreProcessor");
this.environment.config.preProcessor = createComponent("JSR223PreProcessor");
}
if(!this.environment.config.postProcessor){
this.environment.config.postProcessor = createComponent("JSR223PostProcessor");
@ -125,7 +125,7 @@
watch: {
environment: function (o) {
if(!this.environment.config.preProcessor){
this.environment.config.preProcessor = createComponent("JDBCPreProcessor");
this.environment.config.preProcessor = createComponent("JSR223PreProcessor");
if(!this.environment.config.preProcessor.script){
this.environment.config.preProcessor.script = "";
}

17
frontend/src/business/components/common/json-schema/schema/editor/main.vue
View File

@ -39,10 +39,10 @@
</el-col>
</el-row>
<template v-if="!hidden&&pickValue.properties && !isArray">
<json-schema-editor v-for="(item,key,index) in pickValue.properties" :value="{[key]:item}" :parent="pickValue" :key="index" :deep="deep+1" :root="false" class="children" :lang="lang" :custom="custom" @changeAllItemsType="changeAllItemsType"/>
<template v-if="!hidden&&pickValue.properties && !isArray && reloadItemOver">
<json-schema-editor v-for="(item,key,index) in pickValue.properties" :value="{[key]:item}" :parent="pickValue" :key="index" :deep="deep+1" :root="false" class="children" :lang="lang" :custom="custom" @changeAllItemsType="changeAllItemsType" @reloadItems="reloadItems"/>
</template>
<template v-if="isArray">
<template v-if="isArray && reloadItemOver">
<!-- <json-schema-editor :value="{items:pickValue.items}" :deep="deep+1" disabled isItem :root="false" class="children" :lang="lang" :custom="custom"/>-->
<json-schema-editor v-for="(item,key,index) in pickValue.items" :value="{[key]:item}" :parent="pickValue" :key="index" :deep="deep+1" :root="false" class="children" :lang="lang" :custom="custom" @changeAllItemsType="changeAllItemsType"/>
</template>
@ -199,6 +199,7 @@
hidden: false,
countAdd: 1,
modalVisible: false,
reloadItemOver: true,
advancedValue: {},
addProp: {},// 自定义属性
customProps: [],
@ -322,6 +323,7 @@
required.length === 0 && this.$delete(this.parent, 'required')
}
}
this.parentReloadItems();
},
_joinName() {
return `feild_${this.deep}_${this.countAdd++}_${getUUID().substring(0, 5)}`
@ -349,6 +351,15 @@
for (const item of this.customProps) {
this.$set(this.pickValue, item.key, item.value)
}
},
parentReloadItems(){
this.$emit("reloadItems");
},
reloadItems(){
this.reloadItemOver = false;
this.$nextTick(() => {
this.reloadItemOver = true;
})
}
}
}