Merge remote-tracking branch 'origin/new-page-framework' into dev_ty_06_end

# Conflicts:
#	datacenter/hooks/useAgentChat.ts
This commit is contained in:
tuyang.yhj 2023-07-05 11:11:53 +08:00
commit 6047da70c8
2 changed files with 4 additions and 4 deletions

View File

@ -114,8 +114,8 @@ const Index = () => {
sx={{ sx={{
width: '100%', width: '100%',
height: '100%', height: '100%',
backgroundColor: mode === 'light' ? 'rgb(238, 240, 245)' : 'rgb(33, 33, 33)'
}} }}
className='bg-[#EEF0F5] dark:bg-[#212121]'
> >
<Box className="page-body p-4" sx={{ <Box className="page-body p-4" sx={{
'&': { '&': {
@ -149,7 +149,6 @@ const Index = () => {
fontSize: '18px', fontSize: '18px',
fontWeight: 'bold', fontWeight: 'bold',
color: 'black', color: 'black',
backgroundColor: mode === 'light' ? 'rgb(224, 228, 237)' : 'rgb(72, 72, 72)',
flexShrink: 0, flexShrink: 0,
flexGrow: 0, flexGrow: 0,
cursor: 'pointer', cursor: 'pointer',
@ -158,6 +157,7 @@ const Index = () => {
} }
}} }}
onClick={() => setIsAddKnowledgeSpaceModalShow(true)} onClick={() => setIsAddKnowledgeSpaceModalShow(true)}
className='bg-[#E0E4ED] dark:bg-[#484848]'
><AddBoxOutlinedIcon sx={{ marginRight: '10px', fontSize: '30px' }} />Space</Box> ><AddBoxOutlinedIcon sx={{ marginRight: '10px', fontSize: '30px' }} />Space</Box>
{knowledgeSpaceList.map((item: any, index: number) => ( {knowledgeSpaceList.map((item: any, index: number) => (
<Box <Box
@ -166,7 +166,6 @@ const Index = () => {
padding: '30px 20px 40px', padding: '30px 20px 40px',
marginRight: '30px', marginRight: '30px',
marginBottom: '30px', marginBottom: '30px',
backgroundColor: mode === 'light' ? 'rgb(255, 255, 255)' : 'rgb(72, 72, 72)',
borderTop: '3px solid rgb(82, 196, 26)', borderTop: '3px solid rgb(82, 196, 26)',
flexShrink: 0, flexShrink: 0,
flexGrow: 0, flexGrow: 0,
@ -178,6 +177,7 @@ const Index = () => {
onClick={() => { onClick={() => {
router.push(`/datastores/documents?name=${item.name}`); router.push(`/datastores/documents?name=${item.name}`);
}} }}
className='bg-[#FFFFFF] dark:bg-[#484848]'
> >
<Box sx={{ <Box sx={{
fontSize: '18px', fontSize: '18px',

View File

@ -49,7 +49,7 @@ import { useDialogueContext } from '@/app/context/dialogue';
const ctrl = new AbortController(); const ctrl = new AbortController();
let buffer = ''; let buffer = '';
await fetchEventSource(`${process.env.API_BASE_URL ? process.env.API_BASE_URL: ''}{"/api" + queryAgentURL}`, { await fetchEventSource(`${process.env.API_BASE_URL ? process.env.API_BASE_URL : ''}${"/api" + queryAgentURL}`, {
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',