Merge pull request #101 from safe1ine/main

safe1ine · web-flow · commit a40a37b90158 · 2025-07-17T19:47:21.000+08:00
增加了成员登录记录 &amp;&amp; 支持删除模型
diff --git a/ui/src/api/Model.ts b/ui/src/api/Model.ts
@@ -12,6 +12,7 @@
 
 import request, { ContentType, RequestParams } from "./httpClient";
 import {
+  DeleteDeleteModelParams,
   DomainAllModelResp,
   DomainCheckModelReq,
   DomainCreateModelReq,
@@ -111,6 +112,29 @@ export const postCreateModel = (
     ...params,
   });
 
+/**
+ * @description 删除模型
+ *
+ * @tags Model
+ * @name DeleteDeleteModel
+ * @summary 删除模型
+ * @request DELETE:/api/v1/model
+ * @response `200` `WebResp` OK
+ */
+
+export const deleteDeleteModel = (
+  query: DeleteDeleteModelParams,
+  params: RequestParams = {},
+) =>
+  request<WebResp>({
+    path: `/api/v1/model`,
+    method: "DELETE",
+    query: query,
+    type: ContentType.Json,
+    format: "json",
+    ...params,
+  });
+
 /**
  * @description 检查模型
  *
diff --git a/ui/src/api/types.ts b/ui/src/api/types.ts
@@ -210,7 +210,8 @@ export interface DomainCreateModelReq {
     | "BaiZhiCloud"
     | "Hunyuan"
     | "BaiLian"
-    | "Volcengine";
+    | "Volcengine"
+    | "Other";
   /** 模型显示名称 */
   show_name?: string;
 }
@@ -414,7 +415,8 @@ export interface DomainModelBasic {
     | "BaiZhiCloud"
     | "Hunyuan"
     | "BaiLian"
-    | "Volcengine";
+    | "Volcengine"
+    | "Other";
 }
 
 export interface DomainModelData {
@@ -581,7 +583,8 @@ export interface DomainUpdateModelReq {
     | "BaiZhiCloud"
     | "Hunyuan"
     | "BaiLian"
-    | "Volcengine";
+    | "Volcengine"
+    | "Other";
   /** 模型显示名称 */
   show_name?: string;
   /** 状态 active:启用 inactive:禁用 */
@@ -621,6 +624,8 @@ export interface DomainUser {
   email?: string;
   /** 用户ID */
   id?: string;
+  /** 是否删除 */
+  is_deleted?: boolean;
   /** 最后活跃时间 */
   last_active_at?: number;
   /** 用户状态 active: 正常 locked: 锁定 inactive: 禁用 */
@@ -656,12 +661,16 @@ export interface DomainUserHeatmapResp {
 }
 
 export interface DomainUserLoginHistory {
+  /** 插件ID vscode */
+  client_id?: string;
   /** 客户端版本 */
   client_version?: string;
   /** 登录时间 */
   created_at?: number;
   /** 设备信息 */
   device?: string;
+  /** 主机名 */
+  hostname?: string;
   /** IP信息 */
   ip_info?: DomainIPInfo;
   /** 用户信息 */
@@ -870,6 +879,11 @@ export interface GetUserStatDashboardParams {
   user_id?: string;
 }
 
+export interface DeleteDeleteModelParams {
+  /** 模型ID */
+  id: string;
+}
+
 export interface GetMyModelListParams {
   /** 模型类型 llm:对话模型 coder:代码模型 */
   model_type?: "llm" | "coder" | "embedding" | "audio" | "reranker";
diff --git a/ui/src/components/user/index.tsx b/ui/src/components/user/index.tsx
@@ -7,11 +7,13 @@ const User = ({
   username = '',
   email = '',
   avatar = '',
+  deleted = false,
 }: {
   id?: string;
   username?: string;
   email?: string;
   avatar?: string;
+  deleted?: boolean;
 }) => {
   return (
     <Stack>
@@ -31,11 +33,24 @@ const User = ({
             src={avatar}
             sx={{ width: 20, height: 20, fontSize: 12 }}
           />
-          <Typography sx={{ pt: '2px' }}>{username}</Typography>
+          <Typography sx={{ 
+            pt: '2px', 
+            textDecoration: deleted ? 'line-through' : 'none',
+            color: deleted ? 'text.disabled' : 'text.primary',
+            whiteSpace: 'nowrap', 
+            overflow: 'hidden', 
+            textOverflow: 'ellipsis'
+          }}>{username}</Typography>
         </Stack>
       </Link>
       {email && (
-        <Typography color='text.auxiliary' sx={{ fontSize: 14 }}>
+        <Typography sx={{ 
+          fontSize: 14,
+          color: deleted ? 'text.disabled' : 'text.auxiliary',
+          whiteSpace: 'nowrap', 
+          overflow: 'hidden', 
+          textOverflow: 'ellipsis'
+        }}>
           {email}
         </Typography>
       )}
diff --git a/ui/src/pages/admin/loginHistory.tsx b/ui/src/pages/admin/loginHistory.tsx
@@ -40,7 +40,12 @@ const LoginHistory = () => {
       title: '登录时间',
       dataIndex: 'created_at',
       render: (text) => {
-        return dayjs.unix(text).format('YYYY-MM-DD HH:mm:ss');
+        return (
+          <Stack direction='column'>
+            <Box>{dayjs.unix(text).format('YYYY-MM-DD')}</Box>
+            <Box>{dayjs.unix(text).format('HH:mm:ss')}</Box>
+          </Stack>
+        )
       },
     },
   ];
@@ -52,7 +57,7 @@ const LoginHistory = () => {
         alignItems='center'
         sx={{ mb: 2 }}
       >
-        <Box sx={{ fontWeight: 700, lineHeight: '36px' }}>登录记录</Box>
+        <Box sx={{ fontWeight: 700, lineHeight: '36px' }}>管理员登录记录</Box>
       </Stack>
       <Table
         columns={columns}
diff --git a/ui/src/pages/chat/index.tsx b/ui/src/pages/chat/index.tsx
@@ -50,6 +50,7 @@ const Chat = () => {
             username={value.username!}
             email={value.email!}
             avatar={value.avatar_url!}
+            deleted={value.is_deleted!}
           />
         );
       },
diff --git a/ui/src/pages/completion/index.tsx b/ui/src/pages/completion/index.tsx
@@ -95,6 +95,7 @@ const Completion = () => {
             username={value.username!}
             email={value.email!}
             avatar={value.avatar_url!}
+            deleted={value.is_deleted!}
           />
         );
       },
diff --git a/ui/src/pages/model/components/modelCard.tsx b/ui/src/pages/model/components/modelCard.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import Card from '@/components/card';
 import { useRequest } from 'ahooks';
-import { getMyModelList, putUpdateModel } from '@/api/Model';
+import { deleteDeleteModel, getMyModelList, putUpdateModel } from '@/api/Model';
 import { DomainModel, ConstsModelStatus, ConstsModelType } from '@/api/types';
 import { Stack, Box, Button, Grid2 as Grid, ButtonBase } from '@mui/material';
 import StyledLabel from '@/components/label';
@@ -48,6 +48,31 @@ const ModelItem = ({
       },
     });
   };
+  
+  const onRemoveModel = () => {
+    Modal.confirm({
+      title: '删除模型',
+      content: (
+        <>
+          确定要删除{' '}
+          <Box component='span' sx={{ fontWeight: 700, color: 'text.primary' }}>
+            {data.model_name}
+          </Box>{' '}
+          模型吗？
+        </>
+      ),
+      okText: '删除',
+      okButtonProps: {
+        color: 'error',
+      },
+      onOk: () => {
+        deleteDeleteModel({ id: data.id! }).then(() => {
+          message.success('删除成功');
+          refresh();
+        });
+      },
+    });
+  };
 
   const onActiveModel = () => {
     Modal.confirm({
@@ -169,6 +194,18 @@ const ModelItem = ({
           sx={{ button: { minWidth: 0 } }}
           gap={2}
         >
+          {!data.is_active && (
+            <ButtonBase
+              disableRipple
+              sx={{
+                color: 'success.main',
+              }}
+              onClick={onActiveModel}
+            >
+              激活
+            </ButtonBase>
+          )}
+
           {!data.is_internal && <ButtonBase
             disableRipple
             sx={{
@@ -178,32 +215,30 @@ const ModelItem = ({
           >
             编辑
           </ButtonBase>}
-          {!data.is_active && (
+
+          {data.is_active && (
             <ButtonBase
               disableRipple
               sx={{
-                color: 'success.main',
+                color: 'error.main',
               }}
-              onClick={onActiveModel}
+              onClick={onInactiveModel}
             >
-              激活
+              停用
             </ButtonBase>
           )}
 
-          {data.is_active && (
+          {data.is_internal === false && data.is_active === false && (
             <ButtonBase
               disableRipple
               sx={{
                 color: 'error.main',
               }}
-              onClick={onInactiveModel}
+              onClick={onRemoveModel}
             >
-              停用
+              删除
             </ButtonBase>
           )}
-          {/* <Button color='error' size='small'>
-            删除
-          </Button> */}
         </Stack>
       </Stack>
     </Card>
diff --git a/ui/src/pages/user-management/loginHistory.tsx b/ui/src/pages/user-management/loginHistory.tsx
@@ -20,35 +20,62 @@ const LoginHistory = () => {
       dataIndex: 'user',
       render: (user, record) => {
         return (
-          <User
-            username={record.user!.username!}
-            id={record.user!.id!}
-            email={record.user!.email!}
-            avatar={record.user!.avatar_url!}
-          />
+          <Box sx={{ whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
+            <User
+              username={record.user!.username!}
+              id={record.user!.id!}
+              email={record.user!.email!}
+              avatar={record.user!.avatar_url!}
+              deleted={record.user!.is_deleted!}
+            />
+          </Box>
         );
       },
     },
     {
       title: '设备',
       dataIndex: 'device',
+      render: (ip, record) => {
+        return (
+          <Stack direction='column'>
+            <Box sx={{ whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
+              {record?.device}
+            </Box>
+            <Box sx={{ color: 'text.secondary', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
+              {record?.hostname}
+            </Box>
+          </Stack>
+        );
+      },
     },
     {
-      title: '客户端版本',
-      dataIndex: 'client_version',
+      title: '客户端',
+      dataIndex: 'client',
+      render: (ip, record) => {
+        return (
+          <Stack direction='column'>
+            <Box sx={{ whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
+              {record?.client_id}
+            </Box>
+            <Box sx={{ color: 'text.secondary', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
+              {record?.client_version}
+            </Box>
+          </Stack>
+        );
+      },
     },
     {
-      title: 'IP 地址',
+      title: '源 IP 地址',
       dataIndex: 'ip',
       render: (ip, record) => {
-        let address = '';
-        if (record?.ip_info) {
-          address = `${record?.ip_info?.country}-${record?.ip_info?.city}`;
-        }
         return (
-          <Stack direction='row'>
-            <Box>{ip}</Box>
-            <Box sx={{ color: 'text.secondary' }}>（{address}）</Box>
+          <Stack direction='column'>
+            <Box sx={{ whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
+              {record?.ip_info?.ip}
+            </Box>
+            <Box sx={{ color: 'text.secondary', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
+              {record?.ip_info?.country === '中国' ? ('' + record?.ip_info?.province + '-' + record?.ip_info?.city) : (record?.ip_info?.country || '未知')}
+            </Box>
           </Stack>
         );
       },
@@ -57,7 +84,16 @@ const LoginHistory = () => {
       title: '登录时间',
       dataIndex: 'created_at',
       render: (text) => {
-        return dayjs.unix(text).format('YYYY-MM-DD HH:mm:ss');
+        return (
+          <Stack direction='column'>
+            <Box sx={{ whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
+              {dayjs.unix(text).format('YYYY-MM-DD')}
+            </Box>
+            <Box sx={{ whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}>
+              {dayjs.unix(text).format('HH:mm:ss')}
+            </Box>
+          </Stack>
+        )
       },
     },
   ];
@@ -69,7 +105,7 @@ const LoginHistory = () => {
         alignItems='center'
         sx={{ mb: 2 }}
       >
-        <Box sx={{ fontWeight: 700 }}>登录历史</Box>
+        <Box sx={{ fontWeight: 700 }}>成员登录记录</Box>
       </Stack>
       <Table
         height='calc(100% - 40px)'
diff --git a/ui/src/pages/user-management/memberManage.tsx b/ui/src/pages/user-management/memberManage.tsx
diff --git a/ui/src/pages/user/chat/index.tsx b/ui/src/pages/user/chat/index.tsx
diff --git a/ui/src/pages/user/completion/index.tsx b/ui/src/pages/user/completion/index.tsx
