Perf: i18n change and captcha code. (#2625)

* perf: send captcha check * perf: back router * perf: i18n init * perf: ui * i18n * perf: ui duration
2025-07-29 09:44:47 +00:00 · 2024-09-05 23:01:12 +08:00
parent 478386c612
commit c614f8b9ca
43 changed files with 259 additions and 793 deletions
--- a/projects/app/src/pages/_app.tsx
+++ b/projects/app/src/pages/_app.tsx
@@ -15,6 +15,7 @@ import NextHead from '@/components/common/NextHead';
 function App({ Component, pageProps }: AppProps) {
  const { feConfigs, scripts, title } = useInitApp();
  const { t } = useTranslation();
+
  return (
    <>
      <NextHead
--- a/projects/app/src/pages/account/components/Individuation.tsx
+++ b/projects/app/src/pages/account/components/Individuation.tsx
@@ -7,8 +7,10 @@ import { UserType } from '@fastgpt/global/support/user/type';
 import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useForm } from 'react-hook-form';
 import { UserUpdateParams } from '@/types/user';
-import { langMap, setLngStore } from '@/web/common/utils/i18n';
+import { langMap } from '@/web/common/utils/i18n';
 import { useRouter } from 'next/router';
+import { useI18nLng } from '@fastgpt/web/hooks/useI18n';
+
 import MySelect from '@fastgpt/web/components/common/MySelect';
 import TimezoneSelect from '@fastgpt/web/components/common/MySelect/TimezoneSelect';

@@ -16,7 +18,7 @@ const Individuation = () => {
  const { t, i18n } = useTranslation();
  const { userInfo, updateUserInfo } = useUserStore();
  const { toast } = useToast();
-  const router = useRouter();
+  const { onChangeLng } = useI18nLng();

  const { reset } = useForm<UserUpdateParams>({
    defaultValues: userInfo as UserType
@@ -55,14 +57,7 @@ const Individuation = () => {
              }))}
              onchange={(val: any) => {
                const lang = val;
-                setLngStore(lang);
-                router.replace(
-                  {
-                    query: router.query
-                  },
-                  router.asPath,
-                  { locale: lang }
-                );
+                onChangeLng(lang);
              }}
            />
          </Box>
--- a/projects/app/src/pages/account/index.tsx
+++ b/projects/app/src/pages/account/index.tsx
@@ -40,14 +40,14 @@ const Account = ({ currentTab }: { currentTab: TabEnum }) => {
  const tabList = [
    {
      icon: 'support/user/userLight',
-      label: t('common:user.Personal Information'),
+      label: t('user:personal_information'),
      value: TabEnum.info
    },
    ...(feConfigs?.isPlus
      ? [
          {
            icon: 'support/usage/usageRecordLight',
-            label: t('common:user.Usage Record'),
+            label: t('user:usage_record'),
            value: TabEnum.usage
          }
        ]
@@ -57,7 +57,7 @@ const Account = ({ currentTab }: { currentTab: TabEnum }) => {
      ? [
          {
            icon: 'support/bill/payRecordLight',
-            label: t('common:support.wallet.Bills'),
+            label: t('user:bill_and_invoices'),
            value: TabEnum.bill
          }
        ]
@@ -67,7 +67,7 @@ const Account = ({ currentTab }: { currentTab: TabEnum }) => {
      ? [
          {
            icon: 'support/account/promotionLight',
-            label: t('common:user.Promotion Record'),
+            label: t('user:promotion_records'),
            value: TabEnum.promotion
          }
        ]
@@ -83,14 +83,14 @@ const Account = ({ currentTab }: { currentTab: TabEnum }) => {
      : []),
    {
      icon: 'support/user/individuation',
-      label: t('common:support.account.Individuation'),
+      label: t('user:personalization'),
      value: TabEnum.individuation
    },
    ...(feConfigs.isPlus
      ? [
          {
            icon: 'support/user/informLight',
-            label: t('common:user.Notice'),
+            label: t('user:notice'),
            value: TabEnum.inform
          }
        ]
@@ -98,7 +98,7 @@ const Account = ({ currentTab }: { currentTab: TabEnum }) => {

    {
      icon: 'support/account/loginoutLight',
-      label: t('common:user.Sign Out'),
+      label: t('user:sign_out'),
      value: TabEnum.loginout
    }
  ];
--- a/projects/app/src/pages/app/detail/components/Plugin/Header.tsx
+++ b/projects/app/src/pages/app/detail/components/Plugin/Header.tsx
@@ -125,9 +125,14 @@ const Header = () => {
    try {
      localStorage.removeItem(`${appDetail._id}-past`);
      localStorage.removeItem(`${appDetail._id}-future`);
-      router.back();
+      router.push({
+        pathname: '/app/list',
+        query: {
+          parentId: appDetail.parentId
+        }
+      });
    } catch (error) {}
-  }, [appDetail._id, router]);
+  }, [appDetail._id, appDetail.parentId, router]);

  const Render = useMemo(() => {
    return (
--- a/projects/app/src/pages/app/detail/components/Workflow/Header.tsx
+++ b/projects/app/src/pages/app/detail/components/Workflow/Header.tsx
@@ -125,9 +125,14 @@ const Header = () => {
    try {
      localStorage.removeItem(`${appDetail._id}-past`);
      localStorage.removeItem(`${appDetail._id}-future`);
-      router.back();
+      router.push({
+        pathname: '/app/list',
+        query: {
+          parentId: appDetail.parentId
+        }
+      });
    } catch (error) {}
-  }, [appDetail._id, router]);
+  }, [appDetail._id, appDetail.parentId, router]);

  const Render = useMemo(() => {
    return (
--- a/projects/app/src/pages/dataset/list/component/List.tsx
+++ b/projects/app/src/pages/dataset/list/component/List.tsx
@@ -272,7 +272,7 @@ function List() {
                      {owner && (
                        <HStack spacing={1}>
                          <Avatar src={owner.avatar} w={'0.875rem'} borderRadius={'50%'} />
-                          <Box maxW={'150px'} className="textEllipsis">
+                          <Box maxW={'150px'} className="textEllipsis" fontSize={'mini'}>
                            {owner.memberName}
                          </Box>
                        </HStack>
@@ -288,7 +288,9 @@ function List() {
                      {isPc && (
                        <HStack spacing={1} className="time">
                          <MyIcon name={'history'} w={'0.85rem'} color={'myGray.400'} />
-                          <Box color={'myGray.500'}>{formatTimeToChatTime(dataset.updateTime)}</Box>
+                          <Box color={'myGray.500'} fontSize={'mini'}>
+                            {formatTimeToChatTime(dataset.updateTime)}
+                          </Box>
                        </HStack>
                      )}
                      {dataset.permission.hasWritePer && (
--- a/projects/app/src/pages/login/components/LoginForm/LoginForm.tsx
+++ b/projects/app/src/pages/login/components/LoginForm/LoginForm.tsx
@@ -43,12 +43,12 @@ const LoginForm = ({ setPageType, loginSuccess }: Props) => {
          })
        );
        toast({
-          title: t('user:login.success'),
+          title: t('login:login_success'),
          status: 'success'
        });
      } catch (error: any) {
        toast({
-          title: error.message || t('user:login.error'),
+          title: error.message || t('login:login_failed'),
          status: 'error'
        });
      }
@@ -61,7 +61,7 @@ const LoginForm = ({ setPageType, loginSuccess }: Props) => {

  const placeholder = (() => {
    if (isCommunityVersion) {
-      return t('common:support.user.login.Root login');
+      return t('login:use_root_login');
    }
    return [t('common:support.user.login.Username')]
      .concat(
@@ -102,36 +102,36 @@ const LoginForm = ({ setPageType, loginSuccess }: Props) => {
            type={'password'}
            placeholder={
              isCommunityVersion
-                ? t('common:support.user.login.Root password placeholder')
+                ? t('login:root_password_placeholder')
                : t('common:support.user.login.Password')
            }
            {...register('password', {
              required: true,
              maxLength: {
                value: 60,
-                message: t('user:login.password_condition')
+                message: t('login:password_condition')
              }
            })}
          ></Input>
        </FormControl>
        {feConfigs?.docUrl && (
-          <Flex alignItems={'center'} mt={7} fontSize={'sm'}>
-            {t('common:support.user.login.Policy tip')}
+          <Flex alignItems={'center'} mt={7} fontSize={'mini'}>
+            {t('login:policy_tip')}
            <Link
              ml={1}
              href={getDocPath('/docs/agreement/terms/')}
              target={'_blank'}
              color={'primary.500'}
            >
-              {t('common:support.user.login.Terms')}
+              {t('login:terms')}
            </Link>
-            <Box mx={1}>{t('common:support.user.login.And')}</Box>
+            <Box mx={1}>&</Box>
            <Link
              href={getDocPath('/docs/agreement/privacy/')}
              target={'_blank'}
              color={'primary.500'}
            >
-              {t('common:support.user.login.Privacy')}
+              {t('login:privacy')}
            </Link>
          </Flex>
        )}
@@ -145,7 +145,7 @@ const LoginForm = ({ setPageType, loginSuccess }: Props) => {
          isLoading={requesting}
          onClick={handleSubmit(onclickLogin)}
        >
-          {t('common:Login')}
+          {t('login:Login')}
        </Button>

        <Flex align={'center'} justifyContent={'flex-end'} color={'primary.700'}>
@@ -156,7 +156,7 @@ const LoginForm = ({ setPageType, loginSuccess }: Props) => {
              onClick={() => setPageType('forgetPassword')}
              fontSize="sm"
            >
-              {t('common:support.user.login.Forget Password')}
+              {t('login:forget_password')}
            </Box>
          )}
          {feConfigs?.register_method && feConfigs.register_method.length > 0 && (
@@ -168,7 +168,7 @@ const LoginForm = ({ setPageType, loginSuccess }: Props) => {
                onClick={() => setPageType('register')}
                fontSize="sm"
              >
-                {t('common:support.user.login.Register')}
+                {t('login:register')}
              </Box>
            </>
          )}
--- a/projects/app/src/pages/login/index.tsx
+++ b/projects/app/src/pages/login/index.tsx
@@ -129,7 +129,7 @@ const Login = () => {

 export async function getServerSideProps(context: any) {
  return {
-    props: { ...(await serviceSideProps(context, ['app', 'user'])) }
+    props: { ...(await serviceSideProps(context, ['app', 'user', 'login'])) }
  };
 }