V4.6.6-2 (#673)

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

@@ -68,6 +68,7 @@ export function usePagination<T = any>({
           <Input
             defaultValue={pageNum}
             w={'50px'}
+            h={'30px'}
             size={'xs'}
             type={'number'}
             min={1}

projects/app/src/web/common/system/staticData.ts

@@ -9,20 +9,22 @@ import type {
   LLMModelItemType,
   ReRankModelItemType,
   VectorModelItemType,
-  AudioSpeechModelType
+  AudioSpeechModelType,
+  WhisperModelType
 } from '@fastgpt/global/core/ai/model.d';
 
 export let feConfigs: FastGPTFeConfigsType = {};
-export let priceMd = '';
 export let systemVersion = '0.0.0';
 
 export let chatModelList: ChatModelItemType[] = [];
 export let vectorModelList: VectorModelItemType[] = [];
 export let qaModelList: LLMModelItemType[] = [];
 export let cqModelList: FunctionModelItemType[] = [];
+export let qgModelList: LLMModelItemType[] = [];
 export let extractModelList: FunctionModelItemType[] = [];
-export let audioSpeechModels: AudioSpeechModelType[] = [];
+export let audioSpeechModelList: AudioSpeechModelType[] = [];
 export let reRankModelList: ReRankModelItemType[] = [];
+export let whisperModel: WhisperModelType;
 
 export let simpleModeTemplates: AppSimpleEditConfigTemplateType[] = [];
 
@@ -39,11 +41,13 @@ export const clientInitData = async (): Promise<InitDateResponse> => {
     qaModelList = res.qaModels ?? qaModelList;
     cqModelList = res.cqModels ?? cqModelList;
     extractModelList = res.extractModels ?? extractModelList;
+    qgModelList = res.qgModes ?? qgModelList;
 
-    audioSpeechModels = res.audioSpeechModels ?? audioSpeechModels;
+    audioSpeechModelList = res.audioSpeechModels ?? audioSpeechModelList;
     reRankModelList = res.reRankModels ?? reRankModelList;
 
-    priceMd = res.priceMd;
+    whisperModel = res.whisperModel;
+
     systemVersion = res.systemVersion;
     simpleModeTemplates = res.simpleModeTemplates;
 

projects/app/src/web/core/dataset/api.ts

@@ -11,7 +11,12 @@ import type {
   DatasetUpdateBody,
   PostWebsiteSyncParams
 } from '@fastgpt/global/core/dataset/api.d';
-import type { SearchTestProps, SearchTestResponse } from '@/global/core/dataset/api.d';
+import type {
+  GetTrainingQueueProps,
+  GetTrainingQueueResponse,
+  SearchTestProps,
+  SearchTestResponse
+} from '@/global/core/dataset/api.d';
 import type {
   PushDatasetDataProps,
   UpdateDatasetDataProps,
@@ -107,7 +112,8 @@ export const delOneDatasetDataById = (dataId: string) =>
 
 /* ================ training ==================== */
 /* get length of system training queue */
-export const getTrainingQueueLen = () => GET<number>(`/core/dataset/training/getQueueLen`);
+export const getTrainingQueueLen = (data: GetTrainingQueueProps) =>
+  GET<GetTrainingQueueResponse>(`/core/dataset/training/getQueueLen`, data);
 
 /* ================== file ======================== */
 export const getFileViewUrl = (fileId: string) =>

projects/app/src/web/core/dataset/store/searchTest.ts

@@ -2,6 +2,7 @@ import { create } from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
 import type { SearchDataResponseItemType } from '@fastgpt/global/core/dataset/type';
+import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constant';
 
 export type SearchTestStoreItemType = {
   id: string;
@@ -10,6 +11,7 @@ export type SearchTestStoreItemType = {
   time: Date;
   duration: string;
   results: SearchDataResponseItemType[];
+  searchMode: `${DatasetSearchModeEnum}`;
 };
 
 type State = {

projects/app/src/web/styles/theme.ts

@@ -340,6 +340,10 @@ export const theme = extendTheme({
       1000: '#313132'
     },
     myGray: {
+      '05': 'rgba(17, 24, 36, 0.05)',
+      1: 'rgba(17, 24, 36, 0.1)',
+      15: 'rgba(17, 24, 36, 0.15)',
+
       25: '#FBFBFC',
       50: '#F7F8FA',
       100: '#F4F4F7',

projects/app/src/web/support/user/useUserStore.ts

@@ -3,7 +3,7 @@ import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
 import type { UserUpdateParams } from '@/types/user';
 import type { UserType } from '@fastgpt/global/support/user/type.d';
-import { formatPrice } from '@fastgpt/global/support/wallet/bill/tools';
+import { formatStorePrice2Read } from '@fastgpt/global/support/wallet/bill/tools';
 import { getTokenLogin, putUserInfo } from '@/web/support/user/api';
 
 type State = {
@@ -29,7 +29,7 @@ export const useUserStore = create<State>()(
             state.userInfo = user
               ? {
                   ...user,
-                  balance: formatPrice(user.balance)
+                  balance: formatStorePrice2Read(user.balance)
                 }
               : null;
           });