diff --git a/server/admin/app/ra/App.tsx b/server/admin/app/ra/App.tsx index 8c710979..be42fbdd 100644 --- a/server/admin/app/ra/App.tsx +++ b/server/admin/app/ra/App.tsx @@ -10,7 +10,7 @@ import jsonServerProvider from 'ra-data-json-server'; import { authProvider, authStorageKey } from './authProvider'; import { UserList } from './resources/user'; import React from 'react'; -import { GroupList } from './resources/group'; +import { GroupList, GroupShow } from './resources/group'; import { MessageList } from './resources/chat'; import { FileList } from './resources/file'; import PersonIcon from '@mui/icons-material/Person'; @@ -77,7 +77,7 @@ export const App = () => ( name="groups" options={{ label: '群组' }} list={GroupList} - show={ShowGuesser} + show={GroupShow} /> > = + React.memo((props) => { + return ( + + + + ); + }); +UserField.displayName = 'UserField'; diff --git a/server/admin/app/ra/resources/group.tsx b/server/admin/app/ra/resources/group.tsx index fb08df3c..f836be36 100644 --- a/server/admin/app/ra/resources/group.tsx +++ b/server/admin/app/ra/resources/group.tsx @@ -8,9 +8,18 @@ import { ArrayField, SingleFieldList, ChipField, + Show, + SimpleShowLayout, + NumberField, + ReferenceField, + BooleanField, + SelectField, + TabbedShowLayout, + ImageField, } from 'react-admin'; import React from 'react'; import { Box } from '@mui/material'; +import { UserField } from '../components/UserField'; const PostListActionToolbar = ({ children, ...props }) => ( {children} @@ -43,3 +52,65 @@ export const GroupList: React.FC = () => ( ); GroupList.displayName = 'GroupList'; + +export const GroupShow: React.FC = () => ( + + + + + + + + + + + + + + + {/* 面板 */} + + + + + + + + + + + + + + + {/* 身份组 */} + + + + + + + + + + {/* 成员列表 */} + + + + + + + + + + +); +GroupShow.displayName = 'GroupShow'; diff --git a/server/admin/app/ra/resources/user.tsx b/server/admin/app/ra/resources/user.tsx index edec9f3b..070aa911 100644 --- a/server/admin/app/ra/resources/user.tsx +++ b/server/admin/app/ra/resources/user.tsx @@ -8,6 +8,7 @@ import { ShowButton, EditButton, SearchInput, + ImageField, } from 'react-admin'; import React from 'react'; import { Box } from '@mui/material'; @@ -33,7 +34,11 @@ export const UserList: React.FC = () => ( - + diff --git a/server/admin/app/server/index.ts b/server/admin/app/server/index.ts index 99446efd..02bd63cf 100644 --- a/server/admin/app/server/index.ts +++ b/server/admin/app/server/index.ts @@ -10,9 +10,9 @@ import { apiRouter } from './router/api'; // 链接数据库 mongoose.connect(process.env.MONGO_URL!, (error: any) => { if (!error) { - return console.info('Mongo connected'); + return console.info('数据库已连接成功'); } - console.error(error); + console.error('数据库连接失败', error); }); const BUILD_DIR = path.join(process.cwd(), 'build');