4.8.10 test (#2470)

* i18n

* perf: invoice type

* fix: helper line change error

* perf: base64 image

* perf: app list ui

* perf: upload max size check

* perf: init system plugin

* perf: dataset list ui

* perf: http node ui

* perf: ui

* perf: invoice tip

* fix: ts

* perf: invoice table

* perf: null check

docSite/content/zh-cn/docs/development/upgrading/4810.md

@@ -34,8 +34,10 @@ STORE_LOG_LEVEL=warn
 7. 商业版新增 - SSO 定制
 8. 优化 - 知识库集合禁用，目录禁用会递归修改其下所有 children 的禁用状态。
 9. 优化 - 节点选择，避免切换 tab 时候，path 加载报错。
-10. 修复 - Prompt 模式调用工具，stream=false 模式下，会携带 0: 开头标记。
+10. 优化 - 最新 React Markdown 组件，支持 Base64 图片。
-11. 修复 - 对话日志鉴权问题：仅为 APP 管理员的用户，无法查看对话日志详情。
+11. 优化 - 知识库列表 UI。
-12. 修复 - 选择 Milvus 部署时，无法导出知识库。 
+12. 修复 - Prompt 模式调用工具，stream=false 模式下，会携带 0: 开头标记。
-13. 修复 - 创建 APP 副本，无法复制系统配置。
+13. 修复 - 对话日志鉴权问题：仅为 APP 管理员的用户，无法查看对话日志详情。
-14. 修复 - 图片识别模式下，自动解析图片链接正则不够严谨问题。
+14. 修复 - 选择 Milvus 部署时，无法导出知识库。 
+15. 修复 - 创建 APP 副本，无法复制系统配置。
+16. 修复 - 图片识别模式下，自动解析图片链接正则不够严谨问题。

packages/global/core/workflow/template/system/http468.ts

@@ -49,8 +49,8 @@ export const HttpNode468: FlowNodeTemplateType = {
       renderTypeList: [FlowNodeInputTypeEnum.custom],
       valueType: WorkflowIOValueTypeEnum.number,
       label: '',
-      value: 120,
+      value: 30,
-      min: 30,
+      min: 5,
       max: 600,
       required: true
     },

packages/global/support/user/team/type.d.ts

@@ -94,11 +94,11 @@ export type LafAccountType = {
 export type TeamInvoiceHeaderType = {
   teamName: string;
   unifiedCreditCode: string;
-  companyAddress: string;
+  companyAddress?: string;
-  companyPhone: string;
+  companyPhone?: string;
-  bankName: string;
+  bankName?: string;
-  bankAccount: string;
+  bankAccount?: string;
-  needSpecialInvoice?: boolean;
+  needSpecialInvoice: boolean;
   emailAddress: string;
 };
 

packages/global/support/wallet/bill/type.d.ts

@@ -36,9 +36,10 @@ export type InvoiceType = {
 } & TeamInvoiceHeaderType;
 
 export type InvoiceSchemaType = {
-  teamId: string;
   _id: string;
+  teamId: string;
   status: 1 | 2;
   createTime: Date;
   finishTime?: Date;
+  file?: Buffer;
 } & InvoiceType;

packages/service/common/file/multer.ts

@@ -14,8 +14,12 @@ type FileType = {
   size: number;
 };
 
+/* 
+  maxSize: File max size (MB)
+*/
 export const getUploadModel = ({ maxSize = 500 }: { maxSize?: number }) => {
   maxSize *= 1024 * 1024;
+
   class UploadModel {
     uploader = multer({
       limits: {

packages/service/core/workflow/dispatch/tools/http468.ts

@@ -31,6 +31,7 @@ type HttpRequestProps = ModuleDispatchProps<{
   [NodeInputKeyEnum.httpParams]: PropsArrType[];
   [NodeInputKeyEnum.httpJsonBody]: string;
   [NodeInputKeyEnum.addInputParam]: Record<string, any>;
+  [NodeInputKeyEnum.httpTimeout]?: number;
   [key: string]: any;
 }>;
 type HttpResponse = DispatchNodeResultType<{
@@ -57,7 +58,7 @@ export const dispatchHttp468Request = async (props: HttpRequestProps): Promise<H
       system_httpHeader: httpHeader,
       system_httpParams: httpParams = [],
       system_httpJsonBody: httpJsonBody,
-      system_httpTimeout: httpTimeout,
+      system_httpTimeout: httpTimeout = 60,
       [NodeInputKeyEnum.addInputParam]: dynamicInput,
       ...body
     }

packages/web/i18n/en/dataset.json

@@ -20,6 +20,7 @@
   "external_read_url": "External read url",
   "external_read_url_tip": "You can configure the reading address of your file library. This allows users to read and authenticate. You can currently use the {{fileId}} variable to refer to the external file ID.",
   "external_url": "File read url",
+  "file_model_function_tip": "For enhanced indexing and QA generation",
   "filename": "filename",
   "folder_dataset": "Folder",
   "rebuild_embedding_start_tip": "The task of switching index models has begun",

packages/web/i18n/en/user.json

@@ -1,4 +1,7 @@
 {
+  "bill": {
+    "not_need_invoice": "Balance payment, unable to issue invoice"
+  },
   "bind_inform_account_error": "Abnormal binding notification account",
   "bind_inform_account_success": "Binding notification account successful",
   "code_error": {

packages/web/i18n/zh/common.json

@@ -617,8 +617,7 @@
             "success": "开始同步"
           }
         },
-        "training": {
+        "training": {}
-        }
       },
       "data": {
         "Auxiliary Data": "辅助数据",

packages/web/i18n/zh/dataset.json

@@ -20,6 +20,7 @@
   "external_read_url": "外部预览地址",
   "external_read_url_tip": "可以配置你文件库的阅读地址。便于对用户进行阅读鉴权操作。目前可以使用 {{fileId}} 变量来指代外部文件 ID。",
   "external_url": "文件访问 URL",
+  "file_model_function_tip": "用于增强索引和 QA 生成",
   "filename": "文件名",
   "folder_dataset": "文件夹",
   "rebuild_embedding_start_tip": "切换索引模型任务已开始",

packages/web/i18n/zh/user.json

@@ -1,4 +1,7 @@
 {
+  "bill": {
+    "not_need_invoice": "余额支付，无法开票"
+  },
   "bind_inform_account_error": "绑定通知账号异常",
   "bind_inform_account_success": "绑定通知账号成功",
   "delete": {

projects/app/.env.template

@@ -32,7 +32,7 @@ SANDBOX_URL=http://localhost:3001
 PRO_URL=
 # 首页路径
 HOME_URL=/
+
 # 日志等级: debug, info, warn, error
 LOG_LEVEL=debug
 STORE_LOG_LEVEL=warn
-# Loki Log Path

projects/app/src/components/Markdown/img/Image.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { ImageProps, Skeleton } from '@chakra-ui/react';
+import { Box, ImageProps, Skeleton } from '@chakra-ui/react';
 import MyPhotoView from '@fastgpt/web/components/common/Image/PhotoView';
 import { useBoolean } from 'ahooks';
 
@@ -8,6 +8,10 @@ const MdImage = ({ src, ...props }: { src?: string } & ImageProps) => {
 
   const [renderSrc, setRenderSrc] = useState(src);
 
+  if (src?.includes('base64') && !src.startsWith('data:image')) {
+    return <Box>Invalid base64 image</Box>;
+  }
+
   return (
     <Skeleton isLoaded={isLoaded}>
       <MyPhotoView

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

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import ReactMarkdown from 'react-markdown';
 import 'katex/dist/katex.min.css';
 import RemarkMath from 'remark-math'; // Math syntax
@@ -52,6 +52,10 @@ const Markdown = ({
     return formatSource;
   }, [source]);
 
+  const urlTransform = useCallback((val: string) => {
+    return val;
+  }, []);
+
   return (
     <ReactMarkdown
       className={`markdown ${styles.markdown}
@@ -60,6 +64,7 @@ const Markdown = ({
       remarkPlugins={[RemarkMath, [RemarkGfm, { singleTilde: false }], RemarkBreaks]}
       rehypePlugins={[RehypeKatex, [RehypeExternalLinks, { target: '_blank' }]]}
       components={components}
+      urlTransform={urlTransform}
     >
       {formatSource}
     </ReactMarkdown>

projects/app/src/components/common/NextHead/index.tsx

@@ -9,6 +9,7 @@ const NextHead = ({ title, icon, desc }: { title?: string; icon?: string; desc?:
         name="viewport"
         content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no, viewport-fit=cover"
       />
+      <meta httpEquiv="Content-Security-Policy" content="img-src * data:;" />
       {desc && <meta name="description" content={desc} />}
       {icon && <link rel="icon" href={icon} />}
     </Head>

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

@@ -409,7 +409,7 @@ const PlanUsage = () => {
 
   return standardPlan ? (
     <Box mt={[6, 0]}>
-      <Flex fontSize={'lg'} h={'30px'}>
+      <Flex fontSize={['md', 'lg']} h={'30px'}>
         <Flex alignItems={'center'}>
           <MyIcon mr={2} name={'support/account/plans'} w={'20px'} />
           {t('common:support.wallet.subscription.Team plan and usage')}
@@ -428,7 +428,7 @@ const PlanUsage = () => {
         borderColor={'borderColor.low'}
         borderRadius={'md'}
       >
-        <Flex px={[5, 7]} py={[3, 6]}>
+        <Flex px={[5, 7]} py={[3, 6]} whiteSpace={'nowrap'}>
           <Box flex={'1 0 0'}>
             <Box color={'myGray.600'} fontSize="sm">
               {t('common:support.wallet.subscription.Current plan')}
@@ -475,8 +475,10 @@ const PlanUsage = () => {
       >
         <Flex>
           <Flex flex={'1 0 0'} alignItems={'flex-end'}>
-            <Box fontSize={'md'}>{t('common:info.resource')}</Box>
+            <Box fontSize={'md'} fontWeight={'bold'} color={'myGray.900'}>
-            <Box fontSize={'xs'} color={'myGray.500'}>
+              {t('common:info.resource')}
+            </Box>
+            <Box ml={1} display={['none', 'block']} fontSize={'xs'} color={'myGray.500'}>
               {t('common:info.include')}
             </Box>
           </Flex>

projects/app/src/pages/account/components/bill/ApplyInvoiceModal.tsx

@@ -32,52 +32,25 @@ import MyBox from '@fastgpt/web/components/common/MyBox';
 import { getTeamInvoiceHeader } from '@/web/support/user/team/api';
 import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useRouter } from 'next/router';
+import { useForm } from 'react-hook-form';
+
 type chosenBillDataType = {
   _id: string;
   price: number;
 };
+
 const ApplyInvoiceModal = ({ onClose }: { onClose: () => void }) => {
   const { t } = useTranslation();
-  const { toast } = useToast();
+  const router = useRouter();
+
   const [chosenBillDataList, setChosenBillDataList] = useState<chosenBillDataType[]>([]);
   const [totalPrice, setTotalPrice] = useState(0);
-  const [formData, setFormData] = useState<TeamInvoiceHeaderType>({
-    teamName: '',
-    unifiedCreditCode: '',
-    companyAddress: '',
-    companyPhone: '',
-    bankName: '',
-    bankAccount: '',
-    needSpecialInvoice: undefined,
-    emailAddress: ''
-  });
-
-  const router = useRouter();
   const {
     isOpen: isOpenSettleModal,
     onOpen: onOpenSettleModal,
     onClose: onCloseSettleModal
   } = useDisclosure();
 
-  const handleChange = useCallback((e: any) => {
-    const { name, value } = e.target;
-    setFormData((prev) => ({ ...prev, [name]: value }));
-  }, []);
-
-  const handleRatiosChange = useCallback((v: string) => {
-    setFormData((prev) => ({ ...prev, needSpecialInvoice: v === 'true' }));
-  }, []);
-
-  const isHeaderValid = useCallback((v: TeamInvoiceHeaderType) => {
-    const emailRegex = /\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/;
-    for (const [key, value] of Object.entries(v)) {
-      if (typeof value === 'string' && value.trim() === '') {
-        return false;
-      }
-    }
-    return emailRegex.test(v.emailAddress);
-  }, []);
-
   const {
     loading: isLoading,
     data: billsList,
@@ -86,12 +59,23 @@ const ApplyInvoiceModal = ({ onClose }: { onClose: () => void }) => {
     manual: false
   });
 
-  const { run: handleSubmitInvoice, loading: isSubmitting } = useRequest2(
+  const handleSingleCheck = useCallback(
-    () =>
+    (item: invoiceBillDataType) => {
+      if (chosenBillDataList.find((bill) => bill._id === item._id)) {
+        setChosenBillDataList(chosenBillDataList.filter((bill) => bill._id !== item._id));
+      } else {
+        setChosenBillDataList([...chosenBillDataList, { _id: item._id, price: item.price }]);
+      }
+    },
+    [chosenBillDataList]
+  );
+
+  const { runAsync: onSubmitApply, loading: isSubmitting } = useRequest2(
+    (data) =>
       submitInvoice({
         amount: totalPrice,
         billIdList: chosenBillDataList.map((item) => item._id),
-        ...formData
+        ...data
       }),
     {
       manual: true,
@@ -104,39 +88,29 @@ const ApplyInvoiceModal = ({ onClose }: { onClose: () => void }) => {
     }
   );
 
+  const inputForm = useForm<TeamInvoiceHeaderType>({
+    defaultValues: {
+      teamName: '',
+      unifiedCreditCode: '',
+      companyAddress: '',
+      companyPhone: '',
+      bankName: '',
+      bankAccount: '',
+      needSpecialInvoice: false,
+      emailAddress: ''
+    }
+  });
   const { loading: isLoadingHeader } = useRequest2(() => getTeamInvoiceHeader(), {
     manual: false,
-    onSuccess: (res) => setFormData(res)
+    onSuccess: (res) => inputForm.reset(res)
   });
 
-  const handleSubmit = useCallback(async () => {
-    if (!isHeaderValid(formData)) {
-      toast({
-        title: t('common:support.wallet.invoice_data.in_valid'),
-        status: 'info'
-      });
-      return;
-    }
-    handleSubmitInvoice();
-  }, [formData, handleSubmitInvoice, isHeaderValid, t, toast]);
-
   const handleBack = useCallback(() => {
     setChosenBillDataList([]);
     getInvoiceBills();
     onCloseSettleModal();
   }, [getInvoiceBills, onCloseSettleModal]);
 
-  const handleSingleCheck = useCallback(
-    (item: invoiceBillDataType) => {
-      if (chosenBillDataList.find((bill) => bill._id === item._id)) {
-        setChosenBillDataList(chosenBillDataList.filter((bill) => bill._id !== item._id));
-      } else {
-        setChosenBillDataList([...chosenBillDataList, { _id: item._id, price: item.price }]);
-      }
-    },
-    [chosenBillDataList]
-  );
-
   return (
     <MyModal
       isOpen={true}
@@ -258,11 +232,7 @@ const ApplyInvoiceModal = ({ onClose }: { onClose: () => void }) => {
           </Box>
           <MyBox isLoading={isLoadingHeader}>
             <Flex justify={'center'}>
-              <InvoiceHeaderSingleForm
+              <InvoiceHeaderSingleForm inputForm={inputForm} />
-                formData={formData}
-                handleChange={handleChange}
-                handleRatiosChange={handleRatiosChange}
-              />
             </Flex>
           </MyBox>
           <Flex
@@ -289,7 +259,7 @@ const ApplyInvoiceModal = ({ onClose }: { onClose: () => void }) => {
                 </Box>
               </Flex>
             </Button>
-            <Button isLoading={isSubmitting} px="0" onClick={handleSubmit}>
+            <Button isLoading={isSubmitting} px="0" onClick={inputForm.handleSubmit(onSubmitApply)}>
               <Flex alignItems={'center'}>
                 <Box px={'1.25rem'} py={'0.5rem'}>
                   {t('common:common.Confirm')}

projects/app/src/pages/account/components/bill/BillAndInvoice.tsx

@@ -6,19 +6,22 @@ import { useTranslation } from 'next-i18next';
 import ApplyInvoiceModal from './ApplyInvoiceModal';
 import { useRouter } from 'next/router';
 
-export const InvoiceTabEnum = {
+export enum InvoiceTabEnum {
-  bill: 'bill',
+  bill = 'bill',
-  invoice: 'invoice',
+  invoice = 'invoice',
-  invoiceHeader: 'invoiceHeader'
+  invoiceHeader = 'invoiceHeader'
-};
+}
+
 const BillTable = dynamic(() => import('./BillTable'));
 const InvoiceHeaderForm = dynamic(() => import('./InvoiceHeaderForm'));
 const InvoiceTable = dynamic(() => import('./InvoiceTable'));
 const BillAndInvoice = () => {
-  const [isOpenInvoiceModal, setIsOpenInvoiceModal] = useState(false);
-  const router = useRouter();
-  const invoiceTab = (router.query.invoiceTab as string) || InvoiceTabEnum.bill;
   const { t } = useTranslation();
+  const router = useRouter();
+  const { invoiceTab = InvoiceTabEnum.bill } = router.query as { invoiceTab: `${InvoiceTabEnum}` };
+
+  const [isOpenInvoiceModal, setIsOpenInvoiceModal] = useState(false);
+
   return (
     <>
       <Box p={['1rem', '2rem']}>
@@ -36,7 +39,7 @@ const BillAndInvoice = () => {
             onChange={(e) => {
               router.replace({
                 query: {
-                  currentTab: router.query.currentTab,
+                  ...router.query,
                   invoiceTab: e
                 }
               });

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

@@ -101,6 +101,7 @@ const BillTable = () => {
       isLoading={isLoading || isRefreshing}
       position={'relative'}
       h={'100%'}
+      minH={'50vh'}
       overflow={'overlay'}
     >
       <TableContainer>
@@ -198,6 +199,10 @@ function BillDetailModal({ bill, onClose }: { bill: BillSchemaType; onClose: ()
           <FormLabel flex={'0 0 120px'}>{t('common:support.wallet.usage.Time')}:</FormLabel>
           <Box>{dayjs(bill.createTime).format('YYYY/MM/DD HH:mm:ss')}</Box>
         </Flex>
+        <Flex alignItems={'center'} pb={4}>
+          <FormLabel flex={'0 0 120px'}>{t('common:support.wallet.bill.Type')}:</FormLabel>
+          <Box>{t(billTypeMap[bill.type]?.label as any)}</Box>
+        </Flex>
         <Flex alignItems={'center'} pb={4}>
           <FormLabel flex={'0 0 120px'}>{t('common:support.wallet.bill.Status')}:</FormLabel>
           <Box>{t(billStatusMap[bill.status]?.label as any)}</Box>
@@ -212,14 +217,18 @@ function BillDetailModal({ bill, onClose }: { bill: BillSchemaType; onClose: ()
           <FormLabel flex={'0 0 120px'}>{t('common:support.wallet.Amount')}:</FormLabel>
           <Box>{commonT('common:pay.yuan', { amount: formatStorePrice2Read(bill.price) })}</Box>
         </Flex>
-        <Flex alignItems={'center'} pb={4}>
+        {bill.metadata && (
-          <FormLabel flex={'0 0 120px'}>{t('common:support.wallet.bill.Type')}:</FormLabel>
-          <Box>{t(billTypeMap[bill.type]?.label as any)}</Box>
-        </Flex>
           <Flex alignItems={'center'} pb={4}>
             <FormLabel flex={'0 0 120px'}>{t('common:support.wallet.has_invoice')}:</FormLabel>
-          <Box>{bill.hasInvoice ? t('common:yes') : t('common:no')}</Box>
+            {bill.metadata.payWay === 'balance' ? (
+              t('user:bill.not_need_invoice')
+            ) : (
+              <Box>
+                {(bill.metadata.payWay = bill.hasInvoice ? t('common:yes') : t('common:no'))}
+              </Box>
+            )}
           </Flex>
+        )}
         {!!bill.metadata?.subMode && (
           <Flex alignItems={'center'} pb={4}>
             <FormLabel flex={'0 0 120px'}>

projects/app/src/pages/account/components/bill/InvoiceHeaderForm.tsx

@@ -1,56 +1,28 @@
 import Divider from '@/pages/app/detail/components/WorkflowComponents/Flow/components/Divider';
 import { getTeamInvoiceHeader, updateTeamInvoiceHeader } from '@/web/support/user/team/api';
-import { Box, Button, Flex, Input, Radio, RadioGroup, Stack } from '@chakra-ui/react';
+import { Box, Button, Flex, HStack, Input, InputProps, Radio, RadioGroup } from '@chakra-ui/react';
 import { TeamInvoiceHeaderType } from '@fastgpt/global/support/user/team/type';
 import MyBox from '@fastgpt/web/components/common/MyBox';
 import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
-import { useCallback, useState } from 'react';
 import { useTranslation } from 'next-i18next';
-import { useToast } from '@fastgpt/web/hooks/useToast';
+import { UseFormReturn, useForm } from 'react-hook-form';
-
+import FormLabel from '@fastgpt/web/components/common/MyBox/FormLabel';
-const InputItem = ({
-  label,
-  value,
-  onChange,
-  name
-}: {
-  label: string;
-  value: string;
-  onChange: (e: any) => void;
-  name: string;
-}) => {
-  return (
-    <>
-      <Flex justify={'space-between'} flexDir={['column', 'row']}>
-        <Box fontSize={'14px'} lineHeight={'2rem'}>
-          {label}
-        </Box>
-        <Input
-          bg={'myGray.50'}
-          border={'1px solid'}
-          borderColor={'myGray.200'}
-          w={'21.25rem'}
-          focusBorderColor="myGray.200"
-          placeholder={label}
-          value={value}
-          onChange={onChange}
-          name={name}
-        />
-      </Flex>
-    </>
-  );
-};
 
 export const InvoiceHeaderSingleForm = ({
-  formData,
+  inputForm
-  handleChange,
-  handleRatiosChange
 }: {
-  formData: TeamInvoiceHeaderType;
+  inputForm: UseFormReturn<TeamInvoiceHeaderType, any>;
-  handleChange: (e: any) => void;
-  handleRatiosChange: (v: string) => void;
 }) => {
   const { t } = useTranslation();
+
+  const { watch, register } = inputForm;
+  const needSpecialInvoice = watch('needSpecialInvoice');
+
+  const styles: InputProps = {
+    bg: 'myGray.50',
+    w: '21.25rem'
+  };
+
   return (
     <>
       <Flex
@@ -61,138 +33,185 @@ export const InvoiceHeaderSingleForm = ({
         color={'myGray.900'}
         fontSize={'14px'}
       >
-        <InputItem
+        <Flex
-          label={t('common:support.wallet.invoice_data.organization_name')}
+          justify={'space-between'}
-          value={formData.teamName}
+          alignItems={['flex-start', 'center']}
-          onChange={handleChange}
+          flexDir={['column', 'row']}
-          name="teamName"
+        >
+          <FormLabel required>
+            {t('common:support.wallet.invoice_data.organization_name')}
+          </FormLabel>
+          <Input
+            {...styles}
+            placeholder={t('common:support.wallet.invoice_data.organization_name')}
+            {...register('teamName', { required: true })}
           />
-        <InputItem
+        </Flex>
-          label={t('common:support.wallet.invoice_data.unit_code')}
+        <Flex
-          value={formData.unifiedCreditCode}
+          justify={'space-between'}
-          onChange={handleChange}
+          alignItems={['flex-start', 'center']}
-          name="unifiedCreditCode"
+          flexDir={['column', 'row']}
+        >
+          <FormLabel required>{t('common:support.wallet.invoice_data.unit_code')}</FormLabel>
+          <Input
+            {...styles}
+            placeholder={t('common:support.wallet.invoice_data.unit_code')}
+            {...register('unifiedCreditCode', { required: true })}
           />
-        <InputItem
+        </Flex>
-          label={t('common:support.wallet.invoice_data.company_address')}
+        <Flex
-          value={formData.companyAddress}
+          justify={'space-between'}
-          onChange={handleChange}
+          alignItems={['flex-start', 'center']}
-          name="companyAddress"
+          flexDir={['column', 'row']}
+        >
+          <FormLabel required={!!needSpecialInvoice}>
+            {t('common:support.wallet.invoice_data.company_address')}
+          </FormLabel>
+          <Input
+            {...styles}
+            placeholder={t('common:support.wallet.invoice_data.company_address')}
+            {...register('companyAddress', { required: !!needSpecialInvoice })}
           />
-        <InputItem
+        </Flex>
-          label={t('common:support.wallet.invoice_data.company_phone')}
+        <Flex
-          value={formData.companyPhone}
+          justify={'space-between'}
-          onChange={handleChange}
+          alignItems={['flex-start', 'center']}
-          name="companyPhone"
+          flexDir={['column', 'row']}
+        >
+          <FormLabel required={!!needSpecialInvoice}>
+            {t('common:support.wallet.invoice_data.company_phone')}
+          </FormLabel>
+          <Input
+            {...styles}
+            placeholder={t('common:support.wallet.invoice_data.company_phone')}
+            {...register('companyPhone', { required: !!needSpecialInvoice })}
           />
-        <InputItem
+        </Flex>
-          label={t('common:support.wallet.invoice_data.bank')}
+        <Flex
-          value={formData.bankName}
+          justify={'space-between'}
-          onChange={handleChange}
+          alignItems={['flex-start', 'center']}
-          name="bankName"
+          flexDir={['column', 'row']}
+        >
+          <FormLabel required={!!needSpecialInvoice}>
+            {t('common:support.wallet.invoice_data.bank')}
+          </FormLabel>
+          <Input
+            {...styles}
+            placeholder={t('common:support.wallet.invoice_data.bank')}
+            {...register('bankName', { required: !!needSpecialInvoice })}
           />
-        <InputItem
+        </Flex>
-          label={t('common:support.wallet.invoice_data.bank_account')}
+        <Flex
-          value={formData.bankAccount}
+          justify={'space-between'}
-          onChange={handleChange}
+          alignItems={['flex-start', 'center']}
-          name="bankAccount"
+          flexDir={['column', 'row']}
+        >
+          <FormLabel required={!!needSpecialInvoice}>
+            {t('common:support.wallet.invoice_data.bank_account')}
+          </FormLabel>
+          <Input
+            {...styles}
+            placeholder={t('common:support.wallet.invoice_data.bank_account')}
+            {...register('bankAccount', { required: !!needSpecialInvoice })}
           />
-        <Flex justify={'space-between'} flexDir={['column', 'row']}>
+        </Flex>
-          <Box fontSize={'14px'} lineHeight={'2rem'}>
+        <Flex
+          justify={'space-between'}
+          alignItems={['flex-start', 'center']}
+          flexDir={['column', 'row']}
+        >
+          <FormLabel required>
             {t('common:support.wallet.invoice_data.need_special_invoice')}
-          </Box>
+          </FormLabel>
+          {/* @ts-ignore */}
           <RadioGroup
-            value={
+            value={`${needSpecialInvoice}`}
-              formData.needSpecialInvoice === undefined
+            onChange={(e) => {
-                ? ''
+              inputForm.setValue('needSpecialInvoice', e === 'true');
-                : formData.needSpecialInvoice.toString()
+            }}
-            }
-            onChange={handleRatiosChange}
             w={'21.25rem'}
           >
-            <Stack direction="row" h={'2rem'}>
+            <HStack h={'2rem'}>
               <Radio value="true" pr={'1rem'}>
                 <Box fontSize={'14px'}>{t('common:yes')}</Box>
               </Radio>
               <Radio value="false">
                 <Box fontSize={'14px'}>{t('common:no')}</Box>
               </Radio>
-            </Stack>
+            </HStack>
           </RadioGroup>
         </Flex>
         <Box w={'100%'}>
           <Divider showBorderBottom={false} />
         </Box>
-        <InputItem
+        <Flex
-          label={t('common:support.wallet.invoice_data.email')}
+          justify={'space-between'}
-          value={formData.emailAddress}
+          alignItems={['flex-start', 'center']}
-          onChange={handleChange}
+          flexDir={['column', 'row']}
-          name="emailAddress"
+        >
+          <FormLabel required>{t('common:support.wallet.invoice_data.email')}</FormLabel>
+          <Input
+            {...styles}
+            placeholder={t('common:support.wallet.invoice_data.email')}
+            {...register('emailAddress', {
+              required: true,
+              pattern: {
+                value: /(^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$)/,
+                message: t('user:password.email_phone_error')
+              }
+            })}
           />
         </Flex>
+      </Flex>
     </>
   );
 };
 
 const InvoiceHeaderForm = () => {
-  const [formData, setFormData] = useState<TeamInvoiceHeaderType>({
+  const inputForm = useForm<TeamInvoiceHeaderType>({
+    defaultValues: {
       teamName: '',
       unifiedCreditCode: '',
       companyAddress: '',
       companyPhone: '',
       bankName: '',
       bankAccount: '',
-    needSpecialInvoice: undefined,
+      needSpecialInvoice: false,
       emailAddress: ''
+    }
   });
+
   const { loading: isLoading } = useRequest2(() => getTeamInvoiceHeader(), {
     manual: false,
     onSuccess: (data) => {
-      setFormData(data);
+      console.log(data, '--');
+      inputForm.reset(data);
     }
   });
+
   const { t } = useTranslation();
-  const { toast } = useToast();
+
-  const handleChange = useCallback((e: any) => {
+  const { loading: isSubmitting, runAsync: onUpdateHeader } = useRequest2(
-    const { name, value } = e.target;
+    (data: TeamInvoiceHeaderType) => updateTeamInvoiceHeader(data),
-    setFormData((prev) => ({ ...prev, [name]: value }));
-  }, []);
-  const handleRatiosChange = useCallback((v: string) => {
-    setFormData((prev) => ({ ...prev, needSpecialInvoice: v === 'true' }));
-  }, []);
-  const isHeaderValid = useCallback((v: TeamInvoiceHeaderType) => {
-    const emailRegex = /\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/;
-    return emailRegex.test(v.emailAddress);
-  }, []);
-  const { loading: isSubmitting, run: handleSubmit } = useRequest2(
-    () => updateTeamInvoiceHeader(formData),
     {
       manual: true,
       successToast: t('common:common.Save Success'),
       errorToast: t('common:common.Save Failed')
     }
   );
-  const onSubmit = useCallback(() => {
+
-    if (!isHeaderValid(formData)) {
-      toast({
-        title: t('common:support.wallet.invoice_data.in_valid'),
-        status: 'info'
-      });
-      return;
-    }
-    handleSubmit();
-  }, [handleSubmit, formData, isHeaderValid, toast, t]);
   return (
     <>
       <MyBox isLoading={isLoading} pt={['1rem', '3.5rem']}>
         <Flex w={'100%'} overflow={'auto'} justify={'center'} flexDir={'column'} align={'center'}>
-          <InvoiceHeaderSingleForm
+          <InvoiceHeaderSingleForm inputForm={inputForm} />
-            formData={formData}
-            handleChange={handleChange}
-            handleRatiosChange={handleRatiosChange}
-          />
           <Flex w={'100%'} justify={'center'} mt={'3rem'}>
-            <Button variant={'primary'} px="0" onClick={onSubmit} isLoading={isSubmitting}>
+            <Button
+              variant={'primary'}
+              px="0"
+              onClick={inputForm.handleSubmit(onUpdateHeader)}
+              isLoading={isSubmitting}
+            >
               <Flex alignItems={'center'} px={'20px'}>
                 <Box px={'1.25rem'} py={'0.5rem'}>
                   {t('common:common.Save')}

projects/app/src/pages/account/components/bill/InvoiceTable.tsx

@@ -197,11 +197,11 @@ function InvoiceDetailModal({
   );
 }
 
-function LabelItem({ label, value }: { label: string; value: string }) {
+function LabelItem({ label, value }: { label: string; value?: string }) {
   return (
     <Flex alignItems={'center'} justify={'space-between'}>
       <FormLabel flex={'0 0 120px'}>{label}</FormLabel>
-      <Box>{value}</Box>
+      <Box>{value || '-'}</Box>
     </Flex>
   );
 }

projects/app/src/pages/api/common/file/upload.ts

@@ -26,7 +26,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
     const start = Date.now();
     /* Creates the multer uploader */
     const upload = getUploadModel({
-      maxSize: (global.feConfigs?.uploadFileMaxSize || 500) * 1024 * 1024
+      maxSize: global.feConfigs?.uploadFileMaxSize
     });
     const { file, bucketName, metadata } = await upload.doUpload(req, res);
     filePaths.push(file.path);

projects/app/src/pages/api/core/dataset/collection/create/localFile.ts

@@ -30,7 +30,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>): CreateCo
    * Creates the multer uploader
    */
   const upload = getUploadModel({
-    maxSize: (global.feConfigs?.uploadFileMaxSize || 500) * 1024 * 1024
+    maxSize: global.feConfigs?.uploadFileMaxSize
   });
   let filePaths: string[] = [];
 

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/hooks/useWorkflow.tsx

@@ -279,7 +279,7 @@ export const useWorkflow = () => {
   const [helperLineHorizontal, setHelperLineHorizontal] = useState<THelperLine>();
   const [helperLineVertical, setHelperLineVertical] = useState<THelperLine>();
 
-  const customApplyNodeChanges = (changes: NodeChange[], nodes: Node[]): Node[] => {
+  const customApplyNodeChanges = (changes: NodeChange[], nodes: Node[]) => {
     const positionChange =
       changes[0].type === 'position' && changes[0].dragging ? changes[0] : undefined;
 
@@ -316,14 +316,10 @@ export const useWorkflow = () => {
       setHelperLineHorizontal(undefined);
       setHelperLineVertical(undefined);
     }
-
-    return applyNodeChanges(changes, nodes);
   };
 
   /* node */
   const handleNodesChange = (changes: NodeChange[]) => {
-    setNodes((nodes) => customApplyNodeChanges(changes, nodes));
-
     for (const change of changes) {
       if (change.type === 'remove') {
         const node = nodes.find((n) => n.id === change.id);
@@ -345,6 +341,8 @@ export const useWorkflow = () => {
       }
     }
 
+    customApplyNodeChanges(changes, nodes);
+
     onNodesChange(changes);
   };
   const handleEdgeChange = useCallback(

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/NodeHttp/index.tsx

@@ -390,8 +390,7 @@ const RenderHttpTimeout = ({
   const onChangeNode = useContextSelector(WorkflowContext, (v) => v.onChangeNode);
 
   return (
-    <Box>
+    <Flex alignItems={'center'} justifyContent={'space-between'}>
-      <Box mb={2} display={'flex'} justifyContent={'space-between'}>
       <Box fontWeight={'medium'} color={'myGray.600'}>
         {t('common:core.module.Http timeout')}
       </Box>
@@ -401,6 +400,7 @@ const RenderHttpTimeout = ({
             defaultValue={timeout.value}
             min={timeout.min}
             max={timeout.max}
+            bg={'white'}
             onBlur={() => setIsEditTimeout(false)}
             onChange={(e) => {
               onChangeNode({
@@ -414,7 +414,7 @@ const RenderHttpTimeout = ({
               });
             }}
           >
-              <NumberInputField bg={'white'} px={3} borderRadius={'sm'} />
+            <NumberInputField autoFocus bg={'white'} px={3} borderRadius={'sm'} />
             <NumberInputStepper>
               <NumberIncrementStepper />
               <NumberDecrementStepper />
@@ -422,14 +422,13 @@ const RenderHttpTimeout = ({
           </NumberInput>
         ) : (
           <Button
-              variant={'ghost'}
+            variant={'whiteBase'}
             color={'myGray.600'}
             onClick={() => setIsEditTimeout(true)}
           >{`${timeout?.value} s`}</Button>
         )}
       </Box>
-      </Box>
+    </Flex>
-    </Box>
   );
 };
 const RenderForm = ({

projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/NodeCard.tsx

@@ -201,7 +201,7 @@ const NodeCard = (props: Props) => {
                 </Button>
               </MyTooltip>
             )}
-            {!!nodeTemplate?.diagram && (
+            {!!nodeTemplate?.diagram && !hasNewVersion && (
               <MyTooltip
                 label={
                   <Image src={nodeTemplate?.diagram} w={'100%'} minH={['auto', '200px']} alt={''} />

projects/app/src/pages/app/list/components/List.tsx

@@ -149,8 +149,8 @@ const ListItem = () => {
                 app.type === AppTypeEnum.folder
                   ? t('common:common.folder.Open folder')
                   : app.permission.hasWritePer
-                    ? appT('edit_app')
+                    ? t('app:edit_app')
-                    : appT('go_to_chat')
+                    : t('app:go_to_chat')
               }
             >
               <MyBox

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

@@ -138,7 +138,7 @@ const MyApps = () => {
           flex={'1 0 0'}
           flexDirection={'column'}
           h={'100%'}
-          pr={folderDetail ? [4, 2] : [4, 10]}
+          pr={folderDetail ? [3, 2] : [3, 10]}
           pl={3}
           overflowY={'auto'}
           overflowX={'hidden'}

projects/app/src/pages/dataset/detail/components/Info.tsx

@@ -143,9 +143,10 @@ const Info = ({ datasetId }: { datasetId: string }) => {
         <Box flex={1}>{datasetDetail._id}</Box>
       </Flex>
       <Flex mt={8} w={'100%'} alignItems={'center'} flexWrap={'wrap'}>
-        <FormLabel flex={['0 0 90px', '0 0 160px']} w={0}>
+        <HStack flex={['0 0 90px', '0 0 160px']} w={0} spacing={1}>
-          {t('common:core.ai.model.Vector Model')}
+          <FormLabel>{t('common:core.ai.model.Vector Model')}</FormLabel>
-        </FormLabel>
+          <QuestionTip label={t('common:core.dataset.embedding model tip')} />
+        </HStack>
         <Box flex={[1, '0 0 320px']}>
           <AIModelSelector
             w={'100%'}
@@ -177,9 +178,10 @@ const Info = ({ datasetId }: { datasetId: string }) => {
         <Box flex={[1, '0 0 320px']}>{vectorModel.maxToken}</Box>
       </Flex>
       <Flex mt={6} alignItems={'center'} flexWrap={'wrap'}>
-        <FormLabel flex={['0 0 90px', '0 0 160px']} w={0}>
+        <HStack flex={['0 0 90px', '0 0 160px']} w={0} spacing={1}>
-          {t('common:core.ai.model.Dataset Agent Model')}
+          <FormLabel>{t('common:core.ai.model.Dataset Agent Model')}</FormLabel>
-        </FormLabel>
+          <QuestionTip label={t('dataset:file_model_function_tip')} />
+        </HStack>
         <Box flex={[1, '0 0 320px']}>
           <AIModelSelector
             w={'100%'}

projects/app/src/pages/dataset/list/component/CreateModal.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo } from 'react';
-import { Box, Flex, Button, ModalFooter, ModalBody, Input } from '@chakra-ui/react';
+import { Box, Flex, Button, ModalFooter, ModalBody, Input, HStack } from '@chakra-ui/react';
 import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
 import { useForm } from 'react-hook-form';
 import { compressImgFileAndUpload } from '@/web/common/file/controller';
@@ -19,6 +19,7 @@ import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants'
 import AIModelSelector from '@/components/Select/AIModelSelector';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useSystem } from '@fastgpt/web/hooks/useSystem';
+import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
 
 export type CreateDatasetType =
   | DatasetTypeEnum.dataset
@@ -163,19 +164,18 @@ const CreateModal = ({
             justify={'space-between'}
             flexDir={['column', 'row']}
           >
-            <Flex
+            <HStack
+              spacing={1}
               alignItems={'center'}
-              flex={['', '0 0 100px']}
+              flex={['', '0 0 110px']}
               fontSize={'sm'}
               color={'myGray.900'}
               fontWeight={500}
               pb={['12px', '0']}
             >
-              {t('common:core.ai.model.Vector Model')}
+              <Box>{t('common:core.ai.model.Vector Model')}</Box>
-              <MyTooltip label={t('common:core.dataset.embedding model tip')}>
+              <QuestionTip label={t('common:core.dataset.embedding model tip')} />
-                <MyIcon w={'16px'} h={'16px'} color={'myGray.500'} ml={'4px'} name="common/help" />
+            </HStack>
-              </MyTooltip>
-            </Flex>
             <Box w={['100%', '300px']}>
               <AIModelSelector
                 w={['100%', '300px']}
@@ -198,15 +198,17 @@ const CreateModal = ({
             justify={'space-between'}
             flexDir={['column', 'row']}
           >
-            <Box
+            <HStack
-              flex={['', '0 0 100px']}
+              spacing={1}
+              flex={['', '0 0 110px']}
               fontSize={'sm'}
               color={'myGray.900'}
               fontWeight={500}
               pb={['12px', '0']}
             >
-              {t('common:core.ai.model.Dataset Agent Model')}
+              <Box>{t('common:core.ai.model.Dataset Agent Model')}</Box>
-            </Box>
+              <QuestionTip label={t('dataset:file_model_function_tip')} />
+            </HStack>
             <Box w={['100%', '300px']}>
               <AIModelSelector
                 w={['100%', '300px']}
@@ -224,7 +226,7 @@ const CreateModal = ({
         )}
       </ModalBody>
 
-      <ModalFooter pt={'0px'} pb={'24px'}>
+      <ModalFooter px={'36px'}>
         <Button variant={'whiteBase'} mr={3} onClick={onClose}>
           {t('common:common.Close')}
         </Button>

projects/app/src/pages/dataset/list/component/List.tsx

@@ -1,6 +1,5 @@
 import React, { useMemo, useRef, useState } from 'react';
 import { resumeInheritPer } from '@/web/core/dataset/api';
-import { useDatasetStore } from '@/web/core/dataset/store/dataset';
 import { Box, Flex, Grid, HStack } from '@chakra-ui/react';
 import { DatasetTypeEnum, DatasetTypeMap } from '@fastgpt/global/core/dataset/constants';
 import MyMenu from '@fastgpt/web/components/common/MyMenu';
@@ -39,6 +38,8 @@ import { formatTimeToChatTime } from '@fastgpt/global/common/string/time';
 import { useSystem } from '@fastgpt/web/hooks/useSystem';
 import SideTag from './SideTag';
 
+const EditResourceModal = dynamic(() => import('@/components/common/Modal/EditResourceModal'));
+
 function List() {
   const { setLoading } = useSystemStore();
   const { toast } = useToast();
@@ -76,7 +77,7 @@ function List() {
     }
   });
 
-  const { data: members = [], loading: isLoadMembers } = useRequest2(loadAndGetTeamMembers, {
+  const { data: members = [] } = useRequest2(loadAndGetTeamMembers, {
     manual: false
   });
 
@@ -111,8 +112,6 @@ function List() {
     errorToast: t('common:dataset.Export Dataset Limit Error')
   });
 
-  const EditResourceModal = dynamic(() => import('@/components/common/Modal/EditResourceModal'));
-
   const DeleteTipsMap = useRef({
     [DatasetTypeEnum.folder]: t('common:dataset.deleteFolderTips'),
     [DatasetTypeEnum.dataset]: t('common:core.dataset.Delete Confirm'),
@@ -161,8 +160,7 @@ function List() {
           gridGap={5}
           alignItems={'stretch'}
         >
-          {!isLoadMembers &&
+          {formatDatasets.map((dataset, index) => {
-            formatDatasets.map((dataset, index) => {
             const owner = members.find((v) => v.tmbId === dataset.tmbId);
             return (
               <MyTooltip
@@ -171,8 +169,8 @@ function List() {
                   <Flex flexDirection={'column'} alignItems={'center'}>
                     <Box fontSize={'xs'} color={'myGray.500'}>
                       {dataset.type === DatasetTypeEnum.folder
-                          ? t('common.folder.Open folder')
+                        ? t('common:common.folder.Open folder')
-                          : t('common.folder.open_dataset')}
+                        : t('common:common.folder.open_dataset')}
                     </Box>
                   </Flex>
                 }
@@ -290,9 +288,7 @@ function List() {
                       {isPc && (
                         <HStack spacing={1} className="time">
                           <MyIcon name={'history'} w={'0.85rem'} color={'myGray.400'} />
-                            <Box color={'myGray.500'}>
+                          <Box color={'myGray.500'}>{formatTimeToChatTime(dataset.updateTime)}</Box>
-                              {formatTimeToChatTime(dataset.updateTime)}
-                            </Box>
                         </HStack>
                       )}
                       {dataset.permission.hasWritePer && (
@@ -415,7 +411,6 @@ function List() {
               intro: data.intro,
               avatar: data.avatar
             });
-            setEditedDataset(undefined);
           }}
         />
       )}

projects/app/src/pages/dataset/list/component/SideTag.tsx

@@ -11,18 +11,15 @@ const SideTag = ({ type, ...props }: { type: `${DatasetTypeEnum}` } & FlexProps)
     return {
       [DatasetTypeEnum.dataset]: {
         icon: 'core/dataset/commonDatasetOutline',
-        label: t('dataset:common_dataset'),
+        label: t('dataset:common_dataset')
-        collectionLabel: 'common.File'
       },
       [DatasetTypeEnum.websiteDataset]: {
         icon: 'core/dataset/websiteDatasetOutline',
-        label: t('dataset:website_dataset'),
+        label: t('dataset:website_dataset')
-        collectionLabel: 'common.Website'
       },
       [DatasetTypeEnum.externalFile]: {
         icon: 'core/dataset/externalDatasetOutline',
-        label: t('dataset:external_file'),
+        label: t('dataset:external_file')
-        collectionLabel: 'common.File'
       }
     };
   }, [t]);
@@ -31,8 +28,6 @@ const SideTag = ({ type, ...props }: { type: `${DatasetTypeEnum}` } & FlexProps)
   return (
     <Flex
       bg={'myGray.100'}
-      borderWidth={'1px'}
-      borderColor={'myGray.200'}
       py={'3px'}
       pl={'8px'}
       pr={'12px'}
@@ -43,7 +38,6 @@ const SideTag = ({ type, ...props }: { type: `${DatasetTypeEnum}` } & FlexProps)
     >
       <MyIcon name={item.icon as any} w={'0.8rem'} color={'myGray.400'} />
       <Box fontSize={'mini'} ml={1}>
-        {/* @ts-ignore */}
         {item.label}
       </Box>
     </Flex>

projects/app/src/service/mongo.ts

@@ -12,7 +12,7 @@ import { startMongoWatch } from './common/system/volumnMongoWatch';
 import { startTrainingQueue } from './core/dataset/training/utils';
 import { systemStartCb } from '@fastgpt/service/common/system/tools';
 import { addLog } from '@fastgpt/service/common/system/log';
-import { getSystemPluginCb } from './core/app/plugin';
+import { getSystemPluginCb, getSystemPlugins } from './core/app/plugin';
 
 /**
  * This function is equivalent to the entry to the service
@@ -32,7 +32,13 @@ export function connectToDatabase() {
       systemStartCb();
 
       //init system config；init vector database；init root user
-      await Promise.all([getInitConfig(), getSystemPluginCb(), initVectorStore(), initRootUser()]);
+      await Promise.all([
+        getInitConfig(),
+        getSystemPluginCb(),
+        getSystemPlugins(),
+        initVectorStore(),
+        initRootUser()
+      ]);
 
       startMongoWatch();
       // cron