From e8a77ec5f578e3128debb9d799094c7a3376fb33 Mon Sep 17 00:00:00 2001 From: Gavan <994259213@qq.com> Date: Thu, 24 Jul 2025 20:07:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/components/header/Bread.tsx | 2 +- ui/src/components/sidebar/index.tsx | 4 ++-- ui/src/pages/{user-management => memberManage}/index.tsx | 0 .../{user-management => memberManage}/inviteUserModal.tsx | 0 .../{user-management => memberManage}/loginHistory.tsx | 0 .../{user-management => memberManage}/memberManage.tsx | 0 .../thirdPartyLoginSettingModal.tsx | 0 ui/src/router.tsx | 6 +++--- 8 files changed, 6 insertions(+), 6 deletions(-) rename ui/src/pages/{user-management => memberManage}/index.tsx (100%) rename ui/src/pages/{user-management => memberManage}/inviteUserModal.tsx (100%) rename ui/src/pages/{user-management => memberManage}/loginHistory.tsx (100%) rename ui/src/pages/{user-management => memberManage}/memberManage.tsx (100%) rename ui/src/pages/{user-management => memberManage}/thirdPartyLoginSettingModal.tsx (100%) diff --git a/ui/src/components/header/Bread.tsx b/ui/src/components/header/Bread.tsx index fbf2691..fa363ec 100644 --- a/ui/src/components/header/Bread.tsx +++ b/ui/src/components/header/Bread.tsx @@ -8,7 +8,7 @@ const ADMIN_BREADCRUMB_MAP: Record = { chat: { title: '对话记录', to: '/chat' }, completion: { title: '补全记录', to: '/completion' }, model: { title: '模型管理', to: '/model' }, - 'user-management': { title: '成员管理', to: '/user-management' }, + 'member-management': { title: '成员管理', to: '/member-management' }, admin: { title: '管理员', to: '/admin' }, }; diff --git a/ui/src/components/sidebar/index.tsx b/ui/src/components/sidebar/index.tsx index 384d1cb..9d75780 100644 --- a/ui/src/components/sidebar/index.tsx +++ b/ui/src/components/sidebar/index.tsx @@ -51,8 +51,8 @@ const ADMIN_MENUS = [ }, { label: '成员管理', - value: '/user-management', - pathname: 'user-management', + value: '/member-management', + pathname: 'member-management', icon: 'icon-yonghuguanli1', show: true, disabled: false, diff --git a/ui/src/pages/user-management/index.tsx b/ui/src/pages/memberManage/index.tsx similarity index 100% rename from ui/src/pages/user-management/index.tsx rename to ui/src/pages/memberManage/index.tsx diff --git a/ui/src/pages/user-management/inviteUserModal.tsx b/ui/src/pages/memberManage/inviteUserModal.tsx similarity index 100% rename from ui/src/pages/user-management/inviteUserModal.tsx rename to ui/src/pages/memberManage/inviteUserModal.tsx diff --git a/ui/src/pages/user-management/loginHistory.tsx b/ui/src/pages/memberManage/loginHistory.tsx similarity index 100% rename from ui/src/pages/user-management/loginHistory.tsx rename to ui/src/pages/memberManage/loginHistory.tsx diff --git a/ui/src/pages/user-management/memberManage.tsx b/ui/src/pages/memberManage/memberManage.tsx similarity index 100% rename from ui/src/pages/user-management/memberManage.tsx rename to ui/src/pages/memberManage/memberManage.tsx diff --git a/ui/src/pages/user-management/thirdPartyLoginSettingModal.tsx b/ui/src/pages/memberManage/thirdPartyLoginSettingModal.tsx similarity index 100% rename from ui/src/pages/user-management/thirdPartyLoginSettingModal.tsx rename to ui/src/pages/memberManage/thirdPartyLoginSettingModal.tsx diff --git a/ui/src/router.tsx b/ui/src/router.tsx index 240d2f0..44d237d 100644 --- a/ui/src/router.tsx +++ b/ui/src/router.tsx @@ -32,7 +32,7 @@ const Dashboard = LazyLoadable(lazy(() => import('@/pages/dashboard'))); const Chat = LazyLoadable(lazy(() => import('@/pages/chat'))); const Completion = LazyLoadable(lazy(() => import('@/pages/completion'))); const Model = LazyLoadable(lazy(() => import('@/pages/model'))); -const User = LazyLoadable(lazy(() => import('@/pages/user-management'))); +const MemberManage = LazyLoadable(lazy(() => import('@/pages/memberManage'))); const Admin = LazyLoadable(lazy(() => import('@/pages/admin'))); const Invite = LazyLoadable(lazy(() => import('@/pages/invite'))); const Auth = LazyLoadable(lazy(() => import('@/pages/auth'))); @@ -79,8 +79,8 @@ const routerConfig = [ element: , }, { - path: 'user-management', - element: , + path: 'member-management', + element: , }, { path: 'admin', From 4ab7dcedf5ed09fbbf14823c9d0974426c9f244c Mon Sep 17 00:00:00 2001 From: Gavan <994259213@qq.com> Date: Thu, 24 Jul 2025 20:15:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=A7=A3=E9=94=81=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/pages/memberManage/memberManage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/pages/memberManage/memberManage.tsx b/ui/src/pages/memberManage/memberManage.tsx index 47a1294..bd7ac5a 100644 --- a/ui/src/pages/memberManage/memberManage.tsx +++ b/ui/src/pages/memberManage/memberManage.tsx @@ -305,7 +305,7 @@ const MemberManage = () => { {currentUser?.status === ConstsUserStatus.UserStatusActive && ( - 解锁成员 + 锁定成员 )} {currentUser?.status === ConstsUserStatus.UserStatusLocked && ( 解锁成员 From f64c51be46280014f6fcce4d40e80fac7272df94 Mon Sep 17 00:00:00 2001 From: Gavan <994259213@qq.com> Date: Thu, 24 Jul 2025 20:25:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E9=87=87=E7=BA=B3=E7=8E=87=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/dashboard/components/globalStatistic.tsx | 1 + ui/src/pages/dashboard/components/lineCharts.tsx | 12 ++++++++++-- .../pages/dashboard/components/memberStatistic.tsx | 1 + .../user/dashboard/components/memberStatistic.tsx | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ui/src/pages/dashboard/components/globalStatistic.tsx b/ui/src/pages/dashboard/components/globalStatistic.tsx index 2af58d2..b2b295d 100644 --- a/ui/src/pages/dashboard/components/globalStatistic.tsx +++ b/ui/src/pages/dashboard/components/globalStatistic.tsx @@ -205,6 +205,7 @@ const GlobalStatistic = ({ timeRange }: { timeRange: TimeRange }) => { `${value.toFixed(2)}%`} extra={ <> {timeRange === '90d' ? '最近 90 天' : '最近 24 小时'}平均采纳率为 diff --git a/ui/src/pages/dashboard/components/lineCharts.tsx b/ui/src/pages/dashboard/components/lineCharts.tsx index ec62a76..83001d6 100644 --- a/ui/src/pages/dashboard/components/lineCharts.tsx +++ b/ui/src/pages/dashboard/components/lineCharts.tsx @@ -9,9 +9,15 @@ interface ILineChartsProps { xData: (string | number)[]; yData: number[]; }; + formatValueTooltip?: (value: number) => string; } -const LineCharts: React.FC = ({ title, data, extra }) => { +const LineCharts: React.FC = ({ + title, + data, + extra, + formatValueTooltip, +}) => { const { xData, yData } = data; const domRef = useRef(null); const echartsRef = useRef(null); @@ -75,7 +81,9 @@ const LineCharts: React.FC = ({ title, data, extra }) => { ) => { if (params[0]) { const { name, seriesName, value } = params[0]; - return `
${name}
${seriesName} ${value}
`; + return `
${name}
${seriesName} ${ + formatValueTooltip ? formatValueTooltip(value) : value + }
`; } return ''; }, diff --git a/ui/src/pages/dashboard/components/memberStatistic.tsx b/ui/src/pages/dashboard/components/memberStatistic.tsx index bfd3948..472f531 100644 --- a/ui/src/pages/dashboard/components/memberStatistic.tsx +++ b/ui/src/pages/dashboard/components/memberStatistic.tsx @@ -202,6 +202,7 @@ const MemberStatistic = ({ `${value.toFixed(2)}%`} extra={ <> {timeRange === '90d' ? '最近 90 天' : '最近 24 小时'}平均采纳率为 diff --git a/ui/src/pages/user/dashboard/components/memberStatistic.tsx b/ui/src/pages/user/dashboard/components/memberStatistic.tsx index 7b8a06c..bdb66dc 100644 --- a/ui/src/pages/user/dashboard/components/memberStatistic.tsx +++ b/ui/src/pages/user/dashboard/components/memberStatistic.tsx @@ -178,6 +178,7 @@ const MemberStatistic = ({ `${value.toFixed(2)}%`} extra={ <> {timeRange === '90d' ? '最近 90 天' : '最近 24 小时'}平均采纳率为