4.6.8-alpha (#804)

* perf: redirect request and err log replace

perf: dataset openapi

feat: session

fix: retry input error

feat: 468 doc

sub page

feat: standard sub

perf: rerank tip

perf: rerank tip

perf: api sdk

perf: openapi

sub plan

perf: sub ui

fix: ts

* perf: init log

* fix: variable select

* sub page

* icon

* perf: llm model config

* perf: menu ux

* perf: system store

* perf: publish app name

* fix: init data

* perf: flow edit ux

* fix: value type format and ux

* fix prompt editor default value (#13)

* fix prompt editor default value

* fix prompt editor update when not focus

* add key with variable

---------

Co-authored-by: Archer <545436317@qq.com>

* fix: value type

* doc

* i18n

* import path

* home page

* perf: mongo session running

* fix: ts

* perf: use toast

* perf: flow edit

* perf: sse response

* slider ui

* fetch error

* fix prompt editor rerender when not focus by key defaultvalue (#14)

* perf: prompt editor

* feat: dataset search concat

* perf: doc

* fix:ts

* perf: doc

* fix json editor onblur value (#15)

* faq

* vector model default config

* ipv6

---------

Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

projects/app/src/components/Layout/auth.tsx

@@ -1,7 +1,8 @@
 import { useRouter } from 'next/router';
-import { useToast } from '@chakra-ui/react';
 import { useUserStore } from '@/web/support/user/useUserStore';
 import { useQuery } from '@tanstack/react-query';
+import { useTranslation } from 'next-i18next';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 
 const unAuthPage: { [key: string]: boolean } = {
   '/': true,
@@ -10,16 +11,14 @@ const unAuthPage: { [key: string]: boolean } = {
   '/login/fastlogin': true,
   '/appStore': true,
   '/chat/share': true,
-  '/tools/price': true
+  '/tools/price': true,
+  '/price': true
 };
 
 const Auth = ({ children }: { children: JSX.Element }) => {
+  const { t } = useTranslation();
   const router = useRouter();
-  const toast = useToast({
-    title: '请先登录',
-    position: 'top',
-    status: 'warning'
-  });
+  const { toast } = useToast();
   const { userInfo, initUserInfo } = useUserStore();
 
   useQuery(
@@ -37,12 +36,15 @@ const Auth = ({ children }: { children: JSX.Element }) => {
         router.replace(
           `/login?lastRoute=${encodeURIComponent(location.pathname + location.search)}`
         );
-        toast();
+        toast({
+          status: 'warning',
+          title: t('support.user.Need to login')
+        });
       }
     }
   );
 
-  return userInfo || unAuthPage[router.pathname] === true ? children : null;
+  return !!userInfo || unAuthPage[router.pathname] === true ? children : null;
 };
 
 export default Auth;

projects/app/src/components/Layout/index.tsx

@@ -7,7 +7,6 @@ import { throttle } from 'lodash';
 import { useQuery } from '@tanstack/react-query';
 import { useUserStore } from '@/web/support/user/useUserStore';
 import { getUnreadCount } from '@/web/support/user/inform/api';
-import { feConfigs } from '@/web/common/system/staticData';
 import dynamic from 'next/dynamic';
 
 import Auth from './auth';
@@ -26,7 +25,8 @@ const pcUnShowLayoutRoute: Record<string, boolean> = {
   '/chat/share': true,
   '/app/edit': true,
   '/chat': true,
-  '/tools/price': true
+  '/tools/price': true,
+  '/price': true
 };
 const phoneUnShowLayoutRoute: Record<string, boolean> = {
   '/': true,
@@ -34,14 +34,15 @@ const phoneUnShowLayoutRoute: Record<string, boolean> = {
   '/login/provider': true,
   '/login/fastlogin': true,
   '/chat/share': true,
-  '/tools/price': true
+  '/tools/price': true,
+  '/price': true
 };
 
 const Layout = ({ children }: { children: JSX.Element }) => {
   const router = useRouter();
   const { colorMode, setColorMode } = useColorMode();
   const { Loading } = useLoading();
-  const { loading, setScreenWidth, isPc } = useSystemStore();
+  const { loading, setScreenWidth, isPc, feConfigs } = useSystemStore();
   const { userInfo } = useUserStore();
 
   const isChatPage = useMemo(
@@ -74,12 +75,14 @@ const Layout = ({ children }: { children: JSX.Element }) => {
     refetchInterval: 10000
   });
 
+  const isHideNavbar = !!pcUnShowLayoutRoute[router.pathname];
+
   return (
     <>
       <Box h={'100%'} bg={'myGray.100'}>
         {isPc === true && (
           <>
-            {pcUnShowLayoutRoute[router.pathname] ? (
+            {isHideNavbar ? (
               <Auth>{children}</Auth>
             ) : (
               <>

projects/app/src/components/Layout/navbar.tsx

@@ -4,7 +4,6 @@ import { useRouter } from 'next/router';
 import { useUserStore } from '@/web/support/user/useUserStore';
 import { useChatStore } from '@/web/core/chat/storeChat';
 import { HUMAN_ICON } from '@fastgpt/global/common/system/constants';
-import { feConfigs } from '@/web/common/system/staticData';
 import NextLink from 'next/link';
 import Badge from '../Badge';
 import Avatar from '../Avatar';
@@ -23,7 +22,7 @@ const Navbar = ({ unread }: { unread: number }) => {
   const { t } = useTranslation();
   const router = useRouter();
   const { userInfo } = useUserStore();
-  const { gitStar } = useSystemStore();
+  const { gitStar, feConfigs } = useSystemStore();
   const { lastChatAppId, lastChatId } = useChatStore();
   const navbarList = useMemo(
     () => [
@@ -159,7 +158,7 @@ const Navbar = ({ unread }: { unread: number }) => {
             color={'myGray.500'}
           >
             <Badge count={unread}>
-              <MyIcon name={'inform'} width={'22px'} height={'22px'} />
+              <MyIcon name={'support/user/informLight'} width={'22px'} height={'22px'} />
             </Badge>
           </Link>
         </Box>