diff --git a/frontend/src/business/components/common/components/MsTableOperator.vue b/frontend/src/business/components/common/components/MsTableOperator.vue
index ac95e046d2..c0917e6779 100644
--- a/frontend/src/business/components/common/components/MsTableOperator.vue
+++ b/frontend/src/business/components/common/components/MsTableOperator.vue
@@ -1,13 +1,10 @@
-
+
-
+
-
@@ -17,6 +14,20 @@
export default {
name: "MsTableOperator",
components: {MsTableOperatorButton},
+ props: {
+ tip1: {
+ type: String,
+ default() {
+ return this.$t('commons.edit');
+ }
+ },
+ tip2: {
+ type: String,
+ default() {
+ return this.$t('commons.delete');
+ }
+ }
+ },
methods: {
editClick() {
this.$emit('editClick');
diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue
index 4a52b8d431..1444ed8c21 100644
--- a/frontend/src/business/components/settings/organization/OrganizationMember.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue
@@ -16,7 +16,7 @@
-
+
@@ -191,17 +191,17 @@
});
},
del(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/org/member/delete/' + this.currentUser().lastOrganizationId + '/' + row.id, () => {
- this.$success(this.$t('commons.delete_success'));
+ this.$success(this.$t('commons.remove_success'));
this.initTableData();
});
}).catch(() => {
- this.$info(this.$t('commons.delete_cancel'))
+ this.$info(this.$t('commons.remove_cancel'))
});
},
create() {
diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index 9f781803cc..26a939edac 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -56,11 +56,7 @@
-
-
-
-
+
diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue
index ebefc1ac90..025f45c51b 100644
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/frontend/src/business/components/settings/system/Organization.vue
@@ -42,15 +42,7 @@
-
-
-
-
-
-
+
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index 21e07f050c..cb3d60961a 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -100,10 +100,7 @@
-
-
-
+
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index 6f542ff71d..3dc83e08c4 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@@ -16,7 +16,7 @@
-
@@ -174,17 +174,17 @@
this.form = {};
},
del(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.currentUser().lastWorkspaceId + '/' + row.id,() => {
- this.$success(this.$t('commons.delete_success'));
+ this.$success(this.$t('commons.remove_success'));
this.initTableData();
});
}).catch(() => {
- this.$info(this.$t('commons.delete_cancel'));
+ this.$info(this.$t('commons.remove_cancel'));
});
},
edit(row) {