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/web/common/hooks/useConfirm.tsx

@@ -9,6 +9,7 @@ export const useConfirm = (props?: {
   content?: string;
   showCancel?: boolean;
   type?: 'common' | 'delete';
+  hideFooter?: boolean;
 }) => {
   const { t } = useTranslation();
 
@@ -33,7 +34,8 @@ export const useConfirm = (props?: {
     title = map?.title || t('Warning'),
     iconSrc = map?.iconSrc,
     content,
-    showCancel = true
+    showCancel = true,
+    hideFooter = false
   } = props || {};
   const [customContent, setCustomContent] = useState<string | React.ReactNode>(content);
 
@@ -54,6 +56,7 @@ export const useConfirm = (props?: {
       },
       [onOpen]
     ),
+    onClose,
     ConfirmModal: useCallback(
       ({
         closeText = t('common.Close'),
@@ -91,36 +94,38 @@ export const useConfirm = (props?: {
             maxW={['90vw', '500px']}
           >
             <ModalBody pt={5}>{customContent}</ModalBody>
-            <ModalFooter>
-              {showCancel && (
+            {!hideFooter && (
+              <ModalFooter>
+                {showCancel && (
+                  <Button
+                    variant={'whiteBase'}
+                    onClick={() => {
+                      onClose();
+                      typeof cancelCb.current === 'function' && cancelCb.current();
+                    }}
+                  >
+                    {closeText}
+                  </Button>
+                )}
+
                 <Button
-                  variant={'whiteBase'}
+                  bg={bg ? bg : map.bg}
+                  isDisabled={countDownAmount > 0}
+                  ml={4}
+                  isLoading={isLoading}
                   onClick={() => {
                     onClose();
-                    typeof cancelCb.current === 'function' && cancelCb.current();
+                    typeof confirmCb.current === 'function' && confirmCb.current();
                   }}
                 >
-                  {closeText}
+                  {countDownAmount > 0 ? `${countDownAmount}s` : confirmText}
                 </Button>
-              )}
-
-              <Button
-                bg={bg ? bg : map.bg}
-                isDisabled={countDownAmount > 0}
-                ml={4}
-                isLoading={isLoading}
-                onClick={() => {
-                  onClose();
-                  typeof confirmCb.current === 'function' && confirmCb.current();
-                }}
-              >
-                {countDownAmount > 0 ? `${countDownAmount}s` : confirmText}
-              </Button>
-            </ModalFooter>
+              </ModalFooter>
+            )}
           </MyModal>
         );
       },
-      [customContent, iconSrc, isOpen, map.bg, onClose, showCancel, t, title]
+      [customContent, hideFooter, iconSrc, isOpen, map.bg, onClose, showCancel, t, title]
     )
   };
 };

projects/app/src/web/common/hooks/useCopyData.tsx

@@ -1,5 +1,5 @@
 import { useTranslation } from 'next-i18next';
-import { useToast } from './useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 
 /**
  * copy text data

projects/app/src/web/common/hooks/useEditTitle.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useRef } from 'react';
 import { ModalFooter, ModalBody, Input, useDisclosure, Button, Box } from '@chakra-ui/react';
 import MyModal from '@/components/MyModal';
-import { useToast } from './useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useTranslation } from 'next-i18next';
 
 export const useEditTitle = ({

projects/app/src/web/common/hooks/usePagination.tsx

@@ -3,7 +3,7 @@ import type { PagingData } from '@/types/index.d';
 import { IconButton, Flex, Box, Input } from '@chakra-ui/react';
 import { ArrowBackIcon, ArrowForwardIcon } from '@chakra-ui/icons';
 import { useMutation } from '@tanstack/react-query';
-import { useToast } from './useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { throttle } from 'lodash';
 
 const thresholdVal = 100;

projects/app/src/web/common/hooks/useRequest.tsx

@@ -1,4 +1,4 @@
-import { useToast } from '@/web/common/hooks/useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useMutation } from '@tanstack/react-query';
 import type { UseMutationOptions } from '@tanstack/react-query';
 import { getErrText } from '@fastgpt/global/common/error/utils';

projects/app/src/web/common/hooks/useSpeech.ts

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { POST } from '../api/request';
-import { useToast } from './useToast';
+import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useTranslation } from 'next-i18next';
 import { getErrText } from '@fastgpt/global/common/error/utils';
 

projects/app/src/web/common/hooks/useToast.ts

@@ -1,13 +0,0 @@
-import { useToast as uToast, UseToastOptions } from '@chakra-ui/react';
-
-export const useToast = (props?: UseToastOptions) => {
-  const toast = uToast({
-    position: 'top',
-    duration: 2000,
-    ...(props && props)
-  });
-
-  return {
-    toast
-  };
-};