fix(web): appid confict if open 2 tabs (#1011)

* fix(web): appid confict if open 2 tabs * fix(web): function editor scroll bug
labring · Apr 7, 2023 · f6c39ee · f6c39ee
1 parent 40e8e0b
commit f6c39ee
Show file tree

Hide file tree

Showing 31 changed files with 105 additions and 92 deletions.
diff --git a/web/src/apis/v1/accounts.ts b/web/src/apis/v1/accounts.ts
@@ -8,6 +8,7 @@
 ///////////////////////////////////////////////////////////////////////
 /// <reference path = "api-auto.d.ts" />
 import request from "@/utils/request";
+import useGlobalStore from "@/pages/globalStore";
 
 /**
  * Get account info
@@ -17,7 +18,7 @@ export async function AccountControllerFindOne(
 ): Promise<Paths.AccountControllerFindOne.Responses> {
   // /v1/accounts
   let _params: { [key: string]: any } = {
-    appid: localStorage.getItem("app"),
+    appid: useGlobalStore.getState().currentApp?.appid || "",
     ...params,
   };
   return request(`/v1/accounts`, {
@@ -34,7 +35,7 @@ export async function AccountControllerGetChargeOrder(
 ): Promise<Paths.AccountControllerGetChargeOrder.Responses> {
   // /v1/accounts/charge-order/{id}
   let _params: { [key: string]: any } = {
-    appid: localStorage.getItem("app"),
+    appid: useGlobalStore.getState().currentApp?.appid || "",
     ...params,
   };
   return request(`/v1/accounts/charge-order/${_params.id}`, {
@@ -51,7 +52,7 @@ export async function AccountControllerCharge(
 ): Promise<Paths.AccountControllerCharge.Responses> {
   // /v1/accounts/charge-order
   let _params: { [key: string]: any } = {
-    appid: localStorage.getItem("app"),
+    appid: useGlobalStore.getState().currentApp?.appid || "",
     ...params,
   };
   return request(`/v1/accounts/charge-order`, {
@@ -68,7 +69,7 @@ export async function AccountControllerWechatNotify(
 ): Promise<Paths.AccountControllerWechatNotify.Responses> {
   // /v1/accounts/payment/wechat-notify
   let _params: { [key: string]: any } = {
-    appid: localStorage.getItem("app"),
+    appid: useGlobalStore.getState().currentApp?.appid || "",
     ...params,
   };
   return request(`/v1/accounts/payment/wechat-notify`, {

diff --git a/web/src/apis/v1/applications.ts b/web/src/apis/v1/applications.ts
@@ -8,6 +8,7 @@
 ///////////////////////////////////////////////////////////////////////
 /// <reference path = "api-auto.d.ts" />
 import request from "@/utils/request";
+import useGlobalStore from "@/pages/globalStore";
 
 /**
  * Get user application list
@@ -17,7 +18,7 @@ export async function ApplicationControllerFindAll(
 ): Promise<Paths.ApplicationControllerFindAll.Responses> {
   // /v1/applications
   let _params: { [key: string]: any } = {
-    appid: localStorage.getItem("app"),
+    appid: useGlobalStore.getState().currentApp?.appid || "",
     ...params,
   };
   return request(`/v1/applications`, {
@@ -34,7 +35,7 @@ export async function ApplicationControllerFindOne(
 ): Promise<Paths.ApplicationControllerFindOne.Responses> {
   // /v1/applications/{appid}
   let _params: { [key: string]: any } = {
-    appid: localStorage.getItem("app"),
+    appid: useGlobalStore.getState().currentApp?.appid || "",
     ...params,
   };
   return request(`/v1/applications/${_params.appid}`, {
@@ -51,7 +52,7 @@ export async function ApplicationControllerUpdate(
 ): Promise<Paths.ApplicationControllerUpdate.Responses> {
   // /v1/applications/{appid}
   let _params: { [key: string]: any } = {
-    appid: localStorage.getItem("app"),
+    appid: useGlobalStore.getState().currentApp?.appid || "",
     ...params,
   };
   return request(`/v1/applications/${_params.appid}`, {