From def79b1de064a67241b3c02ae36a8fea5456deac Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 26 May 2020 09:49:38 +0800
Subject: [PATCH] ..

---
 .../organization/OrganizationWorkspace.vue    | 23 +++++++++++++++----
 .../settings/system/Organization.vue          |  3 ++-
 .../system/SystemParameterSetting.vue         |  2 +-
 .../settings/system/SystemWorkspace.vue       |  3 ++-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index 0f9f1dc56e..5d6ab25502 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -56,7 +56,11 @@
         </el-table-column>
         <el-table-column :label="$t('commons.operating')">
           <template v-slot:default="scope">
-            <ms-table-operator @editClick="editMember(scope.row)" @deleteClick="delMember(scope.row)"/>
+            <!--<ms-table-operator @editClick="editMember(scope.row)" @deleteClick="delMember(scope.row)"/>-->
+            <ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-edit" @exec="editMember(scope.row)"/>
+            <ms-table-operator-button :tip="$t('commons.remove')" icon="el-icon-delete" type="danger"
+                                      @exec="delMember(scope.row)"/>
+
           </template>
         </el-table-column>
       </el-table>
@@ -150,12 +154,21 @@
   import MsTableHeader from "../../common/components/MsTableHeader";
   import MsRolesTag from "../../common/components/MsRolesTag";
   import MsTableOperator from "../../common/components/MsTableOperator";
+  import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
   import MsDialogFooter from "../../common/components/MsDialogFooter";
   import {getCurrentUser, getCurrentWorkspaceId, refreshSessionAndCookies} from "../../../../common/js/utils";
 
   export default {
     name: "MsOrganizationWorkspace",
-    components: {MsCreateBox, MsTablePagination, MsTableHeader, MsRolesTag, MsTableOperator, MsDialogFooter},
+    components: {
+      MsCreateBox,
+      MsTablePagination,
+      MsTableHeader,
+      MsRolesTag,
+      MsTableOperator,
+      MsDialogFooter,
+      MsTableOperatorButton
+    },
     activated() {
       this.list();
     },
@@ -327,17 +340,17 @@
         this.$set(this.memberForm, 'roleIds', roleIds);
       },
       delMember(row) {
-        this.$confirm(this.$t('member.delete_confirm'), '', {
+        this.$confirm(this.$t('member.remove_member'), '', {
           confirmButtonText: this.$t('commons.confirm'),
           cancelButtonText: this.$t('commons.cancel'),
           type: 'warning'
         }).then(() => {
           this.result = this.$get('/user/ws/member/delete/' + this.currentWorkspaceRow.id + '/' + row.id, () => {
-            this.$success(this.$t('commons.delete_success'));
+            this.$success(this.$t('commons.remove_success'));
             this.cellClick(this.currentWorkspaceRow);
           });
         }).catch(() => {
-          this.$info(this.$t('commons.delete_cancel'));
+          this.$info(this.$t('commons.remove_cancel'));
         });
       },
       updateOrgMember() {
diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue
index 4b7c9aeace..ebefc1ac90 100644
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/frontend/src/business/components/settings/system/Organization.vue
@@ -44,7 +44,8 @@
           <template v-slot:default="scope">
             <!--<ms-table-operator @editClick="editMember(scope.row)" @deleteClick="delMember(scope.row)"/>-->
             <ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-edit" @exec="editMember(scope.row)"/>
-            <ms-table-operator-button :tip="$t('commons.remove')" icon="el-icon-s-fold" @exec="delMember(scope.row)"/>
+            <ms-table-operator-button :tip="$t('commons.remove')" icon="el-icon-delete" type="danger"
+                                      @exec="delMember(scope.row)"/>
 
 
             <!--<el-tooltip class="item" effect="dark" :content="$t('commons.remove')" placement="bottom">
diff --git a/frontend/src/business/components/settings/system/SystemParameterSetting.vue b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
index 1350ad0dac..e993f612a4 100644
--- a/frontend/src/business/components/settings/system/SystemParameterSetting.vue
+++ b/frontend/src/business/components/settings/system/SystemParameterSetting.vue
@@ -76,7 +76,7 @@
         formInline: {
           host: 'smtp.163.com',
           port: '465',
-          account: 'xjj0608@153.com',
+          account: 'xjj0608@163.com',
           password: '2345678',
         },
         result: {},
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index 4299ad1aba..21e07f050c 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -102,7 +102,8 @@
           <template v-slot:default="scope">
             <!--<ms-table-operator @editClick="editMember(scope.row)" @deleteClick="delMember(scope.row)"/>-->
             <ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-edit" @exec="editMember(scope.row)"/>
-            <ms-table-operator-button :tip="$t('commons.remove')" icon="el-icon-s-fold" @exec="delMember(scope.row)"/>
+            <ms-table-operator-button :tip="$t('commons.remove')" icon="el-icon-delete" type="danger"
+                                      @exec="delMember(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>