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:
junhong 2022-01-12 17:57:50 +08:00 committed by 刘瑞斌
parent 3d3dd075bf
commit cfc4ee64f8
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue
View File

@ -179,7 +179,7 @@
<el-input v-model="item.name" size="small" :readonly="true" @click.native="savePreParams(item.name)"/> <el-input v-model="item.name" size="small" :readonly="true" @click.native="savePreParams(item.name)"/>
</el-col> </el-col>
<el-col class="item"> <el-col class="item">
<el-input v-model="item.value" size="small" :readonly="true" @click.native="savePreParams(item.name)"/> <el-input v-model="item.exp" size="small" :readonly="true" @click.native="savePreParams(item.name)"/>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -403,13 +403,13 @@
if(node.childNodes[i].isLeaf){ //是叶子节点 if(node.childNodes[i].isLeaf){ //是叶子节点
if(node.childNodes[i].data.type === 'Extract'){ //叶子节点的数据的类型是 提取 if(node.childNodes[i].data.type === 'Extract'){ //叶子节点的数据的类型是 提取
let extractJsonParams = (node.childNodes[i].data.json).map(v => { let extractJsonParams = (node.childNodes[i].data.json).map(v => {
return {name: v.variable, value: v.value} return {name: v.variable, value: v.value, exp: v.expression}
}); });
let extractRegexParams = (node.childNodes[i].data.regex).map(v => { let extractRegexParams = (node.childNodes[i].data.regex).map(v => {
return {name: v.variable, value: v.value} return {name: v.variable, value: v.value, exp: v.expression}
}); });
let extractXpathParams = (node.childNodes[i].data.xpath).map(v => { let extractXpathParams = (node.childNodes[i].data.xpath).map(v => {
return {name: v.variable, value: v.value} return {name: v.variable, value: v.value, exp: v.expression}
}); });
let vs = [...extractJsonParams, ...extractRegexParams, ...extractXpathParams]; let vs = [...extractJsonParams, ...extractRegexParams, ...extractXpathParams];
if (vs.length > 0) { if (vs.length > 0) {

2
frontend/src/i18n/en-US.js
View File

@ -1212,7 +1212,7 @@ export default {
all_post_script: "Postscript", all_post_script: "Postscript",
pre_sql: "JDBC Preprocessor", pre_sql: "JDBC Preprocessor",
pre_return: "pre return", pre_return: "pre return",
extract_params: "extract params（variable / value）", extract_params: "extract params（variable / expression）",
post_sql: "JDBC Postprocessor", post_sql: "JDBC Postprocessor",
extract_param: "Extract parameters", extract_param: "Extract parameters",
add_module: "Add module", add_module: "Add module",

2
frontend/src/i18n/zh-CN.js
View File

@ -1218,7 +1218,7 @@ export default {
all_post_script: "全局后置脚本", all_post_script: "全局后置脚本",
pre_sql: "前置SQL", pre_sql: "前置SQL",
pre_return: "前置返回", pre_return: "前置返回",
extract_params: "提取参数（变量名 / 值）", extract_params: "提取参数（变量名 / 表达式）",
post_sql: "后置SQL", post_sql: "后置SQL",
extract_param: "提取参数", extract_param: "提取参数",
add_module: "创建模块", add_module: "创建模块",

2
frontend/src/i18n/zh-TW.js
View File

@ -1218,7 +1218,7 @@ export default {
all_post_script: "全局後置腳本", all_post_script: "全局後置腳本",
pre_sql: "前置SQL", pre_sql: "前置SQL",
pre_return: "前置返回", pre_return: "前置返回",
extract_params: "提取參數（變量名 / 值）", extract_params: "提取參數（變量名 / 表達式）",
post_sql: "後置SQL", post_sql: "後置SQL",
extract_param: "提取參數", extract_param: "提取參數",
add_module: "創建模塊", add_module: "創建模塊",