v4.5.1 (#417)

projects/app/src/pages/account/components/BillDetail.tsx

@@ -14,7 +14,7 @@ import {
 import { UserBillType } from '@/types/user';
 import dayjs from 'dayjs';
 import { BillSourceMap } from '@/constants/user';
-import { formatPrice } from '@fastgpt/common/bill/index';
+import { formatPrice } from '@fastgpt/global/common/bill/tools';
 import MyModal from '@/components/MyModal';
 import { useTranslation } from 'react-i18next';
 

projects/app/src/pages/account/components/BillTable.tsx

@@ -12,7 +12,7 @@ import {
   Button
 } from '@chakra-ui/react';
 import { BillSourceMap } from '@/constants/user';
-import { getUserBills } from '@/web/common/api/bill';
+import { getUserBills } from '@/web/common/bill/api';
 import type { UserBillType } from '@/types/user';
 import { usePagination } from '@/web/common/hooks/usePagination';
 import { useLoading } from '@/web/common/hooks/useLoading';
@@ -21,7 +21,7 @@ import MyIcon from '@/components/Icon';
 import DateRangePicker, { type DateRangeType } from '@/components/DateRangePicker';
 import { addDays } from 'date-fns';
 import dynamic from 'next/dynamic';
-import { useGlobalStore } from '@/web/common/store/global';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { useTranslation } from 'next-i18next';
 const BillDetail = dynamic(() => import('./BillDetail'));
 
@@ -32,7 +32,7 @@ const BillTable = () => {
     from: addDays(new Date(), -7),
     to: new Date()
   });
-  const { isPc } = useGlobalStore();
+  const { isPc } = useSystemStore();
 
   const {
     data: bills,

projects/app/src/pages/account/components/Info.tsx

@@ -15,15 +15,15 @@ import {
 import { useForm } from 'react-hook-form';
 import { UserUpdateParams } from '@/types/user';
 import { useToast } from '@/web/common/hooks/useToast';
-import { useUserStore } from '@/web/support/store/user';
+import { useUserStore } from '@/web/support/user/useUserStore';
 import { UserType } from '@/types/user';
 import { useQuery } from '@tanstack/react-query';
 import dynamic from 'next/dynamic';
-import { useSelectFile } from '@/web/common/hooks/useSelectFile';
-import { compressImg } from '@/web/common/utils/file';
-import { feConfigs, systemVersion } from '@/web/common/store/static';
+import { useSelectFile } from '@/web/common/file/hooks/useSelectFile';
+import { compressImg } from '@/web/common/file/utils';
+import { feConfigs, systemVersion } from '@/web/common/system/staticData';
 import { useTranslation } from 'next-i18next';
-import { timezoneList } from '@/utils/user';
+import { timezoneList } from '@fastgpt/global/common/time/timezone';
 import Loading from '@/components/Loading';
 import Avatar from '@/components/Avatar';
 import MyIcon from '@/components/Icon';

projects/app/src/pages/account/components/InformTable.tsx

@@ -1,17 +1,17 @@
 import React from 'react';
 import { Box, Flex, useTheme } from '@chakra-ui/react';
-import { getInforms, readInform } from '@/web/support/api/user';
+import { getInforms, readInform } from '@/web/support/user/api';
 import { usePagination } from '@/web/common/hooks/usePagination';
 import { useLoading } from '@/web/common/hooks/useLoading';
 import type { informSchema } from '@/types/mongoSchema';
 import { formatTimeToChatTime } from '@/utils/tools';
-import { useGlobalStore } from '@/web/common/store/global';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
 import MyIcon from '@/components/Icon';
 
 const BillTable = () => {
   const theme = useTheme();
   const { Loading } = useLoading();
-  const { isPc } = useGlobalStore();
+  const { isPc } = useSystemStore();
   const {
     data: informs,
     isLoading,

projects/app/src/pages/account/components/PayModal.tsx

@@ -1,14 +1,14 @@
 import React, { useState, useCallback } from 'react';
 import { ModalFooter, ModalBody, Button, Input, Box, Grid } from '@chakra-ui/react';
-import { getPayCode, checkPayResult } from '@/web/common/api/bill';
+import { getPayCode, checkPayResult } from '@/web/common/bill/api';
 import { useToast } from '@/web/common/hooks/useToast';
 import { useQuery } from '@tanstack/react-query';
 import { useRouter } from 'next/router';
-import { getErrText } from '@/utils/tools';
+import { getErrText } from '@fastgpt/global/common/error/utils';
 import { useTranslation } from 'react-i18next';
 import Markdown from '@/components/Markdown';
 import MyModal from '@/components/MyModal';
-import { priceMd } from '@/web/common/store/static';
+import { priceMd } from '@/web/common/system/staticData';
 
 const PayModal = ({ onClose }: { onClose: () => void }) => {
   const router = useRouter();
@@ -69,12 +69,7 @@ const PayModal = ({ onClose }: { onClose: () => void }) => {
       title={t('user.Pay')}
       isCentered={!payId}
     >
-      <ModalBody
-        p={0}
-        h={payId ? 'auto' : ['auto', '70vh']}
-        display={'flex'}
-        flexDirection={'column'}
-      >
+      <ModalBody p={0} minH={payId ? 'auto' : '70vh'} display={'flex'} flexDirection={'column'}>
         {!payId && (
           <>
             <Grid gridTemplateColumns={'repeat(4,1fr)'} gridGap={5} mb={4} px={6}>

projects/app/src/pages/account/components/PayRecordTable.tsx

@@ -11,11 +11,11 @@ import {
   Flex,
   Box
 } from '@chakra-ui/react';
-import { getPayOrders, checkPayResult } from '@/web/common/api/bill';
+import { getPayOrders, checkPayResult } from '@/web/common/bill/api';
 import { PaySchema } from '@/types/mongoSchema';
 import dayjs from 'dayjs';
 import { useQuery } from '@tanstack/react-query';
-import { formatPrice } from '@fastgpt/common/bill/index';
+import { formatPrice } from '@fastgpt/global/common/bill/tools';
 import { useToast } from '@/web/common/hooks/useToast';
 import { useLoading } from '@/web/common/hooks/useLoading';
 import MyIcon from '@/components/Icon';
@@ -58,7 +58,7 @@ const PayRecordTable = () => {
   );
 
   return (
-    <Box position={'relative'} h={'100%'}>
+    <Box position={'relative'} h={'100%'} overflow={'overlay'}>
       {!isInitialLoading && payOrders.length === 0 ? (
         <Flex h={'100%'} flexDirection={'column'} alignItems={'center'} justifyContent={'center'}>
           <MyIcon name="empty" w={'48px'} h={'48px'} color={'transparent'} />
@@ -67,7 +67,7 @@ const PayRecordTable = () => {
           </Box>
         </Flex>
       ) : (
-        <TableContainer py={[0, 5]} px={[3, 8]} h={'100%'} overflow={'overlay'}>
+        <TableContainer py={[0, 5]} px={[3, 8]}>
           <Table>
             <Thead>
               <Tr>

projects/app/src/pages/account/components/Promotion.tsx

@@ -16,8 +16,8 @@ import {
 } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';
 import { useQuery } from '@tanstack/react-query';
-import { getPromotionInitData, getPromotionRecords } from '@/web/support/api/user';
-import { useUserStore } from '@/web/support/store/user';
+import { getPromotionInitData, getPromotionRecords } from '@/web/support/user/api';
+import { useUserStore } from '@/web/support/user/useUserStore';
 import { useLoading } from '@/web/common/hooks/useLoading';
 
 import MyTooltip from '@/components/MyTooltip';

projects/app/src/pages/account/components/UpdatePswModal.tsx

@@ -4,7 +4,7 @@ import MyModal from '@/components/MyModal';
 import { useTranslation } from 'react-i18next';
 import { useForm } from 'react-hook-form';
 import { useRequest } from '@/web/common/hooks/useRequest';
-import { updatePasswordByOld } from '@/web/support/api/user';
+import { updatePasswordByOld } from '@/web/support/user/api';
 
 type FormType = {
   oldPsw: string;

projects/app/src/pages/account/index.tsx

@@ -1,17 +1,17 @@
 import React, { useCallback, useRef } from 'react';
 import { Box, Flex, useTheme } from '@chakra-ui/react';
-import { useGlobalStore } from '@/web/common/store/global';
+import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { useRouter } from 'next/router';
 import dynamic from 'next/dynamic';
-import { clearToken } from '@/utils/user';
-import { useUserStore } from '@/web/support/store/user';
+import { clearToken } from '@/web/support/user/auth';
+import { useUserStore } from '@/web/support/user/useUserStore';
 import { useConfirm } from '@/web/common/hooks/useConfirm';
 import PageContainer from '@/components/PageContainer';
 import SideTabs from '@/components/SideTabs';
 import Tabs from '@/components/Tabs';
 import UserInfo from './components/Info';
 import { serviceSideProps } from '@/web/common/utils/i18n';
-import { feConfigs } from '@/web/common/store/static';
+import { feConfigs } from '@/web/common/system/staticData';
 import { useTranslation } from 'react-i18next';
 import Script from 'next/script';
 
@@ -86,7 +86,7 @@ const Account = ({ currentTab }: { currentTab: `${TabEnum}` }) => {
 
   const router = useRouter();
   const theme = useTheme();
-  const { isPc } = useGlobalStore();
+  const { isPc } = useSystemStore();
   const { setUserInfo } = useUserStore();
 
   const setCurrentTab = useCallback(