diff --git a/src/components/ListTable/formatters/DeleteActionFormatter.vue b/src/components/ListTable/formatters/DeleteActionFormatter.vue index de2f61ad3..e6ec70d12 100644 --- a/src/components/ListTable/formatters/DeleteActionFormatter.vue +++ b/src/components/ListTable/formatters/DeleteActionFormatter.vue @@ -33,6 +33,9 @@ export default { } }, iCanDelete() { + if (this.col.objects === 'all') { + return false + } return this.col.objects.indexOf(this.cellValue) === -1 } } diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json index fe0d0565b..edf69f8d1 100644 --- a/src/i18n/langs/cn.json +++ b/src/i18n/langs/cn.json @@ -930,8 +930,10 @@ "OrganizationDetail": "组织详情", "OrganizationList": "组织管理", "OrganizationUpdate": "更新组织", + "OrganizationMembership": "组织成员", "DeleteOrgTitle": "请确保组织内的以下信息已删除", - "DeleteOrgMsg": "用户列表、用户组、资产列表、网域列表、管理用户、系统用户、标签管理、资产授权规则" + "DeleteOrgMsg": "用户列表、用户组、资产列表、网域列表、管理用户、系统用户、标签管理、资产授权规则", + "OrgRole": "组织角色" }, "RestoreButton": "恢复默认", "SubscriptionID": "订阅授权ID", diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 19686a4d8..0a3474726 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -927,8 +927,10 @@ "OrganizationDetail": "Org detail", "OrganizationList": "Organlizations", "OrganizationUpdate": "Update org", + "OrganizationMembership": "Organization membership", "DeleteOrgTitle":"Please ensure that the following information in the organization has been deleted", - "DeleteOrgMsg":"User list、User group、Asset list、Domain list、Admin user、System user、Labels、Asset permission" + "DeleteOrgMsg":"User list、User group、Asset list、Domain list、Admin user、System user、Labels、Asset permission", + "OrgRole": "Org role" }, "RestoreButton": "Restore Default", "SubscriptionID": "Subscription ID",