From d37433eacdfdfc939b0f07aeeea300ae288ff04f Mon Sep 17 00:00:00 2001 From: Archer <545436317@qq.com> Date: Mon, 23 Oct 2023 08:56:43 +0800 Subject: [PATCH] Config file to set doc baseurl (#419) --- packages/global/common/system/types/index.d.ts | 3 ++- projects/app/src/components/Layout/navbar.tsx | 2 +- projects/app/src/components/support/apikey/Table.tsx | 2 +- projects/app/src/pages/account/components/Info.tsx | 2 +- projects/app/src/pages/api/system/getInitData.ts | 2 ++ .../src/pages/app/detail/components/AIChatSettingsModal.tsx | 2 +- .../app/src/pages/app/detail/components/OutLink/Share.tsx | 2 +- projects/app/src/pages/components/Footer.tsx | 2 +- projects/app/src/pages/components/Navbar.tsx | 2 +- .../pages/dataset/detail/components/Import/FileSelect.tsx | 5 ++++- projects/app/src/pages/login/components/LoginForm.tsx | 2 +- projects/app/src/pages/tools/index.tsx | 2 +- 12 files changed, 17 insertions(+), 11 deletions(-) diff --git a/packages/global/common/system/types/index.d.ts b/packages/global/common/system/types/index.d.ts index fae17e3fe..313283a58 100644 --- a/packages/global/common/system/types/index.d.ts +++ b/packages/global/common/system/types/index.d.ts @@ -9,7 +9,8 @@ export type FeConfigsType = { show_openai_account?: boolean; show_promotion?: boolean; hide_app_flow?: boolean; - openAPIUrl?: string; + docUrl?: string; + openAPIDocUrl?: string; systemTitle?: string; authorText?: string; googleClientVerKey?: string; diff --git a/projects/app/src/components/Layout/navbar.tsx b/projects/app/src/components/Layout/navbar.tsx index 98d267b39..a15afd3c4 100644 --- a/projects/app/src/components/Layout/navbar.tsx +++ b/projects/app/src/components/Layout/navbar.tsx @@ -174,7 +174,7 @@ const Navbar = ({ unread }: { unread: number }) => { mb={0} color={'#9096a5'} onClick={() => { - window.open(`https://doc.fastgpt.run/docs/intro`); + window.open(`${feConfigs.docUrl}/docs/intro`); }} > diff --git a/projects/app/src/components/support/apikey/Table.tsx b/projects/app/src/components/support/apikey/Table.tsx index b3c325929..255fecb64 100644 --- a/projects/app/src/components/support/apikey/Table.tsx +++ b/projects/app/src/components/support/apikey/Table.tsx @@ -83,7 +83,7 @@ const ApiKeyTable = ({ tips, appId }: { tips: string; appId?: string }) => { API 秘钥管理 { cursor={'pointer'} userSelect={'none'} onClick={() => { - window.open(`https://doc.fastgpt.run/docs/intro`); + window.open(`${feConfigs.docUrl}/docs/intro`); }} > diff --git a/projects/app/src/pages/api/system/getInitData.ts b/projects/app/src/pages/api/system/getInitData.ts index b6d4da47c..07371f567 100644 --- a/projects/app/src/pages/api/system/getInitData.ts +++ b/projects/app/src/pages/api/system/getInitData.ts @@ -50,6 +50,8 @@ const defaultFeConfigs: FeConfigsType = { show_contact: true, show_git: true, show_doc: true, + docUrl: 'https://docs.fastgpt.run', + openAPIDocUrl: 'https://doc.fastgpt.run/docs/development/openapi', systemTitle: 'FastGPT', authorText: 'Made by FastGPT Team.', limit: { diff --git a/projects/app/src/pages/app/detail/components/AIChatSettingsModal.tsx b/projects/app/src/pages/app/detail/components/AIChatSettingsModal.tsx index f711678cc..2963f8dac 100644 --- a/projects/app/src/pages/app/detail/components/AIChatSettingsModal.tsx +++ b/projects/app/src/pages/app/detail/components/AIChatSettingsModal.tsx @@ -69,7 +69,7 @@ const AIChatSettingsModal = ({ {t('app.AI Settings')} {feConfigs?.show_doc && ( { { label: t('home.Footer Docs'), onClick: () => { - window.open('https://doc.fastgpt.run/docs/intro', '_blank'); + window.open(`${feConfigs.docUrl}/docs/intro`, '_blank'); } } ] diff --git a/projects/app/src/pages/components/Navbar.tsx b/projects/app/src/pages/components/Navbar.tsx index 160c00ee3..0a10d49a0 100644 --- a/projects/app/src/pages/components/Navbar.tsx +++ b/projects/app/src/pages/components/Navbar.tsx @@ -47,7 +47,7 @@ const Navbar = () => { label: t('home.Docs'), key: 'docs', onClick: () => { - window.open('https://doc.fastgpt.run/docs/intro'); + window.open(`${feConfigs.docUrl}/docs/intro`); } } ] diff --git a/projects/app/src/pages/dataset/detail/components/Import/FileSelect.tsx b/projects/app/src/pages/dataset/detail/components/Import/FileSelect.tsx index 84e95e8ac..349c32407 100644 --- a/projects/app/src/pages/dataset/detail/components/Import/FileSelect.tsx +++ b/projects/app/src/pages/dataset/detail/components/Import/FileSelect.tsx @@ -135,13 +135,16 @@ const FileSelect = ({ filename: file.name, icon, tokens: filterData.reduce((sum, item) => sum + countPromptTokens(item.q), 0), - text: '', + text: `${header.join(',')}\n${data + .map((item) => `"${item[0]}","${item[1]}"`) + .join('\n')}`, chunks: filterData, type: DatasetCollectionTypeEnum.file, metadata: { fileId } }; + console.log(fileItem); onPushFiles([fileItem]); continue; diff --git a/projects/app/src/pages/login/components/LoginForm.tsx b/projects/app/src/pages/login/components/LoginForm.tsx index 8290c8960..d5892180f 100644 --- a/projects/app/src/pages/login/components/LoginForm.tsx +++ b/projects/app/src/pages/login/components/LoginForm.tsx @@ -143,7 +143,7 @@ const LoginForm = ({ setPageType, loginSuccess }: Props) => { 使用即代表你同意我们的{' '} diff --git a/projects/app/src/pages/tools/index.tsx b/projects/app/src/pages/tools/index.tsx index d78368921..8e2bca1dc 100644 --- a/projects/app/src/pages/tools/index.tsx +++ b/projects/app/src/pages/tools/index.tsx @@ -39,7 +39,7 @@ const Tools = () => { { icon: 'courseLight', label: '使用文档', - link: 'https://doc.fastgpt.run/docs/intro' + link: `${feConfigs.docUrl}/docs/intro` } ] : [])