diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue
index 7adee98ff6..22fe460ff9 100644
--- a/frontend/src/business/components/settings/organization/OrganizationMember.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue
@@ -2,7 +2,7 @@
   <div v-loading="result.loading">
     <el-card>
       <template v-slot:header>
-        <ms-table-header :condition.sync="condition" @search="search" @create="create"
+        <ms-table-header :condition.sync="condition" @search="initTableData" @create="create"
                          :create-tip="btnTips" :title="$t('commons.member')"/>
       </template>
       <el-table :data="tableData" style="width: 100%">
@@ -162,9 +162,6 @@
       buildPagePath(path) {
         return path + "/" + this.currentPage + "/" + this.pageSize;
       },
-      search() {
-        this.initTableData();
-      },
       closeFunc() {
         this.form = {};
         this.initTableData();
diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index 8e1de010f3..027c90d6de 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -2,7 +2,7 @@
   <div>
     <el-card v-loading="result.loading">
       <template v-slot:header>
-        <ms-table-header :condition.sync="condition" @search="search" @create="create"
+        <ms-table-header :condition.sync="condition" @search="list" @create="create"
                          :create-tip="btnTips" :title="$t('commons.workspace')"/>
       </template>
       <el-table :data="items" style="width: 100%">
@@ -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>
 
@@ -202,16 +202,13 @@
           type: 'warning'
         }).then(() => {
           this.$get('/workspace/delete/' + row.id, () => {
-            Message.success(this.$t('commons.delete_success'));
+            this.$success(this.$t('commons.delete_success'));
             this.list();
           });
         }).catch(() => {
 
         });
       },
-      search() {
-        this.list();
-      },
       list() {
         let url = '/workspace/list/' + this.currentPage + '/' + this.pageSize;
         let lastOrganizationId = this.currentUser.lastOrganizationId;
@@ -274,7 +271,7 @@
           this.dialogTotal = data.itemCount;
         });
       },
-      wsMemberList() {
+      dialogSearch() {
         let row = this.currentWorkspaceRow;
         this.dialogWsMemberVisible = true;
         let param = this.dialogCondition;
diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue
index 01d3042f3e..6df8ccbebd 100644
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/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>
@@ -220,7 +220,7 @@
         rule: {
           name: [
             {required: true, message: this.$t('organization.input_name'), trigger: 'blur'},
-            {min: 2, max: 10, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'},
+            {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'},
             {
               required: true,
               pattern: /^[\u4e00-\u9fa5_a-zA-Z0-9.·-]+$/,
@@ -295,7 +295,7 @@
           this.dialogTotal = data.itemCount;
         });
       },
-      orgMemberList() {
+      dialogSearch() {
         let row = this.currentRow;
         this.dialogOrgMemberVisible = true;
         let param = this.dialogCondition;
@@ -322,7 +322,7 @@
         }).then(() => {
           this.result = this.$get(this.deletePath + row.id, () => {
             this.$success(this.$t('commons.delete_success'));
-            this.initTableData()
+            this.initTableData();
           });
         }).catch(() => {
           this.$info(this.$t('commons.delete_cancel'));
@@ -343,8 +343,8 @@
         });
       },
       createOrganization(createOrganizationForm) {
-        this.$refs[createOrganizationForm].validate(valide => {
-          if (valide) {
+        this.$refs[createOrganizationForm].validate(valid => {
+          if (valid) {
             this.result = this.$post(this.createPath, this.form, () => {
               this.$success(this.$t('commons.save_success'));
               this.initTableData();
@@ -355,11 +355,11 @@
           }
         })
       },
-      updateOrganization(udpateOrganizationForm) {
-        this.$refs[udpateOrganizationForm].validate(valide => {
-          if (valide) {
+      updateOrganization(updateOrganizationForm) {
+        this.$refs[updateOrganizationForm].validate(valid => {
+          if (valid) {
             this.result = this.$post(this.updatePath, this.form, () => {
-              this.$success(this.$t('commons.modify_success'))
+              this.$success(this.$t('commons.modify_success'));
               this.dialogOrgUpdateVisible = false;
               this.initTableData();
             });
@@ -423,7 +423,7 @@
           organizationId: this.currentRow.id
         }
         this.result = this.$post("/organization/member/update", param, () => {
-          this.$success(this.$t('commons.modify_success'))
+          this.$success(this.$t('commons.modify_success'));
           this.dialogOrgMemberUpdateVisible = false;
           this.cellClick(this.currentRow);
         });
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index f9d652ebab..42b247a3ff 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -2,7 +2,7 @@
   <div>
     <el-card v-loading="result.loading">
       <template v-slot:header>
-        <ms-table-header :condition.sync="condition" @search="search" @create="create"
+        <ms-table-header :condition.sync="condition" @search="list" @create="create"
                          :create-tip="btnTips" :title="$t('commons.workspace')"/>
       </template>
       <!-- workspace table -->
@@ -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;
@@ -324,9 +324,6 @@
         this.memberLineData = [];
         this.list();
       },
-      search() {
-        this.list();
-      },
       list() {
         let url = '/workspace/list/all/' + this.currentPage + '/' + this.pageSize;
         this.result = this.$post(url, this.condition, response => {
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index ac4fcfd490..44bffab1f6 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/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({
-              type: 'success',
-              message: this.$t('commons.delete_success')
-            });
+            this.$success(this.$t('commons.delete_success'));
             this.search();
           });
         }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: this.$t('commons.delete_cancel')
-          });
+          this.$info(this.$t('commons.delete_cancel'));
         });
       },
       createUser(createUserForm) {
-        this.$refs[createUserForm].validate(valide => {
-          if (valide) {
+        this.$refs[createUserForm].validate(valid => {
+          if (valid) {
             this.result = this.$post(this.createPath, this.form, () => {
-              this.$message({
-                type: 'success',
-                message: this.$t('commons.save_success')
-              });
+              this.$success(this.$t('commons.save_success'));
               this.search();
               this.createVisible = false;
             });
@@ -200,13 +191,10 @@
         })
       },
       updateUser(updateUserForm) {
-        this.$refs[updateUserForm].validate(valide => {
-          if (valide) {
+        this.$refs[updateUserForm].validate(valid => {
+          if (valid) {
             this.result = this.$post(this.updatePath, this.form, () => {
-              this.$message({
-                type: 'success',
-                message: this.$t('commons.modify_success')
-              });
+              this.$success(this.$t('commons.modify_success'));
               this.updateVisible = false;
               this.search();
             });
@@ -227,10 +215,7 @@
       },
       changeSwitch(row) {
         this.$post(this.updatePath, row, () => {
-          this.$message({
-            type: 'success',
-            message: this.$t('commons.modify_success')
-          });
+          this.$success(this.$t('commons.modify_success'));
         })
       },
       buildPagePath(path) {
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index 3734d48a2f..0cb53f56bd 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@@ -2,7 +2,7 @@
   <div v-loading="result.loading">
     <el-card>
       <template v-slot:header>
-        <ms-table-header :condition.sync="condition" @search="search" @create="create"
+        <ms-table-header :condition.sync="condition" @search="initTableData" @create="create"
                          :create-tip="btnTips" :title="$t('commons.member')"/>
       </template>
       <el-table :data="tableData" style="width: 100%">
@@ -167,15 +167,12 @@
       buildPagePath(path) {
         return path + "/" + this.currentPage + "/" + this.pageSize;
       },
-      search() {
-        this.initTableData();
-      },
       closeFunc() {
         this.form = {};
         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 +221,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 => {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index f25ae951ce..379332d50e 100644
--- a/frontend/src/i18n/en-US.js
+++ b/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',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index e458d0527e..648af7a4bc 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/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': '创建组织',