sub plan page (#885)

* perf: insert mongo dataset data session * perf: dataset data index * remove delay * rename bill schema * rename bill record * perf: bill table * perf: prompt * perf: sub plan * change the usage count * feat: usage bill * publish usages * doc * 新增团队聊天功能 (#20) * perf: doc * feat 添加标签部分 feat 信息团队标签配置 feat 新增团队同步管理 feat team分享页面 feat 完成team分享页面 feat 实现模糊搜索 style 格式化 fix 修复迷糊匹配 style 样式修改 fix 团队标签功能修复 * fix 修复鉴权功能 * merge 合并代码 * fix 修复引用错误 * fix 修复pr问题 * fix 修复ts格式问题 --------- Co-authored-by: archer <545436317@qq.com> Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com> * update extra plan * fix: ts * format * perf: bill field * feat: standard plan * fix: ts * feat 个人账号页面修改 (#22) * feat 添加标签部分 feat 信息团队标签配置 feat 新增团队同步管理 feat team分享页面 feat 完成team分享页面 feat 实现模糊搜索 style 格式化 fix 修复迷糊匹配 style 样式修改 fix 团队标签功能修复 * fix 修复鉴权功能 * merge 合并代码 * fix 修复引用错误 * fix 修复pr问题 * fix 修复ts格式问题 * feat 修改个人账号页 --------- Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com> * fix chunk index; error page text * feat: dataset process Integral prediction * feat: stand plan field * feat: sub plan limit * perf: index * query extension * perf: share link push app name * perf: plan point unit * perf: get sub plan * perf: account page --------- Co-authored-by: yst <77910600+yu-and-liu@users.noreply.github.com> Co-authored-by: liuxingwan <liuxingwan.lxw@alibaba-inc.com>
2025-08-02 20:58:12 +00:00 · 2024-02-23 17:47:34 +08:00
parent 7a87f13aa8
commit 443ad37b6a
246 changed files with 6277 additions and 4272 deletions
--- a/projects/app/src/web/support/user/team/api.ts
+++ b/projects/app/src/web/support/user/team/api.ts
@@ -8,6 +8,7 @@ import {
  UpdateTeamMemberProps,
  UpdateTeamProps
 } from '@fastgpt/global/support/user/team/controller.d';
+import type { TeamTagsSchema } from '@fastgpt/global/support/user/team/type';
 import {
  TeamItemType,
  TeamMemberItemType,
@@ -23,6 +24,14 @@ export const putUpdateTeam = (data: UpdateTeamProps) =>
  PUT(`/proApi/support/user/team/update`, data);
 export const putSwitchTeam = (teamId: string) =>
  PUT<string>(`/proApi/support/user/team/switch`, { teamId });
+export const updateTags = (teamId: string, tagsUrl: string) =>
+  POST<TeamTagsSchema[]>(`/proApi/support/user/team/tags/asyncTags`, { teamId, tagsUrl });
+export const getTeamsTags = (teamId: string) =>
+  GET(`/proApi/support/user/team/tags/list`, { teamId });
+export const putUpdateTeamTags = (data: any) =>
+  PUT(`/proApi/support/user/team/tags/updateUrl`, data);
+export const insertTeamsTags = (tags: Array<any>) =>
+  POST(`/proApi/support/user/team/tags/create`, tags);

 /* --------------- team member ---------------- */
 export const getTeamMembers = (teamId: string) =>
--- a/projects/app/src/web/support/user/useUserStore.ts
+++ b/projects/app/src/web/support/user/useUserStore.ts
@@ -3,14 +3,17 @@ 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 { formatStorePrice2Read } from '@fastgpt/global/support/wallet/bill/tools';
 import { getTokenLogin, putUserInfo } from '@/web/support/user/api';
+import { FeTeamPlanStatusType } from '@fastgpt/global/support/wallet/sub/type';
+import { getTeamPlanStatus } from '@/web/support/wallet/sub/api';

 type State = {
  userInfo: UserType | null;
  initUserInfo: () => Promise<UserType>;
  setUserInfo: (user: UserType | null) => void;
  updateUserInfo: (user: UserUpdateParams) => Promise<void>;
+  teamPlanStatus: FeTeamPlanStatusType | null;
+  initTeamPlanStatus: () => Promise<any>;
 };

 export const useUserStore = create<State>()(
@@ -19,19 +22,22 @@ export const useUserStore = create<State>()(
      immer((set, get) => ({
        userInfo: null,
        async initUserInfo() {
+          get().initTeamPlanStatus();
+
          const res = await getTokenLogin();
          get().setUserInfo(res);

+          //设置html的fontsize
+          const html = document?.querySelector('html');
+          if (html) {
+            // html.style.fontSize = '16px';
+          }
+
          return res;
        },
        setUserInfo(user: UserType | null) {
          set((state) => {
-            state.userInfo = user
-              ? {
-                  ...user,
-                  balance: formatStorePrice2Read(user.balance)
-                }
-              : null;
+            state.userInfo = user ? user : null;
          });
        },
        async updateUserInfo(user: UserUpdateParams) {
@@ -51,6 +57,15 @@ export const useUserStore = create<State>()(
            });
            return Promise.reject(error);
          }
+        },
+        teamPlanStatus: null,
+        initTeamPlanStatus() {
+          return getTeamPlanStatus().then((res) => {
+            set((state) => {
+              state.teamPlanStatus = res;
+            });
+            return res;
+          });
        }
      })),
      {
--- a/projects/app/src/web/support/wallet/bill/api.ts
+++ b/projects/app/src/web/support/wallet/bill/api.ts
@@ -1,10 +1,22 @@
+import { RequestPaging } from '@/types';
 import { GET, POST } from '@/web/common/api/request';
-import { CreateTrainingBillProps } from '@fastgpt/global/support/wallet/bill/api.d';
-import type { PagingData, RequestPaging } from '@/types';
-import type { BillItemType } from '@fastgpt/global/support/wallet/bill/type';
+import { CreateBillProps, CreateBillResponse } from '@fastgpt/global/support/wallet/bill/api';
+import { BillTypeEnum } from '@fastgpt/global/support/wallet/bill/constants';
+import type { BillSchemaType } from '@fastgpt/global/support/wallet/bill/type.d';

-export const getUserBills = (data: RequestPaging) =>
-  POST<PagingData<BillItemType>>(`/proApi/support/wallet/bill/getBill`, data);
+export const getBills = (
+  data: RequestPaging & {
+    type?: `${BillTypeEnum}`;
+  }
+) => POST<BillSchemaType[]>(`/proApi/support/wallet/bill/list`, data);

-export const postCreateTrainingBill = (data: CreateTrainingBillProps) =>
-  POST<string>(`/support/wallet/bill/createTrainingBill`, data);
+export const getWxPayQRCode = (data: CreateBillProps) =>
+  POST<CreateBillResponse>(`/proApi/support/wallet/bill/create`, data);
+
+export const checkBalancePayResult = (payId: string) =>
+  GET<string>(`/proApi/support/wallet/bill/checkPayResult`, { payId }).then((data) => {
+    try {
+      GET('/common/system/unlockTask');
+    } catch (error) {}
+    return data;
+  });
--- a/projects/app/src/web/support/wallet/pay/api.ts
+++ b/projects/app/src/web/support/wallet/pay/api.ts
@@ -1,17 +0,0 @@
-import { GET } from '@/web/common/api/request';
-import type { PaySchema } from '@fastgpt/global/support/wallet/pay/type.d';
-export const getPayOrders = () => GET<PaySchema[]>(`/proApi/support/wallet/pay/getPayOrders`);
-
-export const getPayCode = (amount: number) =>
-  GET<{
-    codeUrl: string;
-    payId: string;
-  }>(`/proApi/support/wallet/pay/getPayCode`, { amount });
-
-export const checkPayResult = (payId: string) =>
-  GET<string>(`/proApi/support/wallet/pay/checkPayResult`, { payId }).then((data) => {
-    try {
-      GET('/common/system/unlockTask');
-    } catch (error) {}
-    return data;
-  });
--- a/projects/app/src/web/support/wallet/sub/api.ts
+++ b/projects/app/src/web/support/wallet/sub/api.ts
@@ -1,30 +1,20 @@
 import { GET, POST, PUT, DELETE } from '@/web/common/api/request';
 import {
  StandardSubPlanParams,
-  StandardSubPlanUpdateResponse,
-  SubDatasetSizeParams,
-  SubDatasetSizePreviewCheckResponse
+  StandardSubPlanUpdateResponse
 } from '@fastgpt/global/support/wallet/sub/api';
 import { SubStatusEnum, SubTypeEnum } from '@fastgpt/global/support/wallet/sub/constants';
-import { FeTeamSubType } from '@fastgpt/global/support/wallet/sub/type';
+import { FeTeamPlanStatusType } from '@fastgpt/global/support/wallet/sub/type';

 export const putTeamDatasetSubStatus = (data: {
  status: `${SubStatusEnum}`;
  type: `${SubTypeEnum}`;
 }) => POST('/proApi/support/wallet/sub/updateStatus', data);

-export const getTeamDatasetValidSub = () =>
-  GET<FeTeamSubType>(`/support/wallet/sub/getTeamSubStatus`);
+export const getTeamPlanStatus = () =>
+  GET<FeTeamPlanStatusType>(`/support/wallet/sub/getTeamSubStatus`);

 export const postCheckStandardSub = (data: StandardSubPlanParams) =>
  POST<StandardSubPlanUpdateResponse>('/proApi/support/wallet/sub/standard/preCheck', data);
 export const postUpdateStandardSub = (data: StandardSubPlanParams) =>
  POST<StandardSubPlanUpdateResponse>('/proApi/support/wallet/sub/standard/update', data);
-
-export const posCheckTeamDatasetSizeSub = (data: SubDatasetSizeParams) =>
-  POST<SubDatasetSizePreviewCheckResponse>(
-    '/proApi/support/wallet/sub/extraDatasetSize/preCheck',
-    data
-  );
-export const postUpdateTeamDatasetSizeSub = (data: SubDatasetSizeParams) =>
-  POST('/proApi/support/wallet/sub/extraDatasetSize/update', data);
--- a/projects/app/src/web/support/wallet/sub/constants.ts
+++ b/projects/app/src/web/support/wallet/sub/constants.ts
@@ -0,0 +1,2 @@
+export const AI_POINT_USAGE_CARD_ROUTE = '/price#point-card';
+export const EXTRA_PLAN_CARD_ROUTE = '/price#extra-plan';
--- a/projects/app/src/web/support/wallet/usage/api.ts
+++ b/projects/app/src/web/support/wallet/usage/api.ts
@@ -0,0 +1,10 @@
+import { GET, POST } from '@/web/common/api/request';
+import { CreateTrainingUsageProps } from '@fastgpt/global/support/wallet/usage/api.d';
+import type { PagingData, RequestPaging } from '@/types';
+import type { UsageItemType } from '@fastgpt/global/support/wallet/usage/type';
+
+export const getUserUsages = (data: RequestPaging) =>
+  POST<PagingData<UsageItemType>>(`/proApi/support/wallet/usage/getUsage`, data);
+
+export const postCreateTrainingUsage = (data: CreateTrainingUsageProps) =>
+  POST<string>(`/support/wallet/usage/createTrainingUsage`, data);