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:
fit2-zhao 2021-03-26 11:21:38 +08:00
parent 6257fce4a9
commit ba76c82851
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
View File

@ -577,7 +577,7 @@
recursiveSorting(arr, scenarioProjectId) { recursiveSorting(arr, scenarioProjectId) {
for (let i in arr) { for (let i in arr) {
arr[i].index = Number(i) + 1; arr[i].index = Number(i) + 1;
if (arr[i].type === ELEMENT_TYPE.LoopController && arr[i].hashTree && arr[i].hashTree.length > 1) { if (arr[i].type === ELEMENT_TYPE.LoopController && arr[i].loopType === "LOOP_COUNT" && arr[i].hashTree && arr[i].hashTree.length > 1) {
arr[i].countController.proceed = true; arr[i].countController.proceed = true;
} }
if (!arr[i].projectId) { if (!arr[i].projectId) {

2
frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
View File

@ -45,7 +45,7 @@
this.$emit('remove'); this.$emit('remove');
break; break;
case "scenarioVar": case "scenarioVar":
this.$refs.scenarioParameters.open(this.data.variables, this.data.headers, true); this.$refs.scenarioParameters.open(this.data.variables, this.data.headers, this.data.referenced === 'REF');
break; break;
case "openScenario": case "openScenario":
this.getScenario(); this.getScenario();

2
frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
View File

@ -493,7 +493,7 @@
recursiveSorting(arr, scenarioProjectId) { recursiveSorting(arr, scenarioProjectId) {
for (let i in arr) { for (let i in arr) {
arr[i].index = Number(i) + 1; arr[i].index = Number(i) + 1;
if (arr[i].type === ELEMENT_TYPE.LoopController && arr[i].hashTree && arr[i].hashTree.length > 1) { if (arr[i].type === ELEMENT_TYPE.LoopController && arr[i].loopType === "LOOP_COUNT" && arr[i].hashTree && arr[i].hashTree.length > 1) {
arr[i].countController.proceed = true; arr[i].countController.proceed = true;
} }
if (!arr[i].projectId) { if (!arr[i].projectId) {

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 2115bd28a90854d2b6276a90878934715498c584 Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd