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>
2025-07-23 21:13:50 +00:00 · 2024-03-26 12:09:31 +08:00
parent ef15ca894e
commit 911512b36d
180 changed files with 2179 additions and 1361 deletions
--- a/packages/web/hooks/useConfirm.tsx
+++ b/packages/web/hooks/useConfirm.tsx
@@ -0,0 +1,131 @@
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useDisclosure, Button, ModalBody, ModalFooter } from '@chakra-ui/react';
+import { useTranslation } from 'next-i18next';
+import MyModal from '../components/common/MyModal';
+
+export const useConfirm = (props?: {
+  title?: string;
+  iconSrc?: string | '';
+  content?: string;
+  showCancel?: boolean;
+  type?: 'common' | 'delete';
+  hideFooter?: boolean;
+}) => {
+  const { t } = useTranslation();
+
+  const map = useMemo(() => {
+    const map = {
+      common: {
+        title: t('common.confirm.Common Tip'),
+        bg: undefined,
+        iconSrc: 'common/confirm/commonTip'
+      },
+      delete: {
+        title: t('common.Delete Warning'),
+        bg: 'red.600',
+        iconSrc: 'common/confirm/deleteTip'
+      }
+    };
+    if (props?.type && map[props.type]) return map[props.type];
+    return map.common;
+  }, [props?.type, t]);
+
+  const {
+    title = map?.title || t('Warning'),
+    iconSrc = map?.iconSrc,
+    content,
+    showCancel = true,
+    hideFooter = false
+  } = props || {};
+  const [customContent, setCustomContent] = useState<string | React.ReactNode>(content);
+
+  const { isOpen, onOpen, onClose } = useDisclosure();
+
+  const confirmCb = useRef<any>();
+  const cancelCb = useRef<any>();
+
+  return {
+    openConfirm: useCallback(
+      (confirm?: any, cancel?: any, customContent?: string | React.ReactNode) => {
+        confirmCb.current = confirm;
+        cancelCb.current = cancel;
+
+        customContent && setCustomContent(customContent);
+
+        return onOpen;
+      },
+      [onOpen]
+    ),
+    onClose,
+    ConfirmModal: useCallback(
+      ({
+        closeText = t('common.Close'),
+        confirmText = t('common.Confirm'),
+        isLoading,
+        bg,
+        countDown = 0
+      }: {
+        closeText?: string;
+        confirmText?: string;
+        isLoading?: boolean;
+        bg?: string;
+        countDown?: number;
+      }) => {
+        const timer = useRef<any>();
+        const [countDownAmount, setCountDownAmount] = useState(countDown);
+
+        useEffect(() => {
+          timer.current = setInterval(() => {
+            setCountDownAmount((val) => {
+              if (val <= 0) {
+                clearInterval(timer.current);
+              }
+              return val - 1;
+            });
+          }, 1000);
+        }, []);
+
+        return (
+          <MyModal
+            isOpen={isOpen}
+            onClose={onClose}
+            iconSrc={iconSrc}
+            title={title}
+            maxW={['90vw', '500px']}
+          >
+            <ModalBody pt={5}>{customContent}</ModalBody>
+            {!hideFooter && (
+              <ModalFooter>
+                {showCancel && (
+                  <Button
+                    variant={'whiteBase'}
+                    onClick={() => {
+                      onClose();
+                      typeof cancelCb.current === 'function' && cancelCb.current();
+                    }}
+                  >
+                    {closeText}
+                  </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>
+            )}
+          </MyModal>
+        );
+      },
+      [customContent, hideFooter, iconSrc, isOpen, map.bg, onClose, showCancel, t, title]
+    )
+  };
+};
--- a/packages/web/hooks/useRequest.tsx
+++ b/packages/web/hooks/useRequest.tsx
@@ -0,0 +1,41 @@
+import { useToast } from './useToast';
+import { useMutation } from '@tanstack/react-query';
+import type { UseMutationOptions } from '@tanstack/react-query';
+import { getErrText } from '@fastgpt/global/common/error/utils';
+import { useTranslation } from 'next-i18next';
+
+interface Props extends UseMutationOptions<any, any, any, any> {
+  successToast?: string | null;
+  errorToast?: string | null;
+}
+
+export const useRequest = ({ successToast, errorToast, onSuccess, onError, ...props }: Props) => {
+  const { toast } = useToast();
+  const { t } = useTranslation();
+  const mutation = useMutation<unknown, unknown, any, unknown>({
+    ...props,
+    onSuccess(res, variables: void, context: unknown) {
+      onSuccess?.(res, variables, context);
+      successToast &&
+        toast({
+          title: successToast,
+          status: 'success'
+        });
+    },
+    onError(err: any, variables: void, context: unknown) {
+      onError?.(err, variables, context);
+
+      if (errorToast !== undefined) {
+        const errText = t(getErrText(err, errorToast || ''));
+        if (errText) {
+          toast({
+            title: errText,
+            status: 'error'
+          });
+        }
+      }
+    }
+  });
+
+  return mutation;
+};