修改组织成员提示

frontend/src/business/components/common/components/MsTableOperator.vue

@@ -5,6 +5,9 @@
     <slot name="middle"></slot>
     <ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" type="danger" @exec="deleteClick" @click.stop="deleteClickStop"/>
     <slot name="behind"></slot>
+<!--
+    <ms-table-operator-button :tip="$t('commons.remove')" icon="el-icon-s-fold" type="danger" @exec="removeClick" @click.stop="removeClickStop"/>
+-->
   </span>
 
 </template>
@@ -26,7 +29,13 @@
         },
         deleteClickStop() {
           this.$emit('deleteClickStop');
-        }
+        },
+        /* removeClick(){
+            this.$emit('removeClick');
+          },
+          removeClickStop(){
+            this.$emit('removeClickStop')
+          }*/
       }
     }
 </script>

frontend/src/business/components/settings/system/Organization.vue

@@ -42,7 +42,14 @@
         </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-s-fold" @exec="delMember(scope.row)"/>
+
+
+            <!--<el-tooltip class="item" effect="dark" :content="$t('commons.remove')" placement="bottom">
+              <el-button :icon="el-icon-remove-outline">下边</el-button>
+            </el-tooltip>-->
           </template>
         </el-table-column>
       </el-table>
@@ -173,13 +180,22 @@
   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 {getCurrentOrganizationId, getCurrentUser, refreshSessionAndCookies} from "../../../../common/js/utils";
   import {DEFAULT, ORGANIZATION} from "../../../../common/js/constants";
 
   export default {
     name: "MsOrganization",
-    components: {MsCreateBox, MsTablePagination, MsTableHeader, MsRolesTag, MsTableOperator, MsDialogFooter},
+    components: {
+      MsCreateBox,
+      MsTablePagination,
+      MsTableHeader,
+      MsRolesTag,
+      MsTableOperator,
+      MsDialogFooter,
+      MsTableOperatorButton
+    },
     data() {
       return {
         queryPath: '/organization/list',
@@ -324,7 +340,7 @@
         });
       },
       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'
@@ -337,11 +353,11 @@
               let sign = ORGANIZATION;
               refreshSessionAndCookies(sign, sourceId);
             }
-            this.$success(this.$t('commons.delete_success'))
+            this.$success(this.$t('commons.remove_success'))
             this.cellClick(this.currentRow);
           });
         }).catch(() => {
-          this.$info(this.$t('commons.delete_cancel'));
+          this.$info(this.$t('commons.remove_cancel'));
         });
       },
       createOrganization(createOrganizationForm) {

frontend/src/business/components/settings/system/SystemWorkspace.vue

@@ -100,7 +100,9 @@
         </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-s-fold" @exec="delMember(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
@@ -194,13 +196,22 @@
   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";
   import {DEFAULT, WORKSPACE} from "../../../../common/js/constants";
 
   export default {
     name: "MsSystemWorkspace",
-    components: {MsCreateBox, MsTablePagination, MsTableHeader, MsRolesTag, MsTableOperator, MsDialogFooter},
+    components: {
+      MsCreateBox,
+      MsTablePagination,
+      MsTableHeader,
+      MsRolesTag,
+      MsTableOperator,
+      MsDialogFooter,
+      MsTableOperatorButton
+    },
     activated() {
       this.list();
     },
@@ -376,7 +387,7 @@
         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'
@@ -389,11 +400,11 @@
               let sign = WORKSPACE;
               refreshSessionAndCookies(sign, sourceId);
             }
-            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'));
         });
       },
       updateWorkspaceMember() {

frontend/src/i18n/en-US.js

@@ -88,6 +88,9 @@ export default {
     'weeks_5': 'Fri',
     'weeks_6': 'Sat',
     'test_unit': 'tests',
+    'remove': 'Remove',
+    'remove_cancel': 'Remove Failed',
+    'remove_success': 'Remove Success'
   },
   workspace: {
     'create': 'Create Workspace',
@@ -143,6 +146,7 @@ export default {
     'password_format_is_incorrect': 'Password format is incorrect (At least 8-16 characters, at least 1 uppercase letter, 1 lowercase letter and 1 number)',
     'old_password': 'Old Password',
     'new_password': 'New Password',
+    'remove_member': 'Are you sure you want to remove this member'
   },
   user: {
     'create': 'Create',

frontend/src/i18n/zh-CN.js

@@ -87,6 +87,9 @@ export default {
     'host_cannot_be_empty': '主机不能为空',
     'port_cannot_be_empty': '端口号不能为空',
     'account_cannot_be_empty': '帐户不能为空',
+    'remove': '移除',
+    'remove_cancel': '移除失败',
+    'remove_success': '移除成功'
   },
   workspace: {
     'create': '创建工作空间',
@@ -141,6 +144,7 @@ export default {
     'password_format_is_incorrect': '密码格式不正确(至少8-16个字符，至少1个大写字母，1个小写字母和1个数字)',
     'old_password': '旧密码',
     'new_password': '新密码',
+    'remove_member': '确定要移除该成员吗'
   },
   user: {
     'create': '创建用户',