From ef029dd23ac2cbb3927d8b4c5b7f8bcd91937ebc Mon Sep 17 00:00:00 2001 From: song-tianyang Date: Thu, 17 Feb 2022 16:56:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=8F=82=E6=95=B0):=20mock=E6=9C=9F=E6=9C=9B=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=93=8D=E5=BA=94=E4=BB=A3=E7=A0=81=E4=B8=ADjson-schema?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E7=9A=84?= =?UTF-8?q?=E9=80=89=E9=A1=B9=20mock=E6=9C=9F=E6=9C=9B=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=93=8D=E5=BA=94=E4=BB=A3=E7=A0=81=E4=B8=ADjson-schema?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E7=9A=84?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ApiVariableAdvance.vue | 158 ++++++++++++------ .../mock/Components/MockApiResponseBody.vue | 1 + .../mock/Components/MockApiVariable.vue | 2 +- .../common/json-schema/JsonSchemaEditor.vue | 7 + .../common/json-schema/schema/editor/main.vue | 9 + .../schema/editor/mock/MockComplete.vue | 8 +- 6 files changed, 131 insertions(+), 54 deletions(-) diff --git a/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue b/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue index 7bdf81b1d8..8ba1296ce5 100644 --- a/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue +++ b/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue @@ -39,7 +39,8 @@ - +
@@ -88,17 +89,17 @@
- + + /> - +
@@ -149,10 +150,12 @@
- + - +
@@ -178,6 +181,22 @@ + + + + +
+

{{ $t('api_test.definition.document.request_info') }}

+ + + + +
+ + +
@@ -229,6 +248,12 @@ return false; } }, + showMockVars: { + type: Boolean, + default() { + return false; + } + }, variables: Array, scenarioDefinition: Array, }, @@ -275,12 +300,41 @@ {name: "number"} ], mockFuncs: MOCKJS_FUNC.map(f => { - return {name: f.name + " " + f.des + " " + this.$t('api_test.request.parameters_filter_example') + "：" + f.ex, value: f.name} + return { + name: f.name + " " + f.des + " " + this.$t('api_test.request.parameters_filter_example') + "：" + f.ex, + value: f.name + } }), jmeterFuncs: JMETER_FUNC, mockVariableFuncs: [], jmeterVariableFuncs: [], dialogVisible: true, + requestValues: [ + { + type: this.$t('api_test.request.address'), + name: "${address}" + }, + { + type: "Header " + this.$t('api_test.definition.document.request_param'), + name: "${header.param}" + }, + { + type: this.$t('api_test.request.body') + this.$t('api_test.variable'), + name: "${body.param}" + }, + { + type: this.$t('api_test.request.body') + this.$t('api_test.variable') + " (Raw)", + name: "${bodyRaw}" + }, + { + type: "Query " + this.$t('api_test.definition.document.request_param'), + name: "${query.param}" + }, + { + type: "Rest " + this.$t('api_test.definition.document.request_param'), + name: "${rest.param}" + }, + ], // 自定义变量相关 defineVariable: "", @@ -333,18 +387,18 @@ this.operatingElements = this.stepFilter.get("ALL"); }, open() { - if(this.scenarioDefinition != undefined){ + if (this.scenarioDefinition != undefined) { // 标识为场景编辑入口进入 this.ifFromVariableAdvance = true; } this.itemValueVisible = true; // 关闭页面重新进入需要再做过滤 - if(this.ifFromVariableAdvance && this.$refs.preTree != undefined && this.currentTab == 3){ + if (this.ifFromVariableAdvance && this.$refs.preTree != undefined && this.currentTab == 3) { this.componentActive(this.$refs.preTree.root); } }, prepareData(data) { - if(data != undefined || data != null){ + if (data != undefined || data != null) { this.scenario = data; } if (this.scenario) { @@ -390,11 +444,11 @@ // 获取该节点及所有子节点下的前置提取参数 key/value getExtractDataByNode(data, node) { - if(!node.isLeaf){ - if(node.childNodes.length > 0){ - for(let i=0; i 0) { + for (let i = 0; i < node.childNodes.length; i++) { + if (node.childNodes[i].isLeaf) { //是叶子节点 + if (node.childNodes[i].data.type === 'Extract') { //叶子节点的数据的类型是 提取 let extractJsonParams = (node.childNodes[i].data.json).map(v => { return {name: v.variable, value: v.value, exp: v.expression} }); @@ -411,7 +465,7 @@ } } continue; - }else{ + } else { this.getExtractDataByNode(node.childNodes[i].data, node.childNodes[i]); } } @@ -419,24 +473,24 @@ } }, componentActive(node) { - if(this.ifFromVariableAdvance){ + if (this.ifFromVariableAdvance) { this.setLeafNodeUnVisible(node); } }, // 递归设置不需要显示的叶子节点 setLeafNodeUnVisible(node) { - if(!node.isLeaf){ - if(node.childNodes.length > 0){ - for(let i=0; i 0) { + for (let i = 0; i < node.childNodes.length; i++) { // 提取参数不需要隐藏 - if(node.childNodes[i].isLeaf && node.childNodes[i].level > 1){ + if (node.childNodes[i].isLeaf && node.childNodes[i].level > 1) { node.childNodes[i].visible = false; - if(node.childNodes[i].data.type === 'Extract' && node.data.type !== 'HTTPSamplerProxy'){ + if (node.childNodes[i].data.type === 'Extract' && node.data.type !== 'HTTPSamplerProxy') { node.childNodes[i].visible = true; } - }else{ + } else { // 等待控制器不显示 - if(node.childNodes[i].level == 1 && node.childNodes[i].data.type === 'ConstantTimer'){ + if (node.childNodes[i].level == 1 && node.childNodes[i].data.type === 'ConstantTimer') { node.childNodes[i].visible = false; } this.setLeafNodeUnVisible(node.childNodes[i]); @@ -446,12 +500,12 @@ } }, - getAllExtractDataByNode(){ - if(this.ifFromVariableAdvance){ + getAllExtractDataByNode() { + if (this.ifFromVariableAdvance) { this.selectedNode = undefined; this.selectedTreeNode = undefined; this.scenarioPreRequestParams = []; - if(this.$refs.preTree != undefined){ + if (this.$refs.preTree != undefined) { this.getExtractDataByNode(null, this.$refs.preTree.root); } } @@ -468,7 +522,7 @@ this.itemValue = null; this.itemValuePreview = null; - if(this.ifFromVariableAdvance && this.currentTab === 3){ + if (this.ifFromVariableAdvance && this.currentTab === 3) { // 前置提取屏蔽部分叶子节点 this.componentActive(this.$refs.preTree.root); } @@ -505,18 +559,18 @@ let index = this.mockVariableFuncs.indexOf(itemFunc); this.mockVariableFuncs = this.mockVariableFuncs.slice(0, index); this.mockVariableFuncs.push({name: '', params: []}); - let valindex = this.itemValue.indexOf('|'+func.name); - this.itemValue = this.itemValue.slice(0,valindex); - }else { + let valindex = this.itemValue.indexOf('|' + func.name); + this.itemValue = this.itemValue.slice(0, valindex); + } else { this.methodChange(itemFunc, func); } }, addFunc() { - if(this.itemValue == undefined || this.itemValue == null){ + if (this.itemValue == undefined || this.itemValue == null) { this.$warning(this.$t('api_test.request.parameters_advance_add_mock_error')); return; } - if(this.itemValue.indexOf('@') == -1){ + if (this.itemValue.indexOf('@') == -1) { this.itemValue = '@' + this.itemValue; } else { this.itemValue = this.itemValue; @@ -543,13 +597,13 @@ this.mockVariableFuncs.push({name: '', params: []}); }, saveAdvanced() { - if(this.itemValue != null && this.itemValue != undefined + if (this.itemValue != null && this.itemValue != undefined && this.itemValue.indexOf('@') == -1 - && this.itemValue.indexOf('$') == -1){ + && this.itemValue.indexOf('$') == -1) { this.$set(this.currentItem, 'value', '@' + this.itemValue); } else { this.$set(this.currentItem, 'value', this.itemValue); - if(this.currentItem.mock != undefined){ + if (this.currentItem.mock != undefined) { this.$set(this.currentItem, 'mock', this.itemValue); } } @@ -603,7 +657,7 @@ this.itemValue = '${' + data + '}'; }, handleRowClick(row) { - if(row && row.name){ + if (row && row.name) { this.itemValue = row.name; } }, @@ -648,10 +702,10 @@ }, showNode(node) { - for(let i=0; i 0){ + if (node.hashTree[i].type == 'Extract' && node.type == 'HTTPSamplerProxy' + && this.scenarioPreRequestParams.length > 0) { this.scenarioPreRequestParams = []; break; } @@ -663,8 +717,8 @@ return false; }, filterSonNode(item) { - if(item.type == 'Assertions' || item.type == 'ConstantTimer' - || item.type == 'JDBCPreProcessor' || item.type == 'JDBCPostProcessor'){ + if (item.type == 'Assertions' || item.type == 'ConstantTimer' + || item.type == 'JDBCPreProcessor' || item.type == 'JDBCPostProcessor') { return false; } return true; diff --git a/frontend/src/business/components/api/definition/components/mock/Components/MockApiResponseBody.vue b/frontend/src/business/components/api/definition/components/mock/Components/MockApiResponseBody.vue index 159d1ef608..85f29829a1 100644 --- a/frontend/src/business/components/api/definition/components/mock/Components/MockApiResponseBody.vue +++ b/frontend/src/business/components/api/definition/components/mock/Components/MockApiResponseBody.vue @@ -21,6 +21,7 @@ + :fetch-suggestions="querySearch" @input="change" @change="change" :placeholder="keyText" show-word-limit> @@ -53,6 +55,7 @@ @@ -108,6 +111,12 @@ export default { type: Object, required: true }, + showMockVars: { + type: Boolean, + default() { + return false; + } + }, disabled: { //name不可编辑，根节点name不可编辑,数组元素name不可编辑 type: Boolean, default: false diff --git a/frontend/src/business/components/common/json-schema/schema/editor/mock/MockComplete.vue b/frontend/src/business/components/common/json-schema/schema/editor/mock/MockComplete.vue index 9d39ff0525..56985704cc 100644 --- a/frontend/src/business/components/common/json-schema/schema/editor/mock/MockComplete.vue +++ b/frontend/src/business/components/common/json-schema/schema/editor/mock/MockComplete.vue @@ -12,7 +12,7 @@ @select="change"> - +
@@ -32,6 +32,12 @@ }, disabled: Boolean, scenarioDefinition: Array, + showMockVars: { + type: Boolean, + default() { + return false; + } + }, }, data() { return {