V4.8.18 feature (#3565)

* feat: org CRUD (#3380) * feat: add org schema * feat: org manage UI * feat: OrgInfoModal * feat: org tree view * feat: org management * fix: init root org * feat: org permission for app * feat: org support for dataset * fix: disable org role control * styles: opt type signatures * fix: remove unused permission * feat: delete org collaborator * perf: Team org ui (#3499) * perf: org ui * perf: org ui * feat: org auth for app & dataset (#3498) * feat: auth org resource permission * feat: org auth support for app & dataset * perf: org permission check (#3500) * i18n (#3501) * name * i18n * feat: support dataset changeOwner (#3483) * feat: support dataset changeOwner * chore: update dataset change owner api * feat: permission manage UI for org (#3503) * perf: password check;perf: image upload check;perf: sso login check (#3509) * perf: password check * perf: image upload check * perf: sso login check * force show update notification modal & fix login page text (#3512) * fix login page English text * update notification modal * perf: notify account (#3515) * perf(plugin): improve searXNG empty result handling and documentation (#3507) * perf(plugin): improve searXNG empty result handling and documentation * 修改了文档和代码部分无搜索的结果的反馈 * refactor: org pathId (#3516) * optimize payment process (#3517) * feat: support wecom sso (#3518) * feat: support wecom sso * chore: remove unused wecom js-sdk dependency * fix qrcode script (#3520) * fix qrcode script * i18n * perf: full text collection and search code;perf: rename function (#3519) * perf: full text collection and search code * perf: rename function * perf: notify modal * remove invalid code * perf: sso login * perf: pay process * 4.8.18 test (#3524) * perf: remove local token * perf: index * perf: file encoding;perf: leave team code;@c121914yu perf: full text search code (#3528) * perf: text encoding * perf: leave team code * perf: full text search code * fix: http status * perf: embedding search and vector avatar * perf: async read file (#3531) * refactor: team permission manager (#3535) * perf: classify org, group and member * refactor: team per manager * fix: missing functions * 4.8.18 test (#3543) * perf: login check * doc * perf: llm model config * perf: team clb config * fix: MemberModal UI (#3553) * fix: adapt MemberModal title and icon * fix: adapt member modal * fix: search input placeholder * fix: add button text * perf: org permission (#3556) * docs:用户答疑的官方文档补充 (#3540) * docs:用户答疑的官方文档补充 * 问题回答的内容修补 * share link random avatar (#3541) * share link random avatar * fix * delete unused code * share page avatar (#3558) * feat: init 4818 * share page avatar * feat: tmp upgrade code (#3559) * feat: tmp upgrade code * fulltext search test * update action * full text tmp code (#3561) * full text tmp code * fix: init * fix: init * remove tmp code * remove tmp code * 4818-alpha * 4.8.18 test (#3562) * full text tmp code * fix: init * upgrade code * account log * account log * perf: dockerfile * upgrade code * chore: update docs app template submission (#3564) --------- Co-authored-by: a.e. <49438478+I-Info@users.noreply.github.com> Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com> Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: Jiangween <145003935+Jiangween@users.noreply.github.com>
2025-01-11 15:15:38 +08:00
parent bb669ca3ff
commit 10d8c56e23
205 changed files with 5305 additions and 2428 deletions
--- a/projects/app/src/pages/price/components/ExtraPlan.tsx
+++ b/projects/app/src/pages/price/components/ExtraPlan.tsx
@@ -1,4 +1,4 @@
-import { Box, Flex, Grid, Button } from '@chakra-ui/react';
+import { Box, Flex, Grid, Button, VStack } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';
 import React, { useCallback, useState } from 'react';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
@@ -11,7 +11,7 @@ import { BillTypeEnum } from '@fastgpt/global/support/wallet/bill/constants';
 import QRCodePayModal, { type QRPayProps } from '@/components/support/wallet/QRCodePayModal';
 import MyNumberInput from '@fastgpt/web/components/common/Input/NumberInput';

-const ExtraPlan = () => {
+const ExtraPlan = ({ onPaySuccess }: { onPaySuccess?: () => void }) => {
  const { t } = useTranslation();
  const { toast } = useToast();
  const { subPlans } = useSystemStore();
@@ -108,19 +108,8 @@ const ExtraPlan = () => {
  );

  return (
-    <Flex
-      mt={['40px', '100px']}
-      flexDirection={'column'}
-      alignItems={'center'}
-      position={'relative'}
-    >
-      <Box id={'extra-plan'} fontWeight={'bold'} fontSize={['24px', '36px']} color={'myGray.900'}>
-        {t('common:support.wallet.subscription.Extra plan')}
-      </Box>
-      <Box mt={2} mb={8} color={'myGray.600'} fontSize={'md'}>
-        {t('common:support.wallet.subscription.Extra plan tip')}
-      </Box>
-      <Grid mt={8} gridTemplateColumns={['1fr', '1fr 1fr']} gap={5} w={['100%', 'auto']}>
+    <VStack>
+      <Grid gridTemplateColumns={['1fr', '1fr 1fr']} gap={5} w={['100%', 'auto']}>
        <Box
          bg={'rgba(255, 255, 255, 0.90)'}
          px={'32px'}
@@ -284,8 +273,8 @@ const ExtraPlan = () => {
        </Box>
      </Grid>

-      {!!qrPayData && <QRCodePayModal {...qrPayData} />}
-    </Flex>
+      {!!qrPayData && <QRCodePayModal onSuccess={onPaySuccess} {...qrPayData} />}
+    </VStack>
  );
 };

--- a/projects/app/src/pages/price/components/Standard.tsx
+++ b/projects/app/src/pages/price/components/Standard.tsx
@@ -20,10 +20,10 @@ export enum PackageChangeStatusEnum {

 const Standard = ({
  standardPlan: myStandardPlan,
-  refetchTeamSubPlan
+  onPaySuccess
 }: {
  standardPlan?: TeamSubSchema;
-  refetchTeamSubPlan: () => void;
+  onPaySuccess?: () => void;
 }) => {
  const { t } = useTranslation();

@@ -78,14 +78,6 @@ const Standard = ({
  return (
    <>
      <Flex flexDirection={'column'} alignItems={'center'} position={'relative'}>
-        <Box fontWeight={'600'} color={'myGray.900'} fontSize={['24px', '36px']}>
-          {t('common:support.wallet.subscription.Sub plan')}
-        </Box>
-        <Box mt={8} mb={10} fontWeight={'500'} color={'myGray.600'} fontSize={'md'}>
-          {t('common:support.wallet.subscription.Sub plan tip', {
-            title: feConfigs?.systemTitle
-          })}
-        </Box>
        <Box>
          <RowTabs
            list={[
@@ -96,8 +88,14 @@ const Standard = ({
              {
                label: (
                  <Flex>
-                    {t('common:support.wallet.subscription.mode.Year')}
-                    <Box ml={1} color={selectSubMode === SubModeEnum.month ? 'red.600' : 'auto'}>
+                    <Box whiteSpace={'nowrap'}>
+                      {t('common:support.wallet.subscription.mode.Year')}
+                    </Box>
+                    <Box
+                      whiteSpace={'nowrap'}
+                      ml={1}
+                      color={selectSubMode === SubModeEnum.month ? 'red.600' : 'auto'}
+                    >
                      ({t('common:support.wallet.subscription.mode.Year sale')})
                    </Box>
                  </Flex>
@@ -271,15 +269,13 @@ const Standard = ({
        </Grid>

        {!!qrPayData && packageChange && (
-          <QRCodePayModal tip={packagePayTextMap[packageChange]} {...qrPayData} />
+          <QRCodePayModal
+            tip={packagePayTextMap[packageChange]}
+            onSuccess={onPaySuccess}
+            {...qrPayData}
+          />
        )}
      </Flex>
-      <HStack mt={8} color={'blue.700'} ml={8}>
-        <MyIcon name={'infoRounded'} w={'1rem'} />
-        <Box fontSize={'sm'} fontWeight={'500'}>
-          {t('user:bill.standard_valid_tip')}
-        </Box>
-      </HStack>
    </>
  );
 };
--- a/projects/app/src/pages/price/index.tsx
+++ b/projects/app/src/pages/price/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { serviceSideProps } from '@fastgpt/web/common/system/nextjs';
-import { Box, Flex } from '@chakra-ui/react';
+import { Box, Flex, HStack, VStack } from '@chakra-ui/react';
 import { useUserStore } from '@/web/support/user/useUserStore';
 import { getTeamPlanStatus } from '@/web/support/user/team/api';
 import { useQuery } from '@tanstack/react-query';
@@ -9,50 +9,75 @@ import StandardPlan from './components/Standard';
 import ExtraPlan from './components/ExtraPlan';
 import PointsCard from './components/Points';
 import FAQ from './components/FAQ';
-import { getToken } from '@/web/support/user/auth';
-import Script from 'next/script';
-import { getWebReqUrl } from '@fastgpt/web/common/system/utils';
+import { useTranslation } from 'next-i18next';
+import MyIcon from '@fastgpt/web/components/common/Icon';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
+import { useRouter } from 'next/router';

 const PriceBox = () => {
  const { userInfo } = useUserStore();
+  const { t } = useTranslation();
+  const { feConfigs } = useSystemStore();
+  const router = useRouter();

-  const { data: teamSubPlan, refetch: refetchTeamSubPlan } = useQuery(
-    ['getTeamPlanStatus'],
-    getTeamPlanStatus,
-    {
-      enabled: !!getToken() || !!userInfo
-    }
-  );
+  const { data: teamSubPlan } = useQuery(['getTeamPlanStatus'], getTeamPlanStatus, {
+    enabled: !!userInfo
+  });
+
+  const onPaySuccess = () => {
+    setTimeout(() => {
+      router.reload();
+    }, 1000);
+  };

  return (
-    <>
-      <Script src={getWebReqUrl('/js/qrcode.min.js')} strategy="lazyOnload"></Script>
-      <Flex
-        h={'100%'}
-        flexDir={'column'}
-        overflow={'overlay'}
-        w={'100%'}
-        px={['20px', '5vw']}
-        py={['30px', '80px']}
-        bg={`linear-gradient(to right, #F8F8FD00, #F7F7FF),url(/imgs/priceBg.svg)`}
-        backgroundSize={'cover'}
-        backgroundRepeat={'no-repeat'}
-      >
-        {/* standard sub */}
-        <StandardPlan
-          standardPlan={teamSubPlan?.standard}
-          refetchTeamSubPlan={refetchTeamSubPlan}
-        />
+    <Flex
+      h={'100%'}
+      flexDir={'column'}
+      overflow={'overlay'}
+      w={'100%'}
+      px={['20px', '5vw']}
+      py={['30px', '80px']}
+      bg={`linear-gradient(to right, #F8F8FD00, #F7F7FF),url(/imgs/priceBg.svg)`}
+      backgroundSize={'cover'}
+      backgroundRepeat={'no-repeat'}
+    >
+      {/* standard sub */}
+      <VStack>
+        <Box fontWeight={'600'} color={'myGray.900'} fontSize={['24px', '36px']}>
+          {t('common:support.wallet.subscription.Sub plan')}
+        </Box>
+        <Box mt={8} mb={10} fontWeight={'500'} color={'myGray.600'} fontSize={'md'}>
+          {t('common:support.wallet.subscription.Sub plan tip', {
+            title: feConfigs?.systemTitle
+          })}
+        </Box>
+        <StandardPlan standardPlan={teamSubPlan?.standard} onPaySuccess={onPaySuccess} />
+        <HStack mt={8} color={'blue.700'} ml={8}>
+          <MyIcon name={'infoRounded'} w={'1rem'} />
+          <Box fontSize={'sm'} fontWeight={'500'}>
+            {t('user:bill.standard_valid_tip')}
+          </Box>
+        </HStack>
+      </VStack>

-        <ExtraPlan />
+      {/* extra plan */}
+      <VStack mt={['40px', '100px']} mb={8}>
+        <Box id={'extra-plan'} fontWeight={'bold'} fontSize={['24px', '36px']} color={'myGray.900'}>
+          {t('common:support.wallet.subscription.Extra plan')}
+        </Box>
+        <Box mt={2} mb={8} color={'myGray.600'} fontSize={'md'}>
+          {t('common:support.wallet.subscription.Extra plan tip')}
+        </Box>
+        <ExtraPlan onPaySuccess={onPaySuccess} />
+      </VStack>

-        {/* points */}
-        <PointsCard />
+      {/* points */}
+      <PointsCard />

-        {/* question */}
-        <FAQ />
-      </Flex>
-    </>
+      {/* question */}
+      <FAQ />
+    </Flex>
  );
 };