From c16e2b8dd669132057dfeaead00c69891392a75d Mon Sep 17 00:00:00 2001 From: archer <545436317@qq.com> Date: Tue, 25 Jul 2023 13:15:41 +0800 Subject: [PATCH] perf: app detail --- client/src/components/ChatBox/QuoteModal.tsx | 2 +- .../ChatBox/ResponseDetailModal.tsx | 3 +-- client/src/components/ChatBox/index.tsx | 1 + client/src/constants/theme.ts | 6 +++++ .../{Edit => AdEdit}/components/ChatTest.tsx | 0 .../components/Nodes/NodeAnswer.tsx | 0 .../components/Nodes/NodeCQNode.tsx | 0 .../components/Nodes/NodeChat.tsx | 0 .../components/Nodes/NodeEmpty.tsx | 0 .../components/Nodes/NodeHistory.tsx | 0 .../components/Nodes/NodeKbSearch.tsx | 0 .../components/Nodes/NodeQuestionInput.tsx | 0 .../components/Nodes/NodeTFSwitch.tsx | 0 .../components/Nodes/NodeUserGuide.tsx | 0 .../components/Nodes/NodeVariable.tsx | 0 .../components/TemplateList.tsx | 0 .../components/modules/ButtonEdge.tsx | 0 .../components/modules/Container.tsx | 0 .../components/modules/Divider.tsx | 0 .../components/modules/Label.tsx | 0 .../components/modules/NodeCard.tsx | 0 .../components/render/RenderInput.tsx | 0 .../components/render/RenderOutput.tsx | 0 .../{Edit => AdEdit}/index.module.scss | 0 .../components/{Edit => AdEdit}/index.tsx | 0 .../detail/components/Charts/TotalUsage.tsx | 2 +- .../pages/app/detail/components/OverView.tsx | 23 ++++++++++++------- client/src/pages/app/detail/index.tsx | 19 ++++++++++----- .../src/pages/chat/components/SliderApps.tsx | 2 +- 29 files changed, 39 insertions(+), 19 deletions(-) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/ChatTest.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/Nodes/NodeAnswer.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/Nodes/NodeCQNode.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/Nodes/NodeChat.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/Nodes/NodeEmpty.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/Nodes/NodeHistory.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/Nodes/NodeKbSearch.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/Nodes/NodeQuestionInput.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/Nodes/NodeTFSwitch.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/Nodes/NodeUserGuide.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/Nodes/NodeVariable.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/TemplateList.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/modules/ButtonEdge.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/modules/Container.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/modules/Divider.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/modules/Label.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/modules/NodeCard.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/render/RenderInput.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/components/render/RenderOutput.tsx (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/index.module.scss (100%) rename client/src/pages/app/detail/components/{Edit => AdEdit}/index.tsx (100%) diff --git a/client/src/components/ChatBox/QuoteModal.tsx b/client/src/components/ChatBox/QuoteModal.tsx index 5d785f754..0ff91c35c 100644 --- a/client/src/components/ChatBox/QuoteModal.tsx +++ b/client/src/components/ChatBox/QuoteModal.tsx @@ -90,7 +90,7 @@ const QuoteModal = ({ key={item.id} flex={'1 0 0'} p={2} - borderRadius={'sm'} + borderRadius={'lg'} border={theme.borders.base} _notLast={{ mb: 2 }} position={'relative'} diff --git a/client/src/components/ChatBox/ResponseDetailModal.tsx b/client/src/components/ChatBox/ResponseDetailModal.tsx index 62483b6f0..02cb09234 100644 --- a/client/src/components/ChatBox/ResponseDetailModal.tsx +++ b/client/src/components/ChatBox/ResponseDetailModal.tsx @@ -2,7 +2,6 @@ import React, { useCallback, useMemo, useState } from 'react'; import { ChatModuleEnum } from '@/constants/chat'; import { ChatHistoryItemResType, ChatItemType, QuoteItemType } from '@/types/chat'; import { Flex, BoxProps } from '@chakra-ui/react'; -import { updateHistoryQuote } from '@/api/chat'; import dynamic from 'next/dynamic'; import Tag from '../Tag'; import MyTooltip from '../MyTooltip'; @@ -62,7 +61,7 @@ const ResponseDetailModal = ({ )} {completeMessages.length > 0 && ( - + {item.value} diff --git a/client/src/constants/theme.ts b/client/src/constants/theme.ts index 397a5bce6..cda927f1f 100644 --- a/client/src/constants/theme.ts +++ b/client/src/constants/theme.ts @@ -293,6 +293,12 @@ export const theme = extendTheme({ md: '1px solid #DAE0E2', lg: '1px solid #D0E0E2' }, + shadows: { + sm: '0 0 5px rgba(0,0,0,0.1)', + md: '0 0 8px rgba(0,0,0,0.1)', + base: '0 0 10px rgba(0,0,0,0.15)', + lg: '0 0 10px rgba(0,0,0,0.2)' + }, breakpoints: { sm: '900px', md: '1200px', diff --git a/client/src/pages/app/detail/components/Edit/components/ChatTest.tsx b/client/src/pages/app/detail/components/AdEdit/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/AdEdit/components/ChatTest.tsx diff --git a/client/src/pages/app/detail/components/Edit/components/Nodes/NodeAnswer.tsx b/client/src/pages/app/detail/components/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/components/Nodes/NodeChat.tsx diff --git a/client/src/pages/app/detail/components/Edit/components/Nodes/NodeEmpty.tsx b/client/src/pages/app/detail/components/AdEdit/components/Nodes/NodeEmpty.tsx similarity index 100% rename from client/src/pages/app/detail/components/Edit/components/Nodes/NodeEmpty.tsx rename to client/src/pages/app/detail/components/AdEdit/components/Nodes/NodeEmpty.tsx diff --git a/client/src/pages/app/detail/components/Edit/components/Nodes/NodeHistory.tsx b/client/src/pages/app/detail/components/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/components/Nodes/NodeVariable.tsx diff --git a/client/src/pages/app/detail/components/Edit/components/TemplateList.tsx b/client/src/pages/app/detail/components/AdEdit/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/AdEdit/components/TemplateList.tsx diff --git a/client/src/pages/app/detail/components/Edit/components/modules/ButtonEdge.tsx b/client/src/pages/app/detail/components/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/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/AdEdit/components/render/RenderOutput.tsx diff --git a/client/src/pages/app/detail/components/Edit/index.module.scss b/client/src/pages/app/detail/components/AdEdit/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/AdEdit/index.module.scss diff --git a/client/src/pages/app/detail/components/Edit/index.tsx b/client/src/pages/app/detail/components/AdEdit/index.tsx similarity index 100% rename from client/src/pages/app/detail/components/Edit/index.tsx rename to client/src/pages/app/detail/components/AdEdit/index.tsx diff --git a/client/src/pages/app/detail/components/Charts/TotalUsage.tsx b/client/src/pages/app/detail/components/Charts/TotalUsage.tsx index d105d5b53..05ce09b55 100644 --- a/client/src/pages/app/detail/components/Charts/TotalUsage.tsx +++ b/client/src/pages/app/detail/components/Charts/TotalUsage.tsx @@ -192,7 +192,7 @@ const TokenUsage = ({ appId }: { appId: string }) => { }, [screenWidth]); return ( - + ); diff --git a/client/src/pages/app/detail/components/OverView.tsx b/client/src/pages/app/detail/components/OverView.tsx index 6c38b475e..bdf4ba741 100644 --- a/client/src/pages/app/detail/components/OverView.tsx +++ b/client/src/pages/app/detail/components/OverView.tsx @@ -13,7 +13,7 @@ import dynamic from 'next/dynamic'; import Avatar from '@/components/Avatar'; import MyIcon from '@/components/Icon'; import TotalUsage from './Charts/TotalUsage'; -import BasicEdit from './BasicEdit'; +import MyTooltip from '@/components/MyTooltip'; const InfoModal = dynamic(() => import('./InfoModal')); @@ -74,7 +74,9 @@ const OverView = ({ appId }: { appId: string }) => { position={'relative'} > - + + + {appDetail.name} @@ -95,7 +97,14 @@ const OverView = ({ appId }: { appId: string }) => { onClick={openConfirm(handleDelModel)} /> - + {appDetail.intro || '快来给应用一个介绍~'} @@ -138,14 +147,12 @@ const OverView = ({ appId }: { appId: string }) => { 近 14 日消费 - + + + - - - - {settingAppInfo && ( setSettingAppInfo(undefined)} /> )} diff --git a/client/src/pages/app/detail/index.tsx b/client/src/pages/app/detail/index.tsx index 80bd69e13..387034ebb 100644 --- a/client/src/pages/app/detail/index.tsx +++ b/client/src/pages/app/detail/index.tsx @@ -15,7 +15,11 @@ import MyIcon from '@/components/Icon'; import PageContainer from '@/components/PageContainer'; import Loading from '@/components/Loading'; -const Edit = dynamic(() => import('./components/Edit'), { +const BasicEdit = dynamic(() => import('./components/BasicEdit'), { + ssr: false, + loading: () => +}); +const AdEdit = dynamic(() => import('./components/AdEdit'), { ssr: false, loading: () => }); @@ -28,7 +32,8 @@ const API = dynamic(() => import('./components/API'), { enum TabEnum { 'overview' = 'overview', - 'settings' = 'settings', + 'basicEdit' = 'basicEdit', + 'adEdit' = 'adEdit', 'share' = 'share', 'API' = 'API' } @@ -54,8 +59,9 @@ const AppDetail = ({ currentTab }: { currentTab: `${TabEnum}` }) => { const tabList = useMemo( () => [ - { label: '基础', id: TabEnum.overview, icon: 'overviewLight' }, - { label: '高级编排', id: TabEnum.settings, icon: 'settingLight' }, + { label: '概览', id: TabEnum.overview, icon: 'overviewLight' }, + { label: '简易编排', id: TabEnum.basicEdit, icon: 'edit' }, + { label: '高级编排', id: TabEnum.adEdit, icon: 'settingLight' }, { label: '链接分享', id: TabEnum.share, icon: 'shareLight' }, { label: 'API访问', id: TabEnum.API, icon: 'apiLight' }, { label: '立即对话', id: 'startChat', icon: 'chatLight' } @@ -169,8 +175,9 @@ const AppDetail = ({ currentTab }: { currentTab: `${TabEnum}` }) => { {currentTab === TabEnum.overview && } - {currentTab === TabEnum.settings && appDetail && ( - } + {currentTab === TabEnum.adEdit && appDetail && ( + setCurrentTab(TabEnum.overview)} diff --git a/client/src/pages/chat/components/SliderApps.tsx b/client/src/pages/chat/components/SliderApps.tsx index 091c9f8b1..24949645f 100644 --- a/client/src/pages/chat/components/SliderApps.tsx +++ b/client/src/pages/chat/components/SliderApps.tsx @@ -21,7 +21,7 @@ const SliderApps = ({ appId }: { appId: string }) => { px={3} borderRadius={'md'} _hover={{ bg: 'myGray.200' }} - onClick={() => router.back()} + onClick={() => router.push('/app/list')} >