From a21c611d35c423c5c98818cb3766d21d3a03d7ab Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Wed, 31 Mar 2021 12:12:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E5=9C=BA=E6=99=AF=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E8=BF=90=E8=A1=8C=E7=8E=AF=E5=A2=83=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/automation/scenario/EnvSelect.vue | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue index eb202c6082..6340706b4d 100644 --- a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue +++ b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue @@ -54,20 +54,23 @@ methods: { init() { this.projectIds.forEach(id => { - let item = {id: id, envs: [], selectEnv: ""}; - this.data.push(item); - this.result = this.$get('/api/environment/list/' + id, res => { - let envs = res.data; - envs.forEach(environment => { - parseEnvironment(environment); - }); - // 固定环境列表渲染顺序 - let temp = this.data.find(dt => dt.id === id); - temp.envs = envs; - let envId = this.envMap.get(id); - // 选中环境是否存在 - temp.selectEnv = envs.filter(e => e.id === envId).length === 0 ? null : envId; - }) + const project = this.projectList.find(p => p.id === id); + if (project) { + let item = {id: id, envs: [], selectEnv: ""}; + this.data.push(item); + this.result = this.$get('/api/environment/list/' + id, res => { + let envs = res.data; + envs.forEach(environment => { + parseEnvironment(environment); + }); + // 固定环境列表渲染顺序 + let temp = this.data.find(dt => dt.id === id); + temp.envs = envs; + let envId = this.envMap.get(id); + // 选中环境是否存在 + temp.selectEnv = envs.filter(e => e.id === envId).length === 0 ? null : envId; + }) + } }) }, open() { From 71c512174dc838a3f97d5b7b62efc29189c1a7ec Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Wed, 31 Mar 2021 12:22:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=81=B6=E5=B0=94=E4=BC=9A=E4=BC=A0=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../performance/test/components/ExistFiles.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/src/business/components/performance/test/components/ExistFiles.vue b/frontend/src/business/components/performance/test/components/ExistFiles.vue index e264843c2b..b2cd851e1a 100644 --- a/frontend/src/business/components/performance/test/components/ExistFiles.vue +++ b/frontend/src/business/components/performance/test/components/ExistFiles.vue @@ -173,11 +173,12 @@ export default { updateTime: row.lastModified, }); } + // + rows.forEach(row => { + this.fileList.push(row); + }) if (this.loadType === 'resource') { - rows.forEach(row => { - this.fileList.push(row); - }) this.$success(this.$t('test_track.case.import.success')); this.close(); return; @@ -197,8 +198,6 @@ export default { tg.options = {}; this.scenarios.push(tg); }); - let file = new File([d.jmx], d.name); - this.uploadList.push(file); }); this.$emit('fileChange', this.scenarios); From 8c7e941ee40bc21f50bad1efed95b70d03fc6c1f Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Wed, 31 Mar 2021 12:24:38 +0800 Subject: [PATCH 3/3] chore: sync --- frontend/src/business/components/xpack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 07951ba17a..a37e6bb56f 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd +Subproject commit a37e6bb56ffaa7ecc4ee128640e9415304ad41b6