v4.6-3 (#471)

projects/app/src/web/common/api/request.ts

@@ -9,10 +9,10 @@ import { TOKEN_ERROR_CODE } from '@fastgpt/global/common/error/errorCode';
 
 interface ConfigType {
   headers?: { [key: string]: string };
-  hold?: boolean;
   timeout?: number;
   onUploadProgress?: (progressEvent: AxiosProgressEvent) => void;
   cancelToken?: AbortController;
+  maxQuantity?: number;
 }
 interface ResponseDataType {
   code: number;
@@ -20,10 +20,44 @@ interface ResponseDataType {
   data: any;
 }
 
+const maxQuantityMap: Record<
+  string,
+  {
+    amount: number;
+    sign: AbortController;
+  }
+> = {};
+
+function requestStart({ url, maxQuantity }: { url: string; maxQuantity?: number }) {
+  if (!maxQuantity) return;
+  const item = maxQuantityMap[url];
+
+  if (item) {
+    if (item.amount >= maxQuantity && item.sign) {
+      item.sign.abort();
+      delete maxQuantityMap[url];
+    }
+  } else {
+    maxQuantityMap[url] = {
+      amount: 1,
+      sign: new AbortController()
+    };
+  }
+}
+function requestFinish({ url }: { url: string }) {
+  const item = maxQuantityMap[url];
+  if (item) {
+    item.amount--;
+    if (item.amount <= 0) {
+      delete maxQuantityMap[url];
+    }
+  }
+}
+
 /**
  * 请求开始
  */
-function requestStart(config: InternalAxiosRequestConfig): InternalAxiosRequestConfig {
+function startInterceptors(config: InternalAxiosRequestConfig): InternalAxiosRequestConfig {
   if (config.headers) {
     config.headers.token = getToken();
   }
@@ -85,14 +119,14 @@ const instance = axios.create({
 });
 
 /* 请求拦截 */
-instance.interceptors.request.use(requestStart, (err) => Promise.reject(err));
+instance.interceptors.request.use(startInterceptors, (err) => Promise.reject(err));
 /* 响应拦截 */
 instance.interceptors.response.use(responseSuccess, (err) => Promise.reject(err));
 
 function request(
   url: string,
   data: any,
-  { cancelToken, ...config }: ConfigType,
+  { cancelToken, maxQuantity, ...config }: ConfigType,
   method: Method
 ): any {
   /* 去空 */
@@ -102,6 +136,8 @@ function request(
     }
   }
 
+  requestStart({ url, maxQuantity });
+
   return instance
     .request({
       baseURL: '/api',
@@ -113,7 +149,8 @@ function request(
       ...config // 用户自定义配置，可以覆盖前面的配置
     })
     .then((res) => checkRes(res.data))
-    .catch((err) => responseError(err));
+    .catch((err) => responseError(err))
+    .finally(() => requestFinish({ url }));
 }
 
 /**

projects/app/src/web/common/file/hooks/useSelectFile.tsx

@@ -1,7 +1,7 @@
 import React, { useRef, useCallback } from 'react';
 import { Box } from '@chakra-ui/react';
 import { useToast } from '@/web/common/hooks/useToast';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 
 export const useSelectFile = (props?: { fileType?: string; multiple?: boolean }) => {
   const { t } = useTranslation();

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

@@ -1,4 +1,4 @@
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 import { useToast } from './useToast';
 
 /**

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

@@ -2,7 +2,7 @@ import { useToast } from '@/web/common/hooks/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 'react-i18next';
+import { useTranslation } from 'next-i18next';
 
 interface Props extends UseMutationOptions<any, any, any, any> {
   successToast?: string | null;

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

@@ -1,7 +1,7 @@
 import { useEffect, useRef, useState } from 'react';
 import { POST } from '../api/request';
 import { useToast } from './useToast';
-import { useTranslation } from 'react-i18next';
+import { useTranslation } from 'next-i18next';
 import { getErrText } from '@fastgpt/global/common/error/utils';
 
 export const useSpeech = () => {

projects/app/src/web/common/utils/i18n.ts

@@ -1,5 +1,4 @@
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
-import Cookies from 'js-cookie';
 
 export const LANG_KEY = 'NEXT_LOCALE_LANG';
 export enum LangEnum {
@@ -17,21 +16,27 @@ export const langMap = {
   }
 };
 
-export const setLangStore = (value: `${LangEnum}`) => {
-  return Cookies.set(LANG_KEY, value, { expires: 7, sameSite: 'None', secure: true });
-};
-
-export const getLangStore = () => {
-  return (Cookies.get(LANG_KEY) as `${LangEnum}`) || LangEnum.zh;
-};
-
 export const serviceSideProps = (content: any) => {
-  const acceptLanguage = (content.req.headers['accept-language'] as string) || '';
-  const acceptLanguageList = acceptLanguage.split(/,|;/g);
-  // @ts-ignore
-  const firstLang = acceptLanguageList.find((lang) => langMap[lang]);
-
-  const language = content.req.cookies[LANG_KEY] || firstLang || 'zh';
-
-  return serverSideTranslations(language, undefined, null, content.locales);
+  return serverSideTranslations(content.locale, undefined, null, content.locales);
+};
+
+export const getLng = (lng: string) => {
+  return lng.split('-')[0];
+};
+export const change2DefaultLng = (currentLng: string) => {
+  if (!navigator || !localStorage) return;
+  if (localStorage.getItem(LANG_KEY)) return;
+  const userLang = navigator.language;
+
+  if (userLang.includes(currentLng)) {
+    return;
+  }
+
+  // currentLng not in userLang
+  return getLng(userLang);
+};
+
+export const setLngStore = (lng: string) => {
+  if (!localStorage) return;
+  localStorage.setItem(LANG_KEY, lng);
 };