From 7d586af28be09efcc6b56b65f7fbe5aa9e35fc3e Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 8 May 2020 15:34:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/organization/OrganizationMember.vue      |  2 +-
 .../settings/organization/OrganizationWorkspace.vue   |  4 ++--
 .../components/settings/personal/PersonSetting.vue    |  2 +-
 .../components/settings/system/Organization.vue       |  4 ++--
 .../components/settings/system/SystemWorkspace.vue    | 11 ++++-------
 .../src/business/components/settings/system/User.vue  |  2 +-
 .../components/settings/workspace/WorkspaceMember.vue |  2 +-
 7 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue
index a820cac769..c14d93551f 100644
--- a/frontend/src/business/components/settings/organization/OrganizationMember.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue
@@ -167,7 +167,7 @@
       },
       edit(row) {
         this.updateVisible = true;
-        this.form = row;
+        this.form = Object.assign({}, row);
         let roleIds = this.form.roles.map(r => r.id);
         this.result = this.$get('/role/list/org', response => {
           this.$set(this.form, "allroles", response.data);
diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index 21d8c4f64b..612d331dbd 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -193,7 +193,7 @@
       },
       edit(row) {
         this.dialogWsAddVisible = true;
-        this.form = row;
+        this.form = Object.assign({}, row);
       },
       del(row) {
         this.$confirm(this.$t('workspace.delete_confirm'), '', {
@@ -317,7 +317,7 @@
       },
       editMember(row) {
         this.dialogWsMemberUpdateVisible = true;
-        this.memberForm = row;
+        this.memberForm = Object.assign({}, row);
         let roleIds = this.memberForm.roles.map(r => r.id);
         this.result = this.$get('/role/list/test', response => {
           this.$set(this.memberForm, "allroles", response.data);
diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
index a021e33f2c..5ba794f2bf 100644
--- a/frontend/src/business/components/settings/personal/PersonSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonSetting.vue
@@ -110,7 +110,7 @@
       },
       edit(row) {
         this.updateVisible = true;
-        this.form = row;
+        this.form = Object.assign({}, row);
       },
       updateUser(updateUserForm) {
         this.$refs[updateUserForm].validate(valide => {
diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue
index c840c6d01e..ef7944015a 100644
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/frontend/src/business/components/settings/system/Organization.vue
@@ -258,11 +258,11 @@
       },
       edit(row) {
         this.dialogOrgUpdateVisible = true;
-        this.form = row;
+        this.form = Object.assign({}, row);
       },
       editMember(row) {
         this.dialogOrgMemberUpdateVisible = true;
-        this.memberForm = row;
+        this.memberForm = Object.assign({}, row);
         let roleIds = this.memberForm.roles.map(r => r.id);
         this.result = this.$get('/role/list/org', response => {
           this.$set(this.memberForm, "allroles", response.data);
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index cf8a4d2d4a..b6da351f7f 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -113,7 +113,7 @@
     <!-- add workspace member dialog -->
     <el-dialog :title="$t('member.create')" :visible.sync="dialogWsMemberAddVisible" width="30%"
                :destroy-on-close="true"
-               @close="closeWsMemberAddDialog">
+               @close="handleClose">
       <el-form :model="memberForm" ref="form" :rules="wsMemberRule" label-position="right" label-width="100px"
                size="small">
         <el-form-item :label="$t('commons.member')" prop="userIds">
@@ -153,7 +153,7 @@
     <!-- update workspace member dialog -->
     <el-dialog :title="$t('member.modify')" :visible.sync="dialogWsMemberUpdateVisible" width="30%"
                :destroy-on-close="true"
-               @close="closeWsMemberUpdateDialog">
+               @close="handleClose">
       <el-form :model="memberForm" label-position="right" label-width="100px" size="small" ref="updateUserForm">
         <el-form-item label="ID" prop="id">
           <el-input v-model="memberForm.id" autocomplete="off" :disabled="true"/>
@@ -318,16 +318,13 @@
 
         });
       },
-      closeWsMemberAddDialog() {
+      handleClose() {
         this.memberForm = {};
       },
       closeWsMemberDialog() {
         this.memberLineData = [];
         this.list();
       },
-      closeWsMemberUpdateDialog() {
-        this.dialogSearch();
-      },
       list() {
         let url = '/workspace/list/all/' + this.currentPage + '/' + this.pageSize;
         this.result = this.$post(url, this.condition, response => {
@@ -366,7 +363,7 @@
       },
       editMember(row) {
         this.dialogWsMemberUpdateVisible = true;
-        this.memberForm = row;
+        this.memberForm = Object.assign({}, row);
         let roleIds = this.memberForm.roles.map(r => r.id);
         this.result = this.$get('/role/list/test', response => {
           this.$set(this.memberForm, "allroles", response.data);
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 279b85543e..127b87d080 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -162,7 +162,7 @@
       },
       edit(row) {
         this.updateVisible = true;
-        this.form = row;
+        this.form = Object.assign({}, row);
       },
       del(row) {
         this.$confirm(this.$t('user.delete_confirm'), '', {
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index 8bdeda0f97..04ee8d7bc8 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@@ -191,7 +191,7 @@
       },
       edit(row) {
         this.updateVisible = true;
-        this.form = row;
+        this.form = Object.assign({}, row);
         let roleIds = this.form.roles.map(r => r.id);
         this.result = this.$get('/role/list/test', response => {
           this.$set(this.form, "allroles", response.data);