From 58cfcb13fff6607599ca678cae898526cdd21157 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 4 Aug 2020 17:27:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E5=91=98=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=E5=BC=B9=E6=A1=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/OrganizationWorkspace.vue    | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index 86aecf23b6..890af868c3 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -39,9 +39,25 @@
           @confirm="submit('form')"/>
       </template>
     </el-dialog>
+    <el-dialog :title="$t('workspace.update')" :visible.sync="dialogWsUpdateVisible" width="30%">
+      <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="100px" size="small">
+        <el-form-item :label="$t('commons.name')" prop="name">
+          <el-input v-model="form.name" autocomplete="off"/>
+        </el-form-item>
+        <el-form-item :label="$t('commons.description')" prop="description">
+          <el-input type="textarea" v-model="form.description"></el-input>
+        </el-form-item>
+      </el-form>
+      <template v-slot:footer>
+        <ms-dialog-footer
+          @cancel="dialogWsUpdateVisible = false"
+          @confirm="submit('form')"/>
+      </template>
+    </el-dialog>
 
     <!-- dialog of workspace member -->
-    <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc" class="dialog-css">
+    <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc"
+               class="dialog-css">
       <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
                        :create-tip="$t('member.create')" :title="$t('commons.member')"/>
       <!-- organization member table -->
@@ -201,8 +217,13 @@
             }
             this.$post("/workspace/" + saveType, this.form, () => {
               this.dialogWsAddVisible = false;
+              this.dialogWsUpdateVisible = false;
               this.list();
-              Message.success(this.$t('commons.save_success'));
+              if (saveType == 'add') {
+                Message.success(this.$t('commons.save_success'));
+              } else if (saveType == 'update') {
+                Message.success(this.$t('commons.modify_success'));
+              }
             });
           } else {
             return false;
@@ -210,7 +231,7 @@
         });
       },
       edit(row) {
-        this.dialogWsAddVisible = true;
+        this.dialogWsUpdateVisible = true;
         this.form = Object.assign({}, row);
       },
       handleDelete(workspace) {
@@ -423,6 +444,7 @@
       return {
         result: {},
         dialogWsAddVisible: false,
+        dialogWsUpdateVisible: false,
         dialogWsMemberVisible: false,
         dialogWsMemberAddVisible: false,
         dialogWsMemberUpdateVisible: false,