github/DB-GPT
1
0
Fork 0
mirror of https://github.com/csunny/DB-GPT.git synced 2025-09-13 13:10:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/dev-0.6' into feat/dev-0.6

Browse Source
This commit is contained in:
yhjun1026
2024-08-16 18:09:39 +08:00
parent db8708b226 c5cf487d36
commit f0665be157
3 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web_new/ant-components/chat/input/Resource.tsx
View File

@@ -75,7 +75,7 @@ const Resource: React.FC<{
{db.param}
</>
),
value: db.space_id || db.param,
value: db.param,
};
}),
[dbs],

4
web_new/components/knowledge/doc-panel.tsx
View File

@@ -233,7 +233,7 @@ export default function DocPanel(props: IProps) {
const { run: search, loading: searchLoading } = useRequest(
async (id, doc_name: string) => {
const [, res] = await apiInterceptors(searchDocumentList(id, { doc_name }));
const [, res] = await apiInterceptors(searchDocumentList(space.name, { doc_name }));
return res;
},
{
@@ -249,7 +249,7 @@ export default function DocPanel(props: IProps) {
const { run: editChunkRun, loading: chunkLoading } = useRequest(
async (values: any) => {
return await editChunk(props.space.name, {
questions: values.questions.map((item: any) => item.question),
questions: values.questions?.map((item: any) => item.question),
doc_id: curDoc?.id || '',
doc_name: values.doc_name,
});

48
web_new/pages/chat/index.tsx
View File

@@ -251,20 +251,26 @@ const Chat: React.FC = () => {
}
}, [isChatDefault]);
// if (scene === 'chat_dashboard') {
// return (
// <div>
// <ChatSider
// refresh={refreshDialogList}
// dialogueList={dialogueList}
// listLoading={listLoading}
// historyLoading={historyLoading}
// order={order}
// />
// {isContract ? <DbEditor /> : <ChatContainer />}
// </div>
// );
// }
const contentRender = () => {
if (scene === 'chat_dashboard') {
return (isContract ?
<DbEditor /> :
<ChatContainer />);
} else {
return (isChatDefault ? (
<Content>
<ChatDefault />
</Content>
) : (
<Spin spinning={historyLoading} className="w-full h-full m-auto">
<Content className="flex flex-col h-screen">
<ChatContentContainer ref={scrollRef} />
<ChatInputPanel ctrl={ctrl} />
</Content>
</Spin>
));
}
}
return (
<ChatContentContext.Provider
@@ -304,19 +310,7 @@ const Chat: React.FC = () => {
order={order}
/>
<Layout className="bg-transparent">
{scene === 'chat_dashboard' ? (isContract ? <DbEditor /> : <ChatContainer />) : null}
{scene !== 'chat_dashboard' ? (isChatDefault ? (
<Content>
<ChatDefault />
</Content>
) : (
<Spin spinning={historyLoading} className="w-full h-full m-auto">
<Content className="flex flex-col h-screen">
<ChatContentContainer ref={scrollRef} />
<ChatInputPanel ctrl={ctrl} />
</Content>
</Spin>
)) : null}
{contentRender()}
</Layout>
</Layout>
</Flex>