diff --git a/apps/locales/en_US/LC_MESSAGES/django.po b/apps/locales/en_US/LC_MESSAGES/django.po index 1b1472cf2..c3cd74128 100644 --- a/apps/locales/en_US/LC_MESSAGES/django.po +++ b/apps/locales/en_US/LC_MESSAGES/django.po @@ -8894,5 +8894,11 @@ msgstr "" msgid "Resources mapping" msgstr "" +msgid "Batch set user roles" +msgstr "" + +msgid "Role Setting cannot be empty" +msgstr "" + msgid "View related resources" msgstr "" \ No newline at end of file diff --git a/apps/locales/zh_CN/LC_MESSAGES/django.po b/apps/locales/zh_CN/LC_MESSAGES/django.po index a37b3478a..cf8b38821 100644 --- a/apps/locales/zh_CN/LC_MESSAGES/django.po +++ b/apps/locales/zh_CN/LC_MESSAGES/django.po @@ -8361,7 +8361,7 @@ msgstr "更新平台状态" #: apps/xpack/views/resource_chat_user.py:28 #: apps/xpack/views/resource_chat_user.py:29 msgid "Get Resource chat user List" -msgstr "获取资源聊天用户列表" +msgstr "获取资源对话用户列表" #: apps/xpack/views/resource_chat_user.py:32 #: apps/xpack/views/resource_chat_user.py:54 @@ -8370,19 +8370,19 @@ msgstr "获取资源聊天用户列表" #: apps/xpack/views/system_chat_user_group.py:45 #: apps/xpack/views/system_chat_user_group.py:67 msgid "Chat user" -msgstr "聊天用户" +msgstr "对话用户" #: apps/xpack/views/resource_chat_user.py:48 #: apps/xpack/views/resource_chat_user.py:49 #: apps/xpack/views/resource_chat_user.py:50 msgid "Edit Resource chat user List" -msgstr "编辑资源聊天用户列表" +msgstr "编辑资源对话用户列表" #: apps/xpack/views/resource_chat_user.py:72 #: apps/xpack/views/resource_chat_user.py:73 #: apps/xpack/views/resource_chat_user.py:74 msgid "Get Resource chat user page List" -msgstr "获取资源聊天用户分页列表" +msgstr "获取资源对话用户分页列表" #: apps/xpack/views/system_api_key.py:19 apps/xpack/views/system_api_key.py:20 #: apps/xpack/views/system_api_key.py:21 @@ -8446,22 +8446,22 @@ msgstr "系统/用户组" #: apps/xpack/views/system_chat_user_group.py:20 #: apps/xpack/views/system_chat_user_group.py:21 msgid "Get Resource chat user group List" -msgstr "获取资源聊天用户组列表" +msgstr "获取资源对话用户组列表" #: apps/xpack/views/system_chat_user_group.py:39 #: apps/xpack/views/system_chat_user_group.py:40 #: apps/xpack/views/system_chat_user_group.py:41 msgid "Edit Resource chat user group List" -msgstr "编辑资源聊天用户组列表" +msgstr "编辑资源对话用户组列表" #: apps/xpack/views/system_chat_user_group.py:62 #: apps/xpack/views/system_chat_user_group.py:64 msgid "Get Resource chat user group page List" -msgstr "获取资源聊天用户组分页列表" +msgstr "获取资源对话用户组分页列表" #: apps/xpack/views/system_chat_user_group.py:63 msgid "Get Resource chat user page group List" -msgstr "获取资源聊天用户分页组列表" +msgstr "获取资源对话用户分页组列表" #: apps/xpack/views/system_params.py:22 apps/xpack/views/system_params.py:23 #: apps/xpack/views/system_params.py:24 @@ -8546,7 +8546,7 @@ msgid "Paragraph" msgstr "段落" msgid "User group" -msgstr "用戶组" +msgstr "用户组" msgid "Remove member from user group" msgstr "从用户组中移除成员" @@ -9020,5 +9020,11 @@ msgstr "获取资源的关系分页列表" msgid "Resources mapping" msgstr "资源映射" +msgid "Batch set user roles" +msgstr "批量设置用户角色" + +msgid "Role Setting cannot be empty" +msgstr "角色设置不能为空" + msgid "View related resources" msgstr "查看关联资源" diff --git a/apps/locales/zh_Hant/LC_MESSAGES/django.po b/apps/locales/zh_Hant/LC_MESSAGES/django.po index 15c1e1cfc..c4a4b875c 100644 --- a/apps/locales/zh_Hant/LC_MESSAGES/django.po +++ b/apps/locales/zh_Hant/LC_MESSAGES/django.po @@ -9020,5 +9020,11 @@ msgstr "獲取資源的關係分頁清單" msgid "Resources mapping" msgstr "資源映射" +msgid "Batch set user roles" +msgstr "批量設置用戶角色" + +msgid "Role Setting cannot be empty" +msgstr "角色設置不能為空" + msgid "View related resources" msgstr "查看關聯資源" diff --git a/apps/users/views/user.py b/apps/users/views/user.py index d4d7ee01c..be5133074 100644 --- a/apps/users/views/user.py +++ b/apps/users/views/user.py @@ -42,6 +42,7 @@ def get_user_operation_object(user_id): return {} + def get_re_password_details(request): path = request.path body = request.data @@ -245,7 +246,7 @@ class UserManage(APIView): responses=DefaultModelResponse.get_response()) @has_permissions(PermissionConstants.USER_DELETE, RoleConstants.ADMIN) @log(menu='User management', operate='Batch delete user', - get_operation_object=lambda r, k: get_user_operation_object(k.get('user_id'))) + get_operation_object=lambda r, k: get_user_operation_object(r.data.get('ids', []))) def post(self, request: Request): return result.success(UserManageSerializer.BatchDelete({'ids': request.data}).batch_delete(with_valid=True)) diff --git a/ui/src/api/system/user-manage.ts b/ui/src/api/system/user-manage.ts index 49ed85f10..550585737 100644 --- a/ui/src/api/system/user-manage.ts +++ b/ui/src/api/system/user-manage.ts @@ -96,6 +96,19 @@ const batchDelete: ( return post(`/user_manage/batch_delete`, ids, {}, loading) } +const batchSetRolePE: (data: any, loading?: Ref) => Promise> = ( + data, + loading, +) => { + return post(`/user_manage/batch/add_role`, data, undefined, loading) +} +const batchSetRoleEE: (data: any, loading?: Ref) => Promise> = ( + data, + loading, +) => { + return post(`/user_manage/batch/add_role_ee`, data, undefined, loading) +} + export default { getUserManage, putUserManage, @@ -104,5 +117,7 @@ export default { putUserManagePassword, getSystemDefaultPassword, getValid, - batchDelete + batchDelete, + batchSetRolePE, + batchSetRoleEE } diff --git a/ui/src/locales/lang/en-US/views/user-manage.ts b/ui/src/locales/lang/en-US/views/user-manage.ts index 6b2da8fe5..2164ef0d0 100644 --- a/ui/src/locales/lang/en-US/views/user-manage.ts +++ b/ui/src/locales/lang/en-US/views/user-manage.ts @@ -42,4 +42,5 @@ export default { lark: 'Lark', dingtalk: 'DingTalk', }, + settingRole: 'Set Role', } diff --git a/ui/src/locales/lang/zh-CN/views/user-manage.ts b/ui/src/locales/lang/zh-CN/views/user-manage.ts index eff43e87a..ed34c6f44 100644 --- a/ui/src/locales/lang/zh-CN/views/user-manage.ts +++ b/ui/src/locales/lang/zh-CN/views/user-manage.ts @@ -40,4 +40,5 @@ export default { lark: '飞书', dingtalk: '钉钉', }, + settingRole: '设置角色', } diff --git a/ui/src/locales/lang/zh-Hant/views/user-manage.ts b/ui/src/locales/lang/zh-Hant/views/user-manage.ts index c40936ba3..259a76f9e 100644 --- a/ui/src/locales/lang/zh-Hant/views/user-manage.ts +++ b/ui/src/locales/lang/zh-Hant/views/user-manage.ts @@ -41,4 +41,5 @@ export default { lark: '飛書', dingtalk: '釘釘', }, + settingRole: '設定角色', } diff --git a/ui/src/views/system/role/component/MemberFormContent.vue b/ui/src/views/system/role/component/MemberFormContent.vue index dcf040259..94270a332 100644 --- a/ui/src/views/system/role/component/MemberFormContent.vue +++ b/ui/src/views/system/role/component/MemberFormContent.vue @@ -57,7 +57,7 @@ - + {{ props.addText ?? $t('views.role.member.add') }} @@ -65,15 +65,19 @@ diff --git a/ui/src/views/system/user-manage/component/SetUserRoleDialog.vue b/ui/src/views/system/user-manage/component/SetUserRoleDialog.vue new file mode 100644 index 000000000..0b6801b26 --- /dev/null +++ b/ui/src/views/system/user-manage/component/SetUserRoleDialog.vue @@ -0,0 +1,215 @@ + + + diff --git a/ui/src/views/system/user-manage/index.vue b/ui/src/views/system/user-manage/index.vue index 11efa7189..df199a73f 100644 --- a/ui/src/views/system/user-manage/index.vue +++ b/ui/src/views/system/user-manage/index.vue @@ -3,12 +3,29 @@

{{ $t('views.userManage.title') }}

- + {{ $t('views.userManage.createUser') }} - + + + {{ $t('views.userManage.settingRole') }} + + + {{ $t('common.delete') }} + +
@@ -86,8 +103,10 @@ @sizeChange="handleSizeChange" @changePage="getList" v-loading="loading" + @selection-change="handleSelectionChange" :maxTableHeight="280" > +
- + {{ $t('common.status.enabled') }} @@ -200,7 +219,7 @@ v-if="hasPermission([RoleConst.ADMIN, PermissionConst.USER_EDIT], 'OR')" /> - + - - + + +