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/pages/account/components/BillDetail.tsx

@@ -107,7 +107,7 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
         </Flex>
         <Flex alignItems={'center'} pb={4}>
           <Box flex={'0 0 80px'}>{t('wallet.bill.Source')}:</Box>
-          <Box>{BillSourceMap[bill.source]?.label}</Box>
+          <Box>{t(BillSourceMap[bill.source]?.label)}</Box>
         </Flex>
         <Flex alignItems={'center'} pb={4}>
           <Box flex={'0 0 80px'}>{t('wallet.bill.Total')}:</Box>
@@ -129,7 +129,7 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
                   {hasCharsLen && <Th>{t('wallet.bill.Text Length')}</Th>}
                   {hasDuration && <Th>{t('wallet.bill.Duration')}</Th>}
                   {hasDatasetSize && (
-                    <Th>{t('support.user.team.subscription.type.extraDatasetSize')}</Th>
+                    <Th>{t('support.wallet.subscription.type.extraDatasetSize')}</Th>
                   )}
                   <Th>费用(￥)</Th>
                 </Tr>

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

@@ -45,7 +45,10 @@ const BillTable = () => {
   const sourceList = useMemo(
     () => [
       { label: t('common.All'), value: '' },
-      ...Object.entries(BillSourceMap).map(([key, value]) => ({ label: value.label, value: key }))
+      ...Object.entries(BillSourceMap).map(([key, value]) => ({
+        label: t(value.label),
+        value: key
+      }))
     ],
     [t]
   );
@@ -152,7 +155,7 @@ const BillTable = () => {
               <Tr key={item.id}>
                 {/* <Td>{item.memberName}</Td> */}
                 <Td>{dayjs(item.time).format('YYYY/MM/DD HH:mm:ss')}</Td>
-                <Td>{BillSourceMap[item.source]?.label}</Td>
+                <Td>{t(BillSourceMap[item.source]?.label)}</Td>
                 <Td>{t(item.appName) || '-'}</Td>
                 <Td>{item.total}元</Td>
                 <Td>

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

@@ -13,14 +13,14 @@ import {
 } from '@chakra-ui/react';
 import { useForm } from 'react-hook-form';
 import { UserUpdateParams } from '@/types/user';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useUserStore } from '@/web/support/user/useUserStore';
 import type { UserType } from '@fastgpt/global/support/user/type.d';
 import { useQuery } from '@tanstack/react-query';
 import dynamic from 'next/dynamic';
 import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
 import { compressImgFileAndUpload } from '@/web/common/file/controller';
-import { feConfigs, systemVersion } from '@/web/common/system/staticData';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { useTranslation } from 'next-i18next';
 import { timezoneList } from '@fastgpt/global/common/time/timezone';
 import Avatar from '@/components/Avatar';
@@ -44,6 +44,7 @@ const SubDatasetModal = dynamic(() => import('@/components/support/wallet/SubDat
 const UserInfo = () => {
   const theme = useTheme();
   const router = useRouter();
+  const { feConfigs, systemVersion } = useSystemStore();
   const { t, i18n } = useTranslation();
   const { userInfo, updateUserInfo, initUserInfo } = useUserStore();
   const timezones = useRef(timezoneList());
@@ -122,12 +123,11 @@ const UserInfo = () => {
     }
   });
 
-  const { data: datasetSub = { maxSize: 0, usedSize: 0 } } = useQuery(
-    ['getTeamDatasetValidSub'],
-    getTeamDatasetValidSub
-  );
+  const {
+    data: teamSubPlan = { totalPoints: 0, usedPoints: 0, datasetMaxSize: 800, usedDatasetSize: 0 }
+  } = useQuery(['getTeamDatasetValidSub'], getTeamDatasetValidSub);
   const datasetUsageMap = useMemo(() => {
-    const rate = datasetSub.usedSize / datasetSub.maxSize;
+    const rate = teamSubPlan.usedDatasetSize / teamSubPlan.datasetMaxSize;
 
     const colorScheme = (() => {
       if (rate < 0.5) return 'green';
@@ -138,10 +138,10 @@ const UserInfo = () => {
     return {
       colorScheme,
       value: rate * 100,
-      maxSize: datasetSub.maxSize,
-      usedSize: datasetSub.usedSize
+      maxSize: teamSubPlan.datasetMaxSize || t('common.Unlimited'),
+      usedSize: teamSubPlan.usedDatasetSize
     };
-  }, [datasetSub.maxSize, datasetSub.usedSize]);
+  }, [teamSubPlan.usedDatasetSize, teamSubPlan.datasetMaxSize, t]);
 
   return (
     <Box
@@ -276,7 +276,7 @@ const UserInfo = () => {
                 <Flex alignItems={'center'}>
                   <Box flex={'1 0 0'} fontSize={'md'}>
                     {t('support.user.team.Dataset usage')}:&nbsp;{datasetUsageMap.usedSize}/
-                    {datasetSub.maxSize}
+                    {datasetUsageMap.maxSize}
                   </Box>
                   {userInfo?.team?.canWrite && (
                     <Button size={'sm'} onClick={onOpenSubDatasetModal}>
@@ -316,7 +316,7 @@ const UserInfo = () => {
             userSelect={'none'}
             textDecoration={'none !important'}
           >
-            <MyIcon name={'common/courseLight'} w={'18px'} />
+            <MyIcon name={'common/courseLight'} w={'18px'} color={'myGray.600'} />
             <Box ml={2} flex={1}>
               {t('system.Help Document')}
             </Box>
@@ -366,7 +366,7 @@ const UserInfo = () => {
                 userSelect={'none'}
                 onClick={onOpenOpenai}
               >
-                <Avatar src={'/imgs/openai.png'} w={'18px'} />
+                <MyIcon name={'common/openai'} w={'18px'} color={'myGray.600'} />
                 <Box ml={2} flex={1}>
                   OpenAI/OneAPI 账号
                 </Box>

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

@@ -32,7 +32,7 @@ const OpenAIAccountModal = ({
     <MyModal
       isOpen
       onClose={onClose}
-      iconSrc="/imgs/modal/openai.svg"
+      iconSrc="common/openai"
       title={t('user.OpenAI Account Setting')}
     >
       <ModalBody>

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

@@ -1,7 +1,7 @@
 import React, { useState, useCallback } from 'react';
 import { ModalFooter, ModalBody, Button, Input, Box, Grid } from '@chakra-ui/react';
 import { getPayCode, checkPayResult } from '@/web/support/wallet/pay/api';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useQuery } from '@tanstack/react-query';
 import { useRouter } from 'next/router';
 import { getErrText } from '@fastgpt/global/common/error/utils';

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

@@ -16,7 +16,7 @@ import type { PaySchema } from '@fastgpt/global/support/wallet/pay/type.d';
 import dayjs from 'dayjs';
 import { useQuery } from '@tanstack/react-query';
 import { formatStorePrice2Read } from '@fastgpt/global/support/wallet/bill/tools';
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useLoading } from '@/web/common/hooks/useLoading';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 

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

@@ -10,7 +10,6 @@ import SideTabs from '@/components/SideTabs';
 import Tabs from '@/components/Tabs';
 import UserInfo from './components/Info';
 import { serviceSideProps } from '@/web/common/utils/i18n';
-import { feConfigs } from '@/web/common/system/staticData';
 import { useTranslation } from 'next-i18next';
 import Script from 'next/script';
 
@@ -35,6 +34,7 @@ enum TabEnum {
 const Account = ({ currentTab }: { currentTab: `${TabEnum}` }) => {
   const { t } = useTranslation();
   const { userInfo, setUserInfo } = useUserStore();
+  const { feConfigs, isPc } = useSystemStore();
 
   const tabList = [
     {
@@ -116,7 +116,6 @@ const Account = ({ currentTab }: { currentTab: `${TabEnum}` }) => {
 
   const router = useRouter();
   const theme = useTheme();
-  const { isPc } = useSystemStore();
 
   const setCurrentTab = useCallback(
     (tab: string) => {