diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index 61397c1672..1fe20ba15a 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit 61397c16728a63493507679f7e0940d9099f337f +Subproject commit 1fe20ba15a7ca3fe9f77ddf866021e7c7dfe5969 diff --git a/frontend/src/business/components/api/automation/report/components/RequestResult.vue b/frontend/src/business/components/api/automation/report/components/RequestResult.vue index 81c067ed34..6631e69395 100644 --- a/frontend/src/business/components/api/automation/report/components/RequestResult.vue +++ b/frontend/src/business/components/api/automation/report/components/RequestResult.vue @@ -67,6 +67,7 @@ methods: { active() { this.isActive = !this.isActive; + console.log(this.request) //this.$emit("requestResult", {request: this.request, scenarioName: this.scenarioName}); } }, diff --git a/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue b/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue index 97ed21bb7b..cbc5a58c8f 100644 --- a/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue +++ b/frontend/src/business/components/api/automation/report/components/RequestResultTail.vue @@ -41,7 +41,7 @@
- @@ -68,10 +68,11 @@ import MsRequestText from "./RequestText"; import MsResponseText from "./ResponseText"; import MsRequestResult from "./RequestResult"; + import MsRequestSubResult from "./RequestSubResult"; export default { name: "MsRequestResultTail", - components: {MsResponseText, MsRequestText, MsAssertionResults, MsRequestMetric, MsRequestResult}, + components: {MsResponseText, MsRequestText, MsAssertionResults, MsRequestMetric, MsRequestResult,MsRequestSubResult}, props: { request: Object, scenarioName: String, diff --git a/frontend/src/business/components/api/automation/report/components/RequestSubResult.vue b/frontend/src/business/components/api/automation/report/components/RequestSubResult.vue new file mode 100644 index 0000000000..b65bc1afd4 --- /dev/null +++ b/frontend/src/business/components/api/automation/report/components/RequestSubResult.vue @@ -0,0 +1,144 @@ + + + + + diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue index edbd91f712..acb20511ca 100644 --- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue +++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue @@ -99,7 +99,7 @@ "children": [], }, { "id": "root", - "name": "默认模块", + "name": "全部模块", "level": 0, "children": [], }] diff --git a/frontend/src/business/components/api/definition/model/JsonData.js b/frontend/src/business/components/api/definition/model/JsonData.js index 60c3d8b8fb..9a1f8d2d1d 100644 --- a/frontend/src/business/components/api/definition/model/JsonData.js +++ b/frontend/src/business/components/api/definition/model/JsonData.js @@ -20,7 +20,7 @@ export const DEFAULT_DATA = [{ "children": [], },{ "id": "root", - "name": "默认模块", + "name": "全部模块", "level": 0, "children": [], }]