Merge branch 'v2' into pr@v2@feat_applicaation

Author: shaohuzhang1

apps/common/constants/permission_constants.py

@@ -38,6 +38,8 @@ class Group(Enum):
     WORKSPACE = "WORKSPACE"
     DISPLAY_SETTINGS = "DISPLAY_SETTINGS"
     LOGIN_AUTH = "LOGIN_AUTH"
+    SYSTEM_API_KEY = "SYSTEM_API_KEY"
+    APPEARANCE_SETTINGS = "APPEARANCE_SETTINGS"
 
 
 class SystemGroup(Enum):
@@ -213,6 +215,8 @@ def get_workspace_role(self):
     Operate.RELATE.value: _("Relate"),
     Group.LOGIN_AUTH.value: _("Login Auth"),
     Group.DISPLAY_SETTINGS.value: _("Display Settings"),
+    Group.SYSTEM_API_KEY.value: _("System API Key"),
+    Group.APPEARANCE_SETTINGS.value:_("Appearance Settings")
 
 }
 
@@ -534,6 +538,34 @@ class PermissionConstants(Enum):
                                   parent_group=[SystemGroup.APPLICATION],
                                   resource_permission_group_list=[ResourcePermissionGroup.VIEW],
                                   )
+    SYSTEM_API_KEY_READ = Permission(group=Group.SYSTEM_API_KEY, operate=Operate.READ,
+                                     role_list=[RoleConstants.ADMIN],
+                                     parent_group=[SystemGroup.SYSTEM_SETTING]
+                                     )
+    SYSTEM_API_KEY_EDIT = Permission(group=Group.SYSTEM_API_KEY, operate=Operate.EDIT,
+                                     role_list=[RoleConstants.ADMIN],
+                                     parent_group=[SystemGroup.SYSTEM_SETTING]
+                                     )
+    SYSTEM_API_KEY_DELETE = Permission(group=Group.SYSTEM_API_KEY, operate=Operate.DELETE,
+                                       role_list=[RoleConstants.ADMIN],
+                                       parent_group=[SystemGroup.SYSTEM_SETTING]
+                                       )
+    SYSTEM_API_KEY_CREATE = Permission(group=Group.SYSTEM_API_KEY, operate=Operate.CREATE,
+                                       role_list=[RoleConstants.ADMIN],
+                                       parent_group=[SystemGroup.SYSTEM_SETTING]
+                                       )
+    APPEARANCE_SETTINGS_READ = Permission(group=Group.APPEARANCE_SETTINGS, operate=Operate.READ,
+                                    role_list=[RoleConstants.ADMIN],
+                                    parent_group=[SystemGroup.SYSTEM_SETTING]
+                                    )
+    APPEARANCE_SETTINGS_EDIT = Permission(group=Group.APPEARANCE_SETTINGS, operate=Operate.EDIT,
+                                    role_list=[RoleConstants.ADMIN],
+                                    parent_group=[SystemGroup.SYSTEM_SETTING]
+                                    )
+
+
+
+
 
     def get_workspace_application_permission(self):
         return lambda r, kwargs: Permission(group=self.value.group, operate=self.value.operate,

apps/locales/en_US/LC_MESSAGES/django.po

@@ -3672,3 +3672,69 @@ msgstr ""
 #: workspace/views/workspace.py:180
 msgid "Get workspace list by user"
 msgstr ""
+
+msgid "System API Key"
+msgstr ""
+
+msgid "msgid "Create SystemAPIKey"
+msgstr ""
+
+msgid "Get SystemAPIKey List"
+msgstr ""
+
+msgid "Update SystemAPIKey"
+msgstr ""
+
+msgid "Delete SystemAPIKey"
+msgstr ""
+
+msgid "Allow cross domain"
+msgstr ""
+
+msgid "Cross domain list"
+msgstr ""
+
+msgid "system API key id"
+msgstr ""
+
+msgid "View appearance settings"
+msgstr ""
+
+msgid "SystemParams"
+msgstr ""
+
+msgid "Update appearance settings"
+msgstr ""
+
+msgid "theme"
+msgstr ""
+
+msgid "login logo"
+msgstr ""
+
+msgid "login image"
+msgstr ""
+
+msgid "title"
+msgstr ""
+
+msgid "slogan"
+msgstr ""
+
+msgid "show user manual"
+msgstr ""
+
+msgid "user manual url"
+msgstr ""
+
+msgid "show forum"
+msgstr ""
+
+msgid "forum url"
+msgstr ""
+
+msgid "show project"
+msgstr ""
+
+msgid "project url"
+msgstr ""

apps/locales/zh_CN/LC_MESSAGES/django.po

@@ -3800,3 +3800,69 @@ msgstr "获取工作空间成员列表"
 #: workspace/views/workspace.py:180
 msgid "Get workspace list by user"
 msgstr "根据用户获取工作空间列表"
+
+msgid "System API Key"
+msgstr "系统 API Key"
+
+msgid "Create SystemAPIKey"
+msgstr "创建系统 API 密钥"
+
+msgid "Update SystemAPIKey"
+msgstr "更新系统 API 密钥"
+
+msgid "Get SystemAPIKey List"
+msgstr "获取系统 API 密钥列表"
+
+msgid "Delete SystemAPIKey"
+msgstr "删除系统 API 密钥"
+
+msgid "Allow cross domain"
+msgstr "允许跨域"
+
+msgid "Cross domain list"
+msgstr "跨域列表"
+
+msgid "system API key id"
+msgstr "系统 API 密钥 ID"
+
+msgid "View appearance settings"
+msgstr "查看外观设置"
+
+msgid "SystemParams"
+msgstr "系统参数"
+
+msgid "Update appearance settings"
+msgstr "更新外观设置"
+
+msgid "theme"
+msgstr "主题"
+
+msgid "login logo"
+msgstr "登录 logo"
+
+msgid "login image"
+msgstr "登陆图片"
+
+msgid "title"
+msgstr "标题"
+
+msgid "slogan"
+msgstr "标语"
+
+msgid "show user manual"
+msgstr "显示用户手册"
+
+msgid "user manual url"
+msgstr "用户手册网址"
+
+msgid "show forum"
+msgstr "显示论坛"
+
+msgid "forum url"
+msgstr "论坛网址"
+
+msgid "show project"
+msgstr "显示项目"
+
+msgid "project url"
+msgstr "项目网址"

apps/locales/zh_Hant/LC_MESSAGES/django.po

@@ -3800,3 +3800,69 @@ msgstr "獲取工作空間成員列表"
 #: workspace/views/workspace.py:180
 msgid "Get workspace list by user"
 msgstr "根據用戶獲取工作空間列表"
+
+msgid "System API Key"
+msgstr "系統 API Key"
+
+msgid "Create SystemAPIKey"
+msgstr "創建系統 API 密鑰"
+
+msgid "Get SystemAPIKey List"
+msgstr "獲取系統 API 密鑰清單"
+
+msgid "Update SystemAPIKey"
+msgstr "更新系統 API 密鑰"
+
+msgid "Delete SystemAPIKey"
+msgstr "刪除系統 API 密鑰"
+
+msgid "Allow cross domain"
+msgstr "允許跨域"
+
+msgid "Cross domain list"
+msgstr "跨域清單"
+
+msgid "system API key id"
+msgstr "系統 API 密鑰 ID"
+
+msgid "View appearance settings"
+msgstr "查看外觀設置"
+
+msgid "SystemParams"
+msgstr "系統參數"
+
+msgid "Update appearance settings"
+msgstr "更新外觀設置"
+
+msgid "theme"
+msgstr "主題"
+
+msgid "login logo"
+msgstr "登錄 logo"
+
+msgid "login image"
+msgstr "登錄圖片"
+
+msgid "title"
+msgstr "標題"
+
+msgid "slogan"
+msgstr "標語"
+
+msgid "show user manual"
+msgstr "顯示用戶手冊"
+
+msgid "user manual url"
+msgstr "用戶手冊網址"
+
+msgid "show forum"
+msgstr "顯示論壇"
+
+msgid "forum url"
+msgstr "論壇網址"
+
+msgid "show project"
+msgstr "顯示項目"
+
+msgid "project url"
+msgstr "項目網址"

apps/users/serializers/user.py

@@ -7,6 +7,7 @@
     @desc:
 """
 import re
+from collections import defaultdict
 from itertools import product
 
 from django.db import transaction
@@ -163,9 +164,38 @@ def list(self, with_valid=True):
         def page(self, current_page: int, page_size: int, with_valid=True):
             if with_valid:
                 self.is_valid(raise_exception=True)
-            return page_search(current_page, page_size,
-                               self.get_query_set(),
-                               post_records_handler=lambda u: UserInstanceSerializer(u).data)
+            result = page_search(current_page, page_size,
+                                 self.get_query_set(),
+                                 post_records_handler=lambda u: UserInstanceSerializer(u).data)
+            role_model = DatabaseModelManage.get_model("role_model")
+            user_role_relation_model = DatabaseModelManage.get_model("workspace_user_role_mapping")
+
+            def _get_user_roles(user_ids):
+                if not (role_model and user_role_relation_model):
+                    return {}
+
+                # 获取所有相关角色关系，并预加载角色信息
+                user_role_relations = (
+                    user_role_relation_model.objects
+                    .filter(user_id__in=user_ids)
+                    .select_related('role_id')  # 预加载外键数据
+                )
+
+                # 构建用户ID到角色名称列表的映射
+                user_role_mapping = defaultdict(list)
+                for relation in user_role_relations:
+                    user_role_mapping[relation.user_id].append(relation.role_id.name)
+
+                return user_role_mapping
+
+            if role_model and user_role_relation_model:
+                user_ids = [user['id'] for user in result['records']]
+                user_role_mapping = _get_user_roles(user_ids)
+
+                # 将角色信息添加回用户数据中
+                for user in result['records']:
+                    user['role'] = user_role_mapping.get(user['id'], [])
+            return result
 
     @valid_license(model=User, count=2,
                    message=_(

ui/src/api/image.ts

@@ -0,0 +1,15 @@
+import { Result } from '@/request/Result'
+import { get, post, del, put } from '@/request/index'
+
+const prefix = '/image'
+/**
+ * 上传图片
+ * @param 参数  file:file
+ */
+const postImage: (data: any) => Promise<Result<any>> = (data) => {
+  return post(`${prefix}`, data)
+}
+
+export default {
+  postImage
+}