diff --git a/client/Dockerfile b/client/Dockerfile index 256f77e8d..3a631fc0a 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -5,7 +5,8 @@ RUN apk add --no-cache libc6-compat && npm install -g pnpm WORKDIR /app # Install dependencies based on the preferred package manager -COPY package.json pnpm-lock.yaml* ./ +COPY package.json ./ +COPY pnpm-lock.yaml* ./ RUN pnpm config set registry https://registry.npmmirror.com/ RUN \ [ -f pnpm-lock.yaml ] && pnpm install || \ diff --git a/client/src/api/app.ts b/client/src/api/app.ts index 324f3932b..1b446fee1 100644 --- a/client/src/api/app.ts +++ b/client/src/api/app.ts @@ -46,7 +46,7 @@ export const triggerModelCollection = (appId: string) => // ====================== data export const getAppTotalUsage = (data: { appId: string }) => - POST<{ date: Date; total: number }[]>(`/app/data/totalUsage`, { + POST<{ date: String; total: number }[]>(`/app/data/totalUsage`, { ...data, start: addDays(new Date(), -13), end: addDays(new Date(), 1) diff --git a/client/src/pages/app/detail/components/edit/components/ChatTest.tsx b/client/src/pages/app/detail/components/Edit/components/ChatTest.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/ChatTest.tsx rename to client/src/pages/app/detail/components/Edit/components/ChatTest.tsx diff --git a/client/src/pages/app/detail/components/edit/components/Nodes/NodeAnswer.tsx b/client/src/pages/app/detail/components/Edit/components/Nodes/NodeAnswer.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/Nodes/NodeAnswer.tsx rename to client/src/pages/app/detail/components/Edit/components/Nodes/NodeAnswer.tsx diff --git a/client/src/pages/app/detail/components/edit/components/Nodes/NodeCQNode.tsx b/client/src/pages/app/detail/components/Edit/components/Nodes/NodeCQNode.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/Nodes/NodeCQNode.tsx rename to client/src/pages/app/detail/components/Edit/components/Nodes/NodeCQNode.tsx diff --git a/client/src/pages/app/detail/components/edit/components/Nodes/NodeChat.tsx b/client/src/pages/app/detail/components/Edit/components/Nodes/NodeChat.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/Nodes/NodeChat.tsx rename to client/src/pages/app/detail/components/Edit/components/Nodes/NodeChat.tsx diff --git a/client/src/pages/app/detail/components/edit/components/Nodes/NodeHistory.tsx b/client/src/pages/app/detail/components/Edit/components/Nodes/NodeHistory.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/Nodes/NodeHistory.tsx rename to client/src/pages/app/detail/components/Edit/components/Nodes/NodeHistory.tsx diff --git a/client/src/pages/app/detail/components/edit/components/Nodes/NodeKbSearch.tsx b/client/src/pages/app/detail/components/Edit/components/Nodes/NodeKbSearch.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/Nodes/NodeKbSearch.tsx rename to client/src/pages/app/detail/components/Edit/components/Nodes/NodeKbSearch.tsx diff --git a/client/src/pages/app/detail/components/edit/components/Nodes/NodeQuestionInput.tsx b/client/src/pages/app/detail/components/Edit/components/Nodes/NodeQuestionInput.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/Nodes/NodeQuestionInput.tsx rename to client/src/pages/app/detail/components/Edit/components/Nodes/NodeQuestionInput.tsx diff --git a/client/src/pages/app/detail/components/edit/components/Nodes/NodeTFSwitch.tsx b/client/src/pages/app/detail/components/Edit/components/Nodes/NodeTFSwitch.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/Nodes/NodeTFSwitch.tsx rename to client/src/pages/app/detail/components/Edit/components/Nodes/NodeTFSwitch.tsx diff --git a/client/src/pages/app/detail/components/edit/components/Nodes/NodeUserGuide.tsx b/client/src/pages/app/detail/components/Edit/components/Nodes/NodeUserGuide.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/Nodes/NodeUserGuide.tsx rename to client/src/pages/app/detail/components/Edit/components/Nodes/NodeUserGuide.tsx diff --git a/client/src/pages/app/detail/components/edit/components/Nodes/NodeVariable.tsx b/client/src/pages/app/detail/components/Edit/components/Nodes/NodeVariable.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/Nodes/NodeVariable.tsx rename to client/src/pages/app/detail/components/Edit/components/Nodes/NodeVariable.tsx diff --git a/client/src/pages/app/detail/components/edit/components/Plugins/KBSelect.tsx b/client/src/pages/app/detail/components/Edit/components/Plugins/KBSelect.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/Plugins/KBSelect.tsx rename to client/src/pages/app/detail/components/Edit/components/Plugins/KBSelect.tsx diff --git a/client/src/pages/app/detail/components/edit/components/TemplateList.tsx b/client/src/pages/app/detail/components/Edit/components/TemplateList.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/TemplateList.tsx rename to client/src/pages/app/detail/components/Edit/components/TemplateList.tsx diff --git a/client/src/pages/app/detail/components/edit/components/modules/ButtonEdge.tsx b/client/src/pages/app/detail/components/Edit/components/modules/ButtonEdge.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/modules/ButtonEdge.tsx rename to client/src/pages/app/detail/components/Edit/components/modules/ButtonEdge.tsx diff --git a/client/src/pages/app/detail/components/edit/components/modules/Container.tsx b/client/src/pages/app/detail/components/Edit/components/modules/Container.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/modules/Container.tsx rename to client/src/pages/app/detail/components/Edit/components/modules/Container.tsx diff --git a/client/src/pages/app/detail/components/edit/components/modules/Divider.tsx b/client/src/pages/app/detail/components/Edit/components/modules/Divider.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/modules/Divider.tsx rename to client/src/pages/app/detail/components/Edit/components/modules/Divider.tsx diff --git a/client/src/pages/app/detail/components/edit/components/modules/Label.tsx b/client/src/pages/app/detail/components/Edit/components/modules/Label.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/modules/Label.tsx rename to client/src/pages/app/detail/components/Edit/components/modules/Label.tsx diff --git a/client/src/pages/app/detail/components/edit/components/modules/NodeCard.tsx b/client/src/pages/app/detail/components/Edit/components/modules/NodeCard.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/modules/NodeCard.tsx rename to client/src/pages/app/detail/components/Edit/components/modules/NodeCard.tsx diff --git a/client/src/pages/app/detail/components/edit/components/render/RenderInput.tsx b/client/src/pages/app/detail/components/Edit/components/render/RenderInput.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/render/RenderInput.tsx rename to client/src/pages/app/detail/components/Edit/components/render/RenderInput.tsx diff --git a/client/src/pages/app/detail/components/edit/components/render/RenderOutput.tsx b/client/src/pages/app/detail/components/Edit/components/render/RenderOutput.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/components/render/RenderOutput.tsx rename to client/src/pages/app/detail/components/Edit/components/render/RenderOutput.tsx diff --git a/client/src/pages/app/detail/components/edit/index.module.scss b/client/src/pages/app/detail/components/Edit/index.module.scss similarity index 100% rename from client/src/pages/app/detail/components/edit/index.module.scss rename to client/src/pages/app/detail/components/Edit/index.module.scss diff --git a/client/src/pages/app/detail/components/edit/index.tsx b/client/src/pages/app/detail/components/Edit/index.tsx similarity index 100% rename from client/src/pages/app/detail/components/edit/index.tsx rename to client/src/pages/app/detail/components/Edit/index.tsx diff --git a/client/src/pages/app/detail/components/Settings.tsx b/client/src/pages/app/detail/components/OverView.tsx similarity index 90% rename from client/src/pages/app/detail/components/Settings.tsx rename to client/src/pages/app/detail/components/OverView.tsx index 85460507d..e87edff9d 100644 --- a/client/src/pages/app/detail/components/Settings.tsx +++ b/client/src/pages/app/detail/components/OverView.tsx @@ -15,10 +15,8 @@ import MyIcon from '@/components/Icon'; import TotalUsage from './Charts/TotalUsage'; const InfoModal = dynamic(() => import('./InfoModal')); -import AppEdit from './edit'; -import styles from '../../list/index.module.scss'; -const Settings = ({ appId }: { appId: string }) => { +const OverView = ({ appId }: { appId: string }) => { const theme = useTheme(); const { toast } = useToast(); const router = useRouter(); @@ -28,7 +26,6 @@ const Settings = ({ appId }: { appId: string }) => { content: '确认删除该应用?' }); const [settingAppInfo, setSettingAppInfo] = useState(); - const [fullScreen, setFullScreen] = useState(false); /* 点击删除 */ const handleDelModel = useCallback(async () => { @@ -61,7 +58,7 @@ const Settings = ({ appId }: { appId: string }) => { - 概览 + 基本信息 { onClick={openConfirm(handleDelModel)} /> - + {appDetail.intro || '快来给应用一个介绍~'} @@ -140,13 +137,6 @@ const Settings = ({ appId }: { appId: string }) => { - - setFullScreen(val)} - fullScreen={fullScreen} - /> - {settingAppInfo && ( { ); }; -export default Settings; +export default OverView; diff --git a/client/src/pages/app/detail/index.tsx b/client/src/pages/app/detail/index.tsx index 7e10d9cec..87c5f1f7c 100644 --- a/client/src/pages/app/detail/index.tsx +++ b/client/src/pages/app/detail/index.tsx @@ -9,11 +9,16 @@ import { useQuery } from '@tanstack/react-query'; import Tabs from '@/components/Tabs'; import SideTabs from '@/components/SideTabs'; -import Settings from './components/Settings'; +import OverView from './components/OverView'; import Avatar from '@/components/Avatar'; import MyIcon from '@/components/Icon'; import PageContainer from '@/components/PageContainer'; +import Loading from '@/components/Loading'; +const Edit = dynamic(() => import('./components/Edit'), { + ssr: false, + loading: () => +}); const Share = dynamic(() => import('./components/Share'), { ssr: false }); @@ -22,6 +27,7 @@ const API = dynamic(() => import('./components/API'), { }); enum TabEnum { + 'overview' = 'overview', 'settings' = 'settings', 'share' = 'share', 'API' = 'API' @@ -48,7 +54,8 @@ const AppDetail = ({ currentTab }: { currentTab: `${TabEnum}` }) => { const tabList = useMemo( () => [ - { label: '概览', id: TabEnum.settings, icon: 'overviewLight' }, + { label: '概览', id: TabEnum.overview, icon: 'overviewLight' }, + { label: '高级编排', id: TabEnum.settings, icon: 'settingLight' }, { label: '链接分享', id: TabEnum.share, icon: 'shareLight' }, { label: 'API访问', id: TabEnum.API, icon: 'apiLight' }, { label: '立即对话', id: 'startChat', icon: 'chatLight' } @@ -157,7 +164,14 @@ const AppDetail = ({ currentTab }: { currentTab: `${TabEnum}` }) => { /> - {currentTab === TabEnum.settings && } + {currentTab === TabEnum.overview && } + {currentTab === TabEnum.settings && appDetail && ( + setCurrentTab(TabEnum.overview)} + /> + )} {currentTab === TabEnum.API && } {currentTab === TabEnum.share && } @@ -167,7 +181,7 @@ const AppDetail = ({ currentTab }: { currentTab: `${TabEnum}` }) => { }; export async function getServerSideProps(context: any) { - const currentTab = context?.query?.currentTab || TabEnum.settings; + const currentTab = context?.query?.currentTab || TabEnum.overview; return { props: { currentTab } diff --git a/client/src/pages/number/components/InformTable.tsx b/client/src/pages/number/components/InformTable.tsx index 96b862a6c..352c45245 100644 --- a/client/src/pages/number/components/InformTable.tsx +++ b/client/src/pages/number/components/InformTable.tsx @@ -34,6 +34,7 @@ const BillTable = () => { borderRadius={'md'} cursor={item.read ? 'default' : 'pointer'} position={'relative'} + _notLast={{ mb: 3 }} onClick={async () => { if (!item.read) { await readInform(item._id);