From 748ca2faca4edf2f2e0fd676901e2ef219086025 Mon Sep 17 00:00:00 2001 From: panyy Date: Fri, 3 Jul 2026 11:39:22 +0800 Subject: [PATCH] feat:api --- apps/application/sql/list_application.sql | 3 ++- apps/application/sql/list_application_user.sql | 3 ++- .../sql/list_application_user_ee.sql | 3 ++- apps/knowledge/sql/list_knowledge.sql | 3 ++- apps/knowledge/sql/list_knowledge_user.sql | 3 ++- apps/knowledge/sql/list_knowledge_user_ee.sql | 3 ++- apps/models_provider/sql/list_model.sql | 3 ++- apps/models_provider/sql/list_model_user.sql | 1 + .../models_provider/sql/list_model_user_ee.sql | 1 + apps/tools/sql/list_tool.sql | 3 ++- apps/tools/sql/list_tool_user.sql | 3 ++- apps/tools/sql/list_tool_user_ee.sql | 3 ++- ui/src/utils/common.ts | 18 ++++++++++++++++++ ui/src/views/application-overview/index.vue | 8 +++----- ui/src/views/application/index.vue | 6 +++--- .../component/KnowledgeListContainer.vue | 6 +++--- ui/src/views/model/component/ModelCard.vue | 4 ++-- .../ApplicationResourceIndex.vue | 8 ++++++-- .../KnowledgeResourceIndex.vue | 7 ++++++- .../ModelResourceIndex.vue | 7 ++++++- .../ToolResourceIndex.vue | 8 ++++++-- .../views/tool/component/ToolListContainer.vue | 6 +++--- 22 files changed, 78 insertions(+), 32 deletions(-) diff --git a/apps/application/sql/list_application.sql b/apps/application/sql/list_application.sql index 3b6e863fd..c7152639a 100644 --- a/apps/application/sql/list_application.sql +++ b/apps/application/sql/list_application.sql @@ -8,6 +8,7 @@ from (select application."id"::text, application."name", application."folder_id", application."user_id", "user"."nick_name" as "nick_name", + "user"."username" as "username", application."create_time", application."update_time", application."publish_time", @@ -16,4 +17,4 @@ from (select application."id"::text, application."name", left join "user" on user_id = "user".id ${application_custom_sql} ) temp - ${application_query_set} \ No newline at end of file + ${application_query_set} diff --git a/apps/application/sql/list_application_user.sql b/apps/application/sql/list_application_user.sql index ecffcd93d..a1a37e3fa 100644 --- a/apps/application/sql/list_application_user.sql +++ b/apps/application/sql/list_application_user.sql @@ -8,6 +8,7 @@ from (select application."id"::text, application."name", application."folder_id", application."user_id", "user"."nick_name" as "nick_name", + "user"."username" as "username", application."create_time", application."update_time", application."publish_time", @@ -17,4 +18,4 @@ from (select application."id"::text, application."name", where application."id"::text in (select target from workspace_user_resource_permission ${workspace_user_resource_permission_query_set} and 'VIEW' = any (permission_list))) temp -${application_query_set} \ No newline at end of file +${application_query_set} diff --git a/apps/application/sql/list_application_user_ee.sql b/apps/application/sql/list_application_user_ee.sql index 0fe61a140..bfab07b33 100644 --- a/apps/application/sql/list_application_user_ee.sql +++ b/apps/application/sql/list_application_user_ee.sql @@ -8,6 +8,7 @@ from (select application."id"::text, application."name", application."folder_id", application."user_id", "user"."nick_name" as "nick_name", + "user"."username" as "username", application."create_time", application."update_time", application."publish_time", @@ -34,4 +35,4 @@ from (select application."id"::text, application."name", else 'VIEW' = any (permission_list) end)) temp -${application_query_set} \ No newline at end of file +${application_query_set} diff --git a/apps/knowledge/sql/list_knowledge.sql b/apps/knowledge/sql/list_knowledge.sql index b8ff5a1ff..f544ad707 100644 --- a/apps/knowledge/sql/list_knowledge.sql +++ b/apps/knowledge/sql/list_knowledge.sql @@ -7,6 +7,7 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name, "temp_knowledge".folder_id, "temp_knowledge".user_id, "user"."nick_name" as nick_name, + "user"."username" as username, "temp_knowledge".create_time, "temp_knowledge".update_time, "temp_knowledge".file_size_limit, @@ -29,4 +30,4 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name, ON temp_knowledge."id" = "app_knowledge_temp".knowledge_id left join "user" on "user".id = temp_knowledge.user_id ) temp - ${default_sql} \ No newline at end of file + ${default_sql} diff --git a/apps/knowledge/sql/list_knowledge_user.sql b/apps/knowledge/sql/list_knowledge_user.sql index a9114be64..55c638a97 100644 --- a/apps/knowledge/sql/list_knowledge_user.sql +++ b/apps/knowledge/sql/list_knowledge_user.sql @@ -7,6 +7,7 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name, "temp_knowledge".folder_id, "temp_knowledge".user_id, "user"."nick_name" as nick_name, + "user"."username" as username, "temp_knowledge".create_time, "temp_knowledge".update_time, "temp_knowledge".file_size_limit, @@ -34,4 +35,4 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name, ON temp_knowledge."id" = "app_knowledge_temp".knowledge_id left join "user" on "user".id = temp_knowledge.user_id ) temp - ${default_sql} \ No newline at end of file + ${default_sql} diff --git a/apps/knowledge/sql/list_knowledge_user_ee.sql b/apps/knowledge/sql/list_knowledge_user_ee.sql index cc43c88ea..7f76d8a5e 100644 --- a/apps/knowledge/sql/list_knowledge_user_ee.sql +++ b/apps/knowledge/sql/list_knowledge_user_ee.sql @@ -7,6 +7,7 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name, "temp_knowledge".folder_id, "temp_knowledge".user_id, "user"."nick_name" as nick_name, + "user"."username" as username, "temp_knowledge".create_time, "temp_knowledge".update_time, "temp_knowledge".file_size_limit, @@ -48,4 +49,4 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name, ON temp_knowledge."id" = "app_knowledge_temp".knowledge_id left join "user" on "user".id = temp_knowledge.user_id ) temp - ${default_sql} \ No newline at end of file + ${default_sql} diff --git a/apps/models_provider/sql/list_model.sql b/apps/models_provider/sql/list_model.sql index 7366af18d..aa7fdd7a2 100644 --- a/apps/models_provider/sql/list_model.sql +++ b/apps/models_provider/sql/list_model.sql @@ -10,7 +10,8 @@ SELECT model."id"::text, model."name", model.update_time, model.user_id, "user"."nick_name" as "nick_name", + "user"."username" as "username", model.workspace_id from model left join "user" on user_id = "user".id - ${model_query_set} \ No newline at end of file + ${model_query_set} diff --git a/apps/models_provider/sql/list_model_user.sql b/apps/models_provider/sql/list_model_user.sql index df50d538a..15dbf21d7 100644 --- a/apps/models_provider/sql/list_model_user.sql +++ b/apps/models_provider/sql/list_model_user.sql @@ -10,6 +10,7 @@ FROM (SELECT model."id"::text, model."name", model.update_time, model.user_id, "user"."nick_name" as "nick_name", + "user"."username" as "username", model.workspace_id from model left join "user" on user_id = "user".id diff --git a/apps/models_provider/sql/list_model_user_ee.sql b/apps/models_provider/sql/list_model_user_ee.sql index 88590546e..5febcc418 100644 --- a/apps/models_provider/sql/list_model_user_ee.sql +++ b/apps/models_provider/sql/list_model_user_ee.sql @@ -10,6 +10,7 @@ FROM (SELECT model."id"::text, model."name", model.update_time, model.user_id, "user"."nick_name" as "nick_name", + "user"."username" as "username", model.workspace_id from model left join "user" on user_id = "user".id diff --git a/apps/tools/sql/list_tool.sql b/apps/tools/sql/list_tool.sql index 07d85b7eb..71759deae 100644 --- a/apps/tools/sql/list_tool.sql +++ b/apps/tools/sql/list_tool.sql @@ -9,6 +9,7 @@ from (select tool."id"::text, tool."folder_id", tool."user_id", "user".nick_name as "nick_name", + "user".username as "username", tool."icon", tool.label, tool."template_id"::text, @@ -21,4 +22,4 @@ from (select tool."id"::text, from tool left join "user" on "user".id = user_id ${tool_query_set} ) temp - ${default_query_set} \ No newline at end of file + ${default_query_set} diff --git a/apps/tools/sql/list_tool_user.sql b/apps/tools/sql/list_tool_user.sql index 975d506ff..7b4a00ffa 100644 --- a/apps/tools/sql/list_tool_user.sql +++ b/apps/tools/sql/list_tool_user.sql @@ -9,6 +9,7 @@ FROM (SELECT tool."id"::text, tool."folder_id", tool."user_id", "user".nick_name AS "nick_name", + "user".username AS "username", tool."icon", tool.label, tool."template_id"::text, @@ -26,4 +27,4 @@ FROM (SELECT tool."id"::text, AND 'VIEW' = ANY (permission_list))) AS tool LEFT JOIN "user" ON "user".id = user_id ) temp - ${default_query_set} \ No newline at end of file + ${default_query_set} diff --git a/apps/tools/sql/list_tool_user_ee.sql b/apps/tools/sql/list_tool_user_ee.sql index 8a4de8708..63af6cee0 100644 --- a/apps/tools/sql/list_tool_user_ee.sql +++ b/apps/tools/sql/list_tool_user_ee.sql @@ -9,6 +9,7 @@ FROM (SELECT tool."id"::text, tool."folder_id", tool."user_id", "user".nick_name AS "nick_name", + "user".username AS "username", tool."icon", tool.label, tool."template_id"::text, @@ -37,4 +38,4 @@ FROM (SELECT tool."id"::text, )) AS tool LEFT JOIN "user" ON "user".id = user_id ) temp - ${default_query_set} \ No newline at end of file + ${default_query_set} diff --git a/ui/src/utils/common.ts b/ui/src/utils/common.ts index b2148247f..68828cc62 100644 --- a/ui/src/utils/common.ts +++ b/ui/src/utils/common.ts @@ -101,6 +101,24 @@ export function i18n_name(name: string) { return key ? t(key) : name } +const builtinCreatorNameMap: Record = { + 'layout.about.inner_admin': '系统管理员', + 'layout.about.inner_wsm': '工作空间管理员', + 'layout.about.inner_user': '普通用户', +} + +export function creatorName(nickName?: string, username?: string) { + const name = (nickName || '').trim() + const account = (username || '').trim() + if (name && !name.startsWith('layout.about.')) { + return name + } + if (account) { + return account + } + return builtinCreatorNameMap[name] || name || '-' +} + // 截取文件名 export function cutFilename(filename: string, num: number) { diff --git a/ui/src/views/application-overview/index.vue b/ui/src/views/application-overview/index.vue index 256b82ffd..2885270e4 100644 --- a/ui/src/views/application-overview/index.vue +++ b/ui/src/views/application-overview/index.vue @@ -118,11 +118,9 @@ Base URL： - {{ - baseUrl + id - }} + {{ baseUrl }} - + @@ -232,7 +230,7 @@ const permissionPrecise = computed(() => { const apiUrl = window.location.origin + `${window.MaxKB.chatPrefix}/api-doc/` -const baseUrl = window.location.origin + `${window.MaxKB.chatPrefix}/api/` +const baseUrl = window.location.origin + `${window.MaxKB.chatPrefix}/api/${id}/chat/completions` const APIKeyDialogRef = ref() const EmbedDialogRef = ref() diff --git a/ui/src/views/application/index.vue b/ui/src/views/application/index.vue index e45ec2fe0..d5831d248 100644 --- a/ui/src/views/application/index.vue +++ b/ui/src/views/application/index.vue @@ -181,7 +181,7 @@ @@ -201,7 +201,7 @@ @@ -345,7 +345,7 @@ import ApplicationApi from '@/api/application/application' import { MsgSuccess, MsgConfirm, MsgError } from '@/utils/message' import useStore from '@/stores' import { t } from '@/locales' -import { i18n_name } from '@/utils/common' +import { creatorName } from '@/utils/common' import { useRouter, useRoute } from 'vue-router' import { isWorkFlow } from '@/utils/application' import { resetUrl } from '@/utils/common' diff --git a/ui/src/views/knowledge/component/KnowledgeListContainer.vue b/ui/src/views/knowledge/component/KnowledgeListContainer.vue index 13038c77c..8d484af61 100644 --- a/ui/src/views/knowledge/component/KnowledgeListContainer.vue +++ b/ui/src/views/knowledge/component/KnowledgeListContainer.vue @@ -169,7 +169,7 @@ @@ -190,7 +190,7 @@ - + + + - + + + - + + + - + + + @@ -132,7 +132,7 @@