diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index 8e1de010f3..469e27bbd5 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -46,7 +46,7 @@
-
@@ -69,7 +69,7 @@
-
@@ -274,7 +274,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..a51d3a5152 100644
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/frontend/src/business/components/settings/system/Organization.vue
@@ -32,7 +32,7 @@
-
@@ -55,7 +55,7 @@
-
@@ -295,7 +295,7 @@
this.dialogTotal = data.itemCount;
});
},
- orgMemberList() {
+ dialogSearch() {
let row = this.currentRow;
this.dialogOrgMemberVisible = true;
let param = this.dialogCondition;
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index f9d652ebab..222c2e00f2 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -87,7 +87,7 @@
-
@@ -110,7 +110,7 @@
-
@@ -262,7 +262,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/User.vue b/frontend/src/business/components/settings/system/User.vue
index ac4fcfd490..f428580b78 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.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;
});
@@ -203,10 +194,7 @@
this.$refs[updateUserForm].validate(valide => {
if (valide) {
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..4f43bfa397 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/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 => {
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': '创建组织',