From 6dc6cc8459b41427aba520674cbc84e8442a92c6 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Fri, 8 May 2020 16:05:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../settings/organization/OrganizationMember.vue | 7 +++---- .../components/settings/personal/PersonSetting.vue | 4 ++-- .../src/business/components/settings/system/User.vue | 6 +++--- .../components/settings/workspace/WorkspaceMember.vue | 10 +++++----- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue index c14d93551f..17443d1d5b 100644 --- a/frontend/src/business/components/settings/organization/OrganizationMember.vue +++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue @@ -25,7 +25,7 @@ + @close="handleClose"> + @close="handleClose"> @@ -161,9 +161,8 @@ buildPagePath(path) { return path + "/" + this.currentPage + "/" + this.pageSize; }, - closeFunc() { + handleClose() { this.form = {}; - this.initTableData(); }, edit(row) { this.updateVisible = true; diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue index 5ba794f2bf..bf35935bc4 100644 --- a/frontend/src/business/components/settings/personal/PersonSetting.vue +++ b/frontend/src/business/components/settings/personal/PersonSetting.vue @@ -28,7 +28,7 @@ + :destroy-on-close="true" @close="handleClose"> @@ -135,7 +135,7 @@ this.tableData = dataList; }) }, - closeFunc() { + handleClose() { this.form = {}; } } diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue index 127b87d080..dbdfb58de8 100644 --- a/frontend/src/business/components/settings/system/User.vue +++ b/frontend/src/business/components/settings/system/User.vue @@ -40,7 +40,7 @@ - @@ -65,7 +65,7 @@ + @close="handleClose"> @@ -211,7 +211,7 @@ this.tableData = data.listObject; }) }, - closeFunc() { + handleClose() { this.form = {}; }, changeSwitch(row) { diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue index 04ee8d7bc8..621f2fd1a3 100644 --- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue +++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue @@ -16,7 +16,8 @@ @@ -25,7 +26,7 @@ + @close="handleClose"> + @close="handleClose"> @@ -168,9 +169,8 @@ buildPagePath(path) { return path + "/" + this.currentPage + "/" + this.pageSize; }, - closeFunc() { + handleClose() { this.form = {}; - this.initTableData(); }, del(row) { this.$confirm(this.$t('member.delete_confirm'), '', { From 62ee448245f166ce5f3440c4823846319618eb29 Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Fri, 8 May 2020 17:07:55 +0800 Subject: [PATCH 2/4] demo --- .../components/PerformanceAdvancedConfig.vue | 165 ++++++++++-------- .../components/PerformancePressureConfig.vue | 14 ++ frontend/src/i18n/en-US.js | 2 + frontend/src/i18n/zh-CN.js | 2 + 4 files changed, 111 insertions(+), 72 deletions(-) diff --git a/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue b/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue index 85d36b88aa..9bd3a408d4 100644 --- a/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue +++ b/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue @@ -1,28 +1,35 @@