From c6259fca78d27d8e60adadcb4b76bb66cb43bdba Mon Sep 17 00:00:00 2001 From: archer <545436317@qq.com> Date: Wed, 14 Jun 2023 23:14:26 +0800 Subject: [PATCH] perf: export source --- client/src/api/plugins/kb.ts | 2 +- client/src/pages/api/plugins/kb/data/exportModelData.ts | 9 +++++---- client/src/pages/kb/components/DataCard.tsx | 2 +- client/src/pages/kb/components/Detail.tsx | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/client/src/api/plugins/kb.ts b/client/src/api/plugins/kb.ts index 1ddf3cf01..f01efdb7b 100644 --- a/client/src/api/plugins/kb.ts +++ b/client/src/api/plugins/kb.ts @@ -42,7 +42,7 @@ export const getKbDataList = (data: GetKbDataListProps) => * 获取导出数据(不分页) */ export const getExportDataList = (kbId: string) => - GET<[string, string][]>( + GET<[string, string, string][]>( `/plugins/kb/data/exportModelData`, { kbId }, { diff --git a/client/src/pages/api/plugins/kb/data/exportModelData.ts b/client/src/pages/api/plugins/kb/data/exportModelData.ts index 7d8319197..3bf6cd5b9 100644 --- a/client/src/pages/api/plugins/kb/data/exportModelData.ts +++ b/client/src/pages/api/plugins/kb/data/exportModelData.ts @@ -42,16 +42,17 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse< where: [['kb_id', kbId], 'AND', ['user_id', userId]] }); // 从 pg 中获取所有数据 - const pgData = await PgClient.select<{ q: string; a: string }>('modelData', { + const pgData = await PgClient.select<{ q: string; a: string; source: string }>('modelData', { where: [['kb_id', kbId], 'AND', ['user_id', userId]], - fields: ['q', 'a'], + fields: ['q', 'a', 'source'], order: [{ field: 'id', mode: 'DESC' }], limit: count }); - const data: [string, string][] = pgData.rows.map((item) => [ + const data: [string, string, string][] = pgData.rows.map((item) => [ item.q.replace(/\n/g, '\\n'), - item.a.replace(/\n/g, '\\n') + item.a.replace(/\n/g, '\\n'), + item.source ]); // update export time diff --git a/client/src/pages/kb/components/DataCard.tsx b/client/src/pages/kb/components/DataCard.tsx index d4bf9e404..729635421 100644 --- a/client/src/pages/kb/components/DataCard.tsx +++ b/client/src/pages/kb/components/DataCard.tsx @@ -95,7 +95,7 @@ const DataCard = ({ kbId }: { kbId: string }) => { onSuccess(res) { try { const text = Papa.unparse({ - fields: ['question', 'answer'], + fields: ['question', 'answer', 'source'], data: res }); fileDownload({ diff --git a/client/src/pages/kb/components/Detail.tsx b/client/src/pages/kb/components/Detail.tsx index 33a360691..1ea22f1a1 100644 --- a/client/src/pages/kb/components/Detail.tsx +++ b/client/src/pages/kb/components/Detail.tsx @@ -36,7 +36,7 @@ const Detail = ({ kbId }: { kbId: string }) => { }); const { reset } = form; - useQuery([kbId, myKbList], () => getKbDetail(kbId), { + useQuery([kbId], () => getKbDetail(kbId), { onSuccess(res) { kbId && setLastKbId(kbId); if (res) {