fix(接口定义) 修改JsonSchema-高级设置,object和array显示了最大最小数量
--bug=1006778 --user=赵勇 【接口测试】JsonSchema-高级设置,object和array显示了最大最小数量 https://www.tapd.cn/55049933/s/1048677
This commit is contained in:
parent
dc9947dd4e
commit
08e2641ccb
|
@ -570,6 +570,7 @@ public class ApiDefinitionService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 如果是MS格式,带用例导出,最后创建用例,重新设置接口id
|
* 如果是MS格式,带用例导出,最后创建用例,重新设置接口id
|
||||||
|
*
|
||||||
* @param cases
|
* @param cases
|
||||||
* @param originId
|
* @param originId
|
||||||
* @param newId
|
* @param newId
|
||||||
|
@ -759,7 +760,10 @@ public class ApiDefinitionService {
|
||||||
result.getResponseResult().setConsole(res.getConsole());
|
result.getResponseResult().setConsole(res.getConsole());
|
||||||
cache.put(res.getTestId(), result);
|
cache.put(res.getTestId(), result);
|
||||||
} else {
|
} else {
|
||||||
MSException.throwException(Translator.get("test_not_found"));
|
RequestResult result = new RequestResult();
|
||||||
|
result.getResponseResult().setConsole(res.getConsole());
|
||||||
|
cache.put(res.getTestId(), result);
|
||||||
|
//MSException.throwException(Translator.get("test_not_found"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1427,6 +1431,7 @@ public class ApiDefinitionService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用例自定义排序
|
* 用例自定义排序
|
||||||
|
*
|
||||||
* @param request
|
* @param request
|
||||||
*/
|
*/
|
||||||
public void updateOrder(ResetOrderRequest request) {
|
public void updateOrder(ResetOrderRequest request) {
|
||||||
|
@ -1448,9 +1453,9 @@ public class ApiDefinitionService {
|
||||||
}
|
}
|
||||||
|
|
||||||
public long countEffectiveByProjectId(String projectId) {
|
public long countEffectiveByProjectId(String projectId) {
|
||||||
if(StringUtils.isEmpty(projectId)){
|
if (StringUtils.isEmpty(projectId)) {
|
||||||
return 0;
|
return 0;
|
||||||
}else {
|
} else {
|
||||||
ApiDefinitionExample example = new ApiDefinitionExample();
|
ApiDefinitionExample example = new ApiDefinitionExample();
|
||||||
example.createCriteria().andProjectIdEqualTo(projectId).andStatusNotEqualTo("Trash");
|
example.createCriteria().andProjectIdEqualTo(projectId).andStatusNotEqualTo("Trash");
|
||||||
return apiDefinitionMapper.countByExample(example);
|
return apiDefinitionMapper.countByExample(example);
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
<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"/>
|
<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>
|
</template>
|
||||||
<!-- 高级设置-->
|
<!-- 高级设置-->
|
||||||
<el-dialog append-to-body :close-on-click-modal="false" :title="$t('schema.adv_setting')" :visible.sync="modalVisible" :destroy-on-close="true"
|
<el-dialog append-to-body :close-on-click-modal="true" :title="$t('schema.adv_setting')" :visible.sync="modalVisible" :destroy-on-close="true"
|
||||||
@close="handleClose">
|
@close="handleClose">
|
||||||
<p class="tip">基础设置 </p>
|
<p class="tip">基础设置 </p>
|
||||||
|
|
||||||
|
@ -328,9 +328,10 @@
|
||||||
},
|
},
|
||||||
onSetting() {
|
onSetting() {
|
||||||
this.modalVisible = true;
|
this.modalVisible = true;
|
||||||
|
this.advancedValue = {};
|
||||||
this.advancedValue = this.advanced.value
|
this.advancedValue = this.advanced.value
|
||||||
for (const k in this.advancedValue) {
|
for (const k in this.advancedValue) {
|
||||||
if (this.pickValue[k]) this.advancedValue[k] = this.pickValue[k]
|
this.advancedValue[k] = this.pickValue[k]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleClose() {
|
handleClose() {
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
const value = {
|
const value = {
|
||||||
minItems:null,
|
|
||||||
maxItems:null,
|
|
||||||
description: null
|
description: null
|
||||||
}
|
}
|
||||||
const attr = {
|
const attr = {
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
const value = {
|
const value = {
|
||||||
description: null,
|
description: null
|
||||||
maxProperties: null,
|
|
||||||
minProperties: null
|
|
||||||
}
|
}
|
||||||
const attr = {
|
const attr = {
|
||||||
description: {
|
description: {
|
||||||
|
@ -18,4 +16,4 @@ const attr = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const wrapper = {value, attr}
|
const wrapper = {value, attr}
|
||||||
export default wrapper
|
export default wrapper
|
||||||
|
|
Loading…
Reference in New Issue