修改消息提示

frontend/src/business/components/settings/organization/OrganizationWorkspace.vue

@@ -46,7 +46,7 @@
 
     <!-- dialog of workspace member -->
     <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc">
-      <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="wsMemberList"
+      <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
                        :create-tip="dialogBtnTips" :title="$t('commons.member')"/>
       <!-- organization member table -->
       <el-table :data="memberLineData" style="width: 100%;margin-top: 5px;">
@@ -69,7 +69,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <ms-table-pagination :change="wsMemberList" :current-page.sync="dialogCurrentPage" :page-size.sync="dialogPageSize"
+      <ms-table-pagination :change="dialogSearch" :current-page.sync="dialogCurrentPage" :page-size.sync="dialogPageSize"
                            :total="dialogTotal"/>
     </el-dialog>
 
@@ -274,7 +274,7 @@
           this.dialogTotal = data.itemCount;
         });
       },
-      wsMemberList() {
+      dialogSearch() {
         let row = this.currentWorkspaceRow;
         this.dialogWsMemberVisible = true;
         let param = this.dialogCondition;

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

@@ -32,7 +32,7 @@
 
     <!-- dialog of organization member -->
     <el-dialog :visible.sync="dialogOrgMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc">
-      <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="orgMemberList"
+      <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
                        :create-tip="dialogBtnTips" :title="$t('commons.member')"/>
       <!-- organization member table -->
       <el-table :data="memberLineData" style="width: 100%;margin-top:5px;">
@@ -55,7 +55,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <ms-table-pagination :change="orgMemberList" :current-page.sync="dialogCurrentPage"
+      <ms-table-pagination :change="dialogSearch" :current-page.sync="dialogCurrentPage"
                            :page-size.sync="dialogPageSize"
                            :total="dialogTotal"/>
     </el-dialog>
@@ -295,7 +295,7 @@
           this.dialogTotal = data.itemCount;
         });
       },
-      orgMemberList() {
+      dialogSearch() {
         let row = this.currentRow;
         this.dialogOrgMemberVisible = true;
         let param = this.dialogCondition;

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

@@ -87,7 +87,7 @@
 
     <!-- dialog of workspace member -->
     <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc">
-      <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="wsMemberList"
+      <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
                        :create-tip="dialogBtnTips" :title="$t('commons.member')"/>
       <!-- organization member table -->
       <el-table :data="memberLineData" style="width: 100%;margin-top: 5px;">
@@ -110,7 +110,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <ms-table-pagination :change="wsMemberList" :current-page.sync="dialogCurrentPage"
+      <ms-table-pagination :change="dialogSearch" :current-page.sync="dialogCurrentPage"
                            :page-size.sync="dialogPageSize"
                            :total="dialogTotal"/>
     </el-dialog>
@@ -262,7 +262,7 @@
           this.dialogTotal = data.itemCount;
         });
       },
-      wsMemberList() {
+      dialogSearch() {
         let row = this.currentWorkspaceRow;
         this.dialogWsMemberVisible = true;
         let param = this.dialogCondition;

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

@@ -170,27 +170,18 @@
           type: 'warning'
         }).then(() => {
           this.result = this.$get(this.deletePath + row.id, () => {
-            this.$message({
+            this.$success(this.$t('commons.delete_success'));
-              type: 'success',
-              message: this.$t('commons.delete_success')
-            });
             this.search();
           });
         }).catch(() => {
-          this.$message({
+          this.$info(this.$t('commons.delete_cancel'));
-            type: 'info',
-            message: this.$t('commons.delete_cancel')
-          });
         });
       },
       createUser(createUserForm) {
         this.$refs[createUserForm].validate(valide => {
           if (valide) {
             this.result = this.$post(this.createPath, this.form, () => {
-              this.$message({
+              this.$success(this.$t('commons.save_success'));
-                type: 'success',
-                message: this.$t('commons.save_success')
-              });
               this.search();
               this.createVisible = false;
             });
@@ -203,10 +194,7 @@
         this.$refs[updateUserForm].validate(valide => {
           if (valide) {
             this.result = this.$post(this.updatePath, this.form, () => {
-              this.$message({
+              this.$success(this.$t('commons.modify_success'));
-                type: 'success',
-                message: this.$t('commons.modify_success')
-              });
               this.updateVisible = false;
               this.search();
             });
@@ -227,10 +215,7 @@
       },
       changeSwitch(row) {
         this.$post(this.updatePath, row, () => {
-          this.$message({
+          this.$success(this.$t('commons.modify_success'));
-            type: 'success',
-            message: this.$t('commons.modify_success')
-          });
         })
       },
       buildPagePath(path) {

frontend/src/business/components/settings/workspace/WorkspaceMember.vue

@@ -175,7 +175,7 @@
         this.initTableData();
       },
       del(row) {
-        this.$confirm('移除该成员, 是否继续?', '提示', {
+        this.$confirm(this.$t('member.delete_confirm'), '', {
           confirmButtonText: this.$t('commons.confirm'),
           cancelButtonText: this.$t('commons.cancel'),
           type: 'warning'
@@ -224,7 +224,7 @@
         };
         let wsId = this.currentUser().lastWorkspaceId;
         if (typeof wsId == "undefined" || wsId == null || wsId == "") {
-          this.$warning("请先选择工作空间!");
+          this.$warning(this.$t('workspace.please_select_a_workspace_first'));
           return false;
         }
         this.$post('/user/org/member/list/all', param, response => {

frontend/src/i18n/en-US.js

@@ -60,6 +60,7 @@ export default {
     'search_by_name': 'Search by name',
     'organization_name': 'Organization Name',
     'please_choose_organization': 'Please Choose Organization',
+    'please_select_a_workspace_first': 'Please select a workspace first!',
   },
   organization: {
     'create': 'Create',

frontend/src/i18n/zh-CN.js

@@ -62,6 +62,7 @@ export default {
     'search_by_name': '根据名称搜索',
     'organization_name': '所属组织',
     'please_choose_organization': '请选择组织',
+    'please_select_a_workspace_first': '请先选择工作空间！',
   },
   organization: {
     'create': '创建组织',