diff --git a/projects/app/src/pageComponents/chat/ChatFavouriteApp/index.tsx b/projects/app/src/pageComponents/chat/ChatFavouriteApp/index.tsx index fef3041cc..36c109a7b 100644 --- a/projects/app/src/pageComponents/chat/ChatFavouriteApp/index.tsx +++ b/projects/app/src/pageComponents/chat/ChatFavouriteApp/index.tsx @@ -29,10 +29,15 @@ import ChatSliderMobileDrawer from '@/pageComponents/chat/slider/ChatSliderMobil import { useSystem } from '@fastgpt/web/hooks/useSystem'; import { ChatContext } from '@/web/core/chat/context/chatContext'; import EmptyTip from '@fastgpt/web/components/common/EmptyTip'; +import { useSystemStore } from '@/web/common/system/useSystemStore'; +import { getWebReqUrl } from '@fastgpt/web/common/system/utils'; +import { useUserStore } from '@/web/support/user/useUserStore'; const ChatFavouriteApp = () => { const { isPc } = useSystem(); const { t } = useTranslation(); + const { feConfigs } = useSystemStore(); + const { userInfo } = useUserStore(); const onOpenSlider = useContextSelector(ChatContext, (v) => v.onOpenSlider); @@ -91,24 +96,26 @@ const ChatFavouriteApp = () => { if (!tag) return null; return ( - e.stopPropagation()} > {tag.name} - + ); }; return ( - + {!isPc && ( { handlePaneChange(ChatSidebarPaneEnum.RECENTLY_USED_APPS, app.appId)} > - - - - {app.name} - + + + {app.name} + - {app.intro} + + {app.intro || t('common:no_intro')} - + {app.favouriteTags.slice(0, 3).map((id) => ( ))} @@ -276,19 +284,21 @@ const ChatFavouriteApp = () => { - + {userInfo?.permission.hasManagePer && ( + + )} )} diff --git a/projects/app/src/pageComponents/chat/ChatSetting/FavouriteAppSetting/TagManageModal.tsx b/projects/app/src/pageComponents/chat/ChatSetting/FavouriteAppSetting/TagManageModal.tsx index 8b3ea8254..fb80edb0b 100644 --- a/projects/app/src/pageComponents/chat/ChatSetting/FavouriteAppSetting/TagManageModal.tsx +++ b/projects/app/src/pageComponents/chat/ChatSetting/FavouriteAppSetting/TagManageModal.tsx @@ -129,9 +129,9 @@ const EditableTagItem = React.memo(function EditableTagItem({ }} /> ) : ( - + {tag.name} - + )} ({appCount ?? 0}) @@ -286,9 +286,9 @@ const SaveTagForAppSubPanel = ({ /> - + {tag.name} - + ({checkedAppIds.length}) diff --git a/projects/app/src/pageComponents/chat/ChatSetting/FavouriteAppSetting/index.tsx b/projects/app/src/pageComponents/chat/ChatSetting/FavouriteAppSetting/index.tsx index 8daec2228..f16513c14 100644 --- a/projects/app/src/pageComponents/chat/ChatSetting/FavouriteAppSetting/index.tsx +++ b/projects/app/src/pageComponents/chat/ChatSetting/FavouriteAppSetting/index.tsx @@ -148,18 +148,22 @@ const FavouriteAppSetting = ({ Header }: Props) => { if (!tag) return null; return ( - e.stopPropagation()} > {tag.name} - + ); }; @@ -264,23 +268,23 @@ const FavouriteAppSetting = ({ Header }: Props) => { {/* name */} - - + + {row.name || ''} {/* intro */} - - + + {row.intro || ''} - + {/* tags */} - - + + {row.favouriteTags.slice(0, 3).map((id) => ( ))} @@ -293,11 +297,13 @@ const FavouriteAppSetting = ({ Header }: Props) => { Trigger={ e.stopPropagation()} > +{row.favouriteTags.length - 3} @@ -323,7 +329,7 @@ const FavouriteAppSetting = ({ Header }: Props) => { {/* action */} - + { }); }} Trigger={ - } - /> + + + } + /> + } /> diff --git a/projects/app/src/pageComponents/chat/ChatSetting/index.tsx b/projects/app/src/pageComponents/chat/ChatSetting/index.tsx index f33e421d4..9587874f3 100644 --- a/projects/app/src/pageComponents/chat/ChatSetting/index.tsx +++ b/projects/app/src/pageComponents/chat/ChatSetting/index.tsx @@ -16,6 +16,7 @@ import { useMount } from 'ahooks'; import { useSystemStore } from '@/web/common/system/useSystemStore'; import { useRouter } from 'next/router'; import { useUserStore } from '@/web/support/user/useUserStore'; +import { getWebReqUrl } from '@fastgpt/web/common/system/utils'; const HomepageSetting = dynamic(() => import('@/pageComponents/chat/ChatSetting/HomepageSetting')); const LogDetails = dynamic(() => import('@/pageComponents/chat/ChatSetting/LogDetails')); @@ -69,7 +70,7 @@ const ChatSetting = () => { return ( <> - + {!isPc && ( diff --git a/projects/app/src/pageComponents/chat/ChatTeamApp/index.tsx b/projects/app/src/pageComponents/chat/ChatTeamApp/index.tsx index 47dba3790..9f7f80845 100644 --- a/projects/app/src/pageComponents/chat/ChatTeamApp/index.tsx +++ b/projects/app/src/pageComponents/chat/ChatTeamApp/index.tsx @@ -15,11 +15,14 @@ import { ChatContext } from '@/web/core/chat/context/chatContext'; import NextHead from '@/components/common/NextHead'; import { ChatSettingContext } from '@/web/core/chat/context/chatSettingContext'; import ChatSliderMobileDrawer from '@/pageComponents/chat/slider/ChatSliderMobileDrawer'; +import { useSystemStore } from '@/web/common/system/useSystemStore'; +import { getWebReqUrl } from '@fastgpt/web/common/system/utils'; const MyApps = () => { const { t } = useTranslation(); const router = useRouter(); const { isPc } = useSystem(); + const { feConfigs } = useSystemStore(); const { paths, myApps, isFetchingApps, setSearchKey } = useContextSelector( AppListContext, @@ -51,7 +54,7 @@ const MyApps = () => { return ( - + {!isPc && ( { - const { t, i18n } = useTranslation(); - const language = i18n.language; + const { t } = useTranslation(); const { isPc } = useSystem(); const { userInfo } = useUserStore(); @@ -398,7 +398,7 @@ const HomeChatWindow = ({ myApps }: Props) => { return ( {/* set window title and icon */} - + {/* show history slider */} {isPc ? ( diff --git a/projects/app/src/pages/chat/index.tsx b/projects/app/src/pages/chat/index.tsx index b3a70f984..da4ac0a25 100644 --- a/projects/app/src/pages/chat/index.tsx +++ b/projects/app/src/pages/chat/index.tsx @@ -109,7 +109,7 @@ const Render = (props: { appId: string; isStandalone?: string }) => { if (!isInitedUser) { return ( - + ); }