4.7-production (#1053)

* 4.7-alpha3 (#62)

* doc

* Optimize possible null Pointers and parts of Ux

* fix: mulity index training error

* feat: doc and rename question guide

* fix ios speech input (#59)

* fix: prompt editor variables nowrap (#61)

* change openapi import in http module with curl import (#60)

* chore(ui): dataset import modal ui (#58)

* chore(ui): dataset import modal ui

* use component

* fix height

* 4.7 (#63)

* fix: claude3 image type verification failed (#1038) (#1040)

* perf: curl import modal

* doc img

* perf: adapt cohere rerank

* perf: code

* perf: input style

* doc

---------

Co-authored-by: xiaotian <dimsky@163.com>

* fix: ts

* docker deploy

* perf: prompt call

* doc

* ts

* finish ui

* perf: outlink detail ux

* perf: user schema

* fix: plugin update

* feat: get current time plugin

* fix: ts

* perf: fetch anamation

* perf: mark ux

* doc

* perf: select app ux

* fix: split text custom string conflict

* peref: inform readed

* doc

* memo flow component

* perf: version

* faq

* feat: flow max runtimes

* feat: similarity tip

* feat: auto detect file encoding

* Supports asymmetric vector model

* fix: ts

* perf: max w

* move code

* perf: hide whisper

* fix: ts

* feat: system msg modal

* perf: catch error

* perf: inform tip

* fix: inform

---------

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

projects/app/src/pages/account/components/BillTable.tsx

@@ -27,7 +27,7 @@ import {
 } from '@fastgpt/global/support/wallet/bill/constants';
 // import { usePagination } from '@/web/common/hooks/usePagination';
 import MyBox from '@/components/common/MyBox';
-import { useRequest } from '@/web/common/hooks/useRequest';
+import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import { standardSubLevelMap, subModeMap } from '@fastgpt/global/support/wallet/sub/constants';
 import MySelect from '@fastgpt/web/components/common/MySelect';
 import MyModal from '@fastgpt/web/components/common/MyModal';

projects/app/src/pages/account/components/Info.tsx

@@ -403,7 +403,7 @@ const PlanUsage = () => {
             </Flex>
             {isFreeTeam && (
               <Box mt="2" color={'#485264'} fontSize="sm">
-                免费版用户15天无任何使用记录时，系统会自动清理账号知识库。
+                免费版用户30天无任何使用记录时，系统会自动清理账号知识库。
               </Box>
             )}
           </Box>
@@ -504,9 +504,9 @@ const PlanUsage = () => {
 const Other = () => {
   const theme = useTheme();
   const { toast } = useToast();
-  const { feConfigs, systemVersion } = useSystemStore();
+  const { feConfigs } = useSystemStore();
   const { t } = useTranslation();
-  const { userInfo, updateUserInfo, initUserInfo, teamPlanStatus } = useUserStore();
+  const { userInfo, updateUserInfo } = useUserStore();
   const { reset } = useForm<UserUpdateParams>({
     defaultValues: userInfo as UserType
   });
@@ -552,10 +552,6 @@ const Other = () => {
             <Box ml={2} flex={1}>
               {t('system.Help Document')}
             </Box>
-            <Box w={'8px'} h={'8px'} borderRadius={'50%'} bg={'#67c13b'} />
-            <Box fontSize={'md'} ml={2}>
-              V{systemVersion}
-            </Box>
           </Link>
         )}
         <Link

projects/app/src/pages/account/components/InformTable.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Box, Flex, useTheme } from '@chakra-ui/react';
+import { Box, Button, Flex, useTheme } from '@chakra-ui/react';
 import { getInforms, readInform } from '@/web/support/user/inform/api';
 import type { UserInformSchema } from '@fastgpt/global/support/user/inform/type';
 import { formatTimeToChatTime } from '@/utils/tools';
@@ -7,8 +7,10 @@ import { useSystemStore } from '@/web/common/system/useSystemStore';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { usePagination } from '@fastgpt/web/hooks/usePagination';
 import { useLoading } from '@fastgpt/web/hooks/useLoading';
+import { useTranslation } from 'next-i18next';
 
 const InformTable = () => {
+  const { t } = useTranslation();
   const theme = useTheme();
   const { Loading } = useLoading();
   const { isPc } = useSystemStore();
@@ -22,7 +24,7 @@ const InformTable = () => {
     pageNum
   } = usePagination<UserInformSchema>({
     api: getInforms,
-    pageSize: isPc ? 20 : 10
+    pageSize: 20
   });
 
   return (
@@ -35,35 +37,44 @@ const InformTable = () => {
             py={2}
             px={4}
             borderRadius={'md'}
-            cursor={item.read ? 'default' : 'pointer'}
             position={'relative'}
             _notLast={{ mb: 3 }}
-            onClick={async () => {
-              if (!item.read) {
-                await readInform(item._id);
-                getData(pageNum);
-              }
-            }}
           >
-            <Flex alignItems={'center'} justifyContent={'space-between'}>
+            <Flex alignItems={'center'}>
               <Box fontWeight={'bold'}>{item.title}</Box>
-              <Box ml={2} color={'myGray.500'}>
-                {formatTimeToChatTime(item.time)}
+              <Box ml={2} color={'myGray.500'} flex={'1 0 0'}>
+                ({formatTimeToChatTime(item.time)})
               </Box>
+              {!item.read && (
+                <Button
+                  variant={'whitePrimary'}
+                  size={'xs'}
+                  onClick={async () => {
+                    if (!item.read) {
+                      await readInform(item._id);
+                      getData(pageNum);
+                    }
+                  }}
+                >
+                  {t('support.inform.Read')}
+                </Button>
+              )}
             </Flex>
-            <Box fontSize={'sm'} color={'myGray.600'} whiteSpace={'pre-wrap'}>
+            <Box mt={2} fontSize={'sm'} color={'myGray.600'} whiteSpace={'pre-wrap'}>
               {item.content}
             </Box>
             {!item.read && (
-              <Box
-                w={'5px'}
-                h={'5px'}
-                borderRadius={'10px'}
-                bg={'red.600'}
-                position={'absolute'}
-                bottom={'8px'}
-                right={'8px'}
-              ></Box>
+              <>
+                <Box
+                  w={'5px'}
+                  h={'5px'}
+                  borderRadius={'10px'}
+                  bg={'red.600'}
+                  position={'absolute'}
+                  top={'8px'}
+                  left={'8px'}
+                />
+              </>
             )}
           </Box>
         ))}

projects/app/src/pages/account/components/OpenAIAccountModal.tsx

@@ -3,7 +3,7 @@ import { ModalBody, Box, Flex, Input, ModalFooter, Button } from '@chakra-ui/rea
 import MyModal from '@fastgpt/web/components/common/MyModal';
 import { useTranslation } from 'next-i18next';
 import { useForm } from 'react-hook-form';
-import { useRequest } from '@/web/common/hooks/useRequest';
+import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import type { UserType } from '@fastgpt/global/support/user/type.d';
 
 const OpenAIAccountModal = ({

projects/app/src/pages/account/components/UpdatePswModal.tsx

@@ -3,7 +3,7 @@ import { ModalBody, Box, Flex, Input, ModalFooter, Button } from '@chakra-ui/rea
 import MyModal from '@fastgpt/web/components/common/MyModal';
 import { useTranslation } from 'next-i18next';
 import { useForm } from 'react-hook-form';
-import { useRequest } from '@/web/common/hooks/useRequest';
+import { useRequest } from '@fastgpt/web/hooks/useRequest';
 import { updatePasswordByOld } from '@/web/support/user/api';
 
 type FormType = {

projects/app/src/pages/account/index.tsx

@@ -4,7 +4,7 @@ import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { useRouter } from 'next/router';
 import dynamic from 'next/dynamic';
 import { useUserStore } from '@/web/support/user/useUserStore';
-import { useConfirm } from '@/web/common/hooks/useConfirm';
+import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
 import PageContainer from '@/components/PageContainer';
 import SideTabs from '@/components/SideTabs';
 import Tabs from '@/components/Tabs';
@@ -34,7 +34,7 @@ enum TabEnum {
 const Account = ({ currentTab }: { currentTab: `${TabEnum}` }) => {
   const { t } = useTranslation();
   const { userInfo, setUserInfo } = useUserStore();
-  const { feConfigs, isPc } = useSystemStore();
+  const { feConfigs, isPc, systemVersion } = useSystemStore();
 
   const tabList = [
     {
@@ -148,6 +148,12 @@ const Account = ({ currentTab }: { currentTab: `${TabEnum}` }) => {
                 activeId={currentTab}
                 onChange={setCurrentTab}
               />
+              <Flex alignItems={'center'}>
+                <Box w={'8px'} h={'8px'} borderRadius={'50%'} bg={'#67c13b'} />
+                <Box fontSize={'md'} ml={2}>
+                  V{systemVersion}
+                </Box>
+              </Flex>
             </Flex>
           ) : (
             <Box mb={3}>