From b8f855a26531a748f9e6d7d03b376cce2c942b8f Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Thu, 11 Apr 2024 18:35:34 +0800 Subject: [PATCH 01/19] =?UTF-8?q?feature:=20=E7=94=A8=E6=88=B7=E7=BB=84?= =?UTF-8?q?=E6=88=90=E5=91=98=E7=BB=AD=E6=9C=9F=E5=A2=9E=E5=8A=A0=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=A8=A1=E6=9D=BF=E7=BB=AD=E6=9C=9F=E3=80=81=E7=A7=BB?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/language/lang/en.js | 7 +- frontend/src/language/lang/zh.js | 7 +- .../views/group/components/member-table.vue | 4 +- .../views/perm/group-perm-renewal/index.vue | 747 ++++++++++++++---- 4 files changed, 592 insertions(+), 173 deletions(-) diff --git a/frontend/src/language/lang/en.js b/frontend/src/language/lang/en.js index f7ddf6237..869d0c747 100644 --- a/frontend/src/language/lang/en.js +++ b/frontend/src/language/lang/en.js @@ -102,6 +102,7 @@ export const m = { '加入时间': 'Joined at', '成员': 'member', '位成员': 'member(s)', + '个人员模板': 'member templates', '设置新用户加入': 'Set up new users to join', '用户组的有效期': 'The expiration date of the group', '设置新用户加入用户组的有效期': 'Set the expiration date for new users joining the group {value}', @@ -417,6 +418,9 @@ export const m = { '这些成员将不再继承该组的权限': 'these members will no longer inherit the permissions of the group', '该组将不再继承该模板的权限': 'The group will no longer inherit the permissions of the template', '这些成员将不再关联该用户组的权限': 'These members will no longer be associated with the permissions of this user group', + '相关人员将不再关联该用户组的权限': 'The relevant members will no longer be associated with the permissions of this user group', + '人员模板关联的该用户组将不再存在续期': 'The user group associated with the member template will no longer have renewals', + '这些人员模板关联的该用户组将不再存在续期': 'The user group associated with these member templates will no longer have renewals', '解除成功': 'Lifted', '当前用户将不再继承该模板权限': 'The current user will no longer inherit the template permissions', '退出成功': 'Quit successfully', @@ -1086,8 +1090,7 @@ export const m = { '暂无将过期的权限': 'No permission will expire', '续期申请提交成功': 'Renewal application submitted', '续期成功': 'Renewal successful', - '即将过期的用户/组织': 'Expiring Users/Organizations', - '请选择即将过期的用户/组织': 'Please select the user/organization that will expire soon', + '请选择用户/组织或人员模板': 'Please select user/organization or member templates', '该成员在该用户组将不再存在续期': 'This member will no longer have a renewal in this user group', '这些成员在该用户组将不再存在续期': 'These members will no longer have renewals in this user group', '没有需要续期的权限': 'No permission to renew', diff --git a/frontend/src/language/lang/zh.js b/frontend/src/language/lang/zh.js index e6369b1cb..81ae54553 100644 --- a/frontend/src/language/lang/zh.js +++ b/frontend/src/language/lang/zh.js @@ -101,6 +101,7 @@ export const m = { '加入时间': '加入时间', '成员': '成员', '位成员': '位成员', + '个人员模板': '个人员模板', '设置新用户加入': '设置新用户加入', '用户组的有效期': '用户组的有效期', '当前版本': '当前版本', @@ -417,6 +418,9 @@ export const m = { '这些成员将不再继承该组的权限': '这些成员将不再继承该组的权限', '该组将不再继承该模板的权限': '该组将不再继承该模板的权限', '这些成员将不再关联该用户组的权限': '这些成员将不再关联该用户组的权限', + '相关人员将不再关联该用户组的权限': '相关人员将不再关联该用户组的权限', + '人员模板关联的该用户组将不再存在续期': '人员模板关联的该用户组将不再存在续期', + '这些人员模板关联的该用户组将不再存在续期': '这些人员模板关联的该用户组将不再存在续期', '解除成功': '解除成功', '当前用户将不再继承该模板权限': '当前用户将不再继承该模板权限', '退出成功': '退出成功', @@ -1086,8 +1090,7 @@ export const m = { '暂无将过期的权限': '暂无将过期的权限', '续期申请提交成功': '续期申请提交成功', '续期成功': '续期成功', - '即将过期的用户/组织': '即将过期的用户/组织', - '请选择即将过期的用户/组织': '请选择即将过期的用户/组织', + '请选择用户/组织或人员模板': '请选择用户/组织或人员模板', '该成员在该用户组将不再存在续期': '该成员在该用户组将不再存在续期', '这些成员在该用户组将不再存在续期': '这些成员在该用户组将不再存在续期', '没有需要续期的权限': '没有需要续期的权限', diff --git a/frontend/src/views/group/components/member-table.vue b/frontend/src/views/group/components/member-table.vue index e7dfc0b84..f6d29bfdb 100644 --- a/frontend/src/views/group/components/member-table.vue +++ b/frontend/src/views/group/components/member-table.vue @@ -1309,8 +1309,8 @@ if (this.curModeMap[this.curRouteMode]) { this.deleteDialog.subTitle = `${this.$t(`m.common['移除']`)} ${ this.currentSelectList.length - } ${this.$t(`m.common['位成员']`)}${this.$t(`m.common[',']`)}${this.$t( - `m.info['这些成员将不再关联该用户组的权限']` + } ${this.$t(`m.common['个人员模板']`)}${this.$t(`m.common[',']`)}${this.$t( + `m.info['相关人员将不再关联该用户组的权限']` )}${this.$t(`m.common['。']`)}`; } else { this.deleteDialog.subTitle = `${this.$t(`m.common['移除']`)} ${ diff --git a/frontend/src/views/perm/group-perm-renewal/index.vue b/frontend/src/views/perm/group-perm-renewal/index.vue index c54088990..4dfbcc078 100644 --- a/frontend/src/views/perm/group-perm-renewal/index.vue +++ b/frontend/src/views/perm/group-perm-renewal/index.vue @@ -20,49 +20,131 @@ class="group-member-renewal-table-wrapper" v-bkloading="{ isLoading: item.loading, opacity: 1 }" > - - - -