Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feature: 用户组成员续期增加人员模板续期、移除 #2614

Merged
merged 5 commits into from
Apr 12, 2024
Merged

feature: 用户组成员续期增加人员模板续期、移除 #2614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8f855a
feature: 用户组成员续期增加人员模板续期、移除
lhzzforever Apr 11, 2024
7c39614
fix: 提价漏缺参数
lhzzforever Apr 11, 2024
62594f3
Merge branch 'upstream/develop' into dev/develop_ci
lhzzforever Apr 11, 2024
ae2115c
fix: 处理如果是系统管理员身份下的资源全选管理系统状态则为disabled
lhzzforever Apr 12, 2024
b516872
feature: 支持用户组成员续期用户/组织、人员模板多tab项跨页勾选
lhzzforever Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/components/render-perm/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
handleExpanded () {
this.isExpanded = !this.isExpanded;
this.$emit('update:expanded', true);
this.$emit('on-expanded', true);
this.$emit('on-expanded', this.isExpanded);
}
}
};
Expand Down
7 changes: 5 additions & 2 deletions frontend/src/language/lang/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
7 changes: 5 additions & 2 deletions frontend/src/language/lang/zh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ export const m = {
'加入时间': '加入时间',
'成员': '成员',
'位成员': '位成员',
'个人员模板': '个人员模板',
'设置新用户加入': '设置新用户加入',
'用户组的有效期': '用户组的有效期',
'当前版本': '当前版本',
Expand Down Expand Up @@ -417,6 +418,9 @@ export const m = {
'这些成员将不再继承该组的权限': '这些成员将不再继承该组的权限',
'该组将不再继承该模板的权限': '该组将不再继承该模板的权限',
'这些成员将不再关联该用户组的权限': '这些成员将不再关联该用户组的权限',
'相关人员将不再关联该用户组的权限': '相关人员将不再关联该用户组的权限',
'人员模板关联的该用户组将不再存在续期': '人员模板关联的该用户组将不再存在续期',
'这些人员模板关联的该用户组将不再存在续期': '这些人员模板关联的该用户组将不再存在续期',
'解除成功': '解除成功',
'当前用户将不再继承该模板权限': '当前用户将不再继承该模板权限',
'退出成功': '退出成功',
Expand Down Expand Up @@ -1086,8 +1090,7 @@ export const m = {
'暂无将过期的权限': '暂无将过期的权限',
'续期申请提交成功': '续期申请提交成功',
'续期成功': '续期成功',
'即将过期的用户/组织': '即将过期的用户/组织',
'请选择即将过期的用户/组织': '请选择即将过期的用户/组织',
'请选择用户/组织或人员模板': '请选择用户/组织或人员模板',
'该成员在该用户组将不再存在续期': '该成员在该用户组将不再存在续期',
'这些成员在该用户组将不再存在续期': '这些成员在该用户组将不再存在续期',
'没有需要续期的权限': '没有需要续期的权限',
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/group/components/member-table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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['移除']`)} ${
Expand Down
Loading