@skyfox2000/webui 1.4.3 → 1.4.4

package/src/stores/appInfo.ts

@@ -6,7 +6,6 @@ import {
    AppSource,
    isBaseMicroApp,
    isMicroApp,
-   mainAppApis,
    RouteRecord,
    EnvConfig,
 } from '@skyfox2000/microbase';
@@ -18,6 +17,7 @@ import { Component, h, nextTick } from 'vue';
 import { LoginExpiredError, useUserInfo } from './userInfo';
 import { ApiResponse, httpPost, IUrlInfo, ResStatus } from '@skyfox2000/fapi';
 import message from 'vue-m-message';
+import { MicroOpenApis } from '@/utils/micro-openapis';
 
 // const APPINFO_STORE_KEY = 'appInfoStore';
 
@@ -353,9 +353,9 @@ export const useAppInfo = defineStore('appInfo', {
             this.appInfo.defaultPage = findFirstPage(filteredRoutes) || '';
             if (this.appInfo.defaultPage) {
                this.menuLoaded = true;
-               if (mainAppApis.value && mainAppApis.value.mainAppPush) {
+               if (isMicroApp()) {
                   const fullPath = this.formatRoute(this.appInfo.defaultPage);
-                  mainAppApis.value.mainAppPush(fullPath);
+                  MicroOpenApis.mainAppPush(fullPath);
                }
                continueNavigation(this.appInfo.defaultPage);
             }
@@ -393,9 +393,9 @@ export const useAppInfo = defineStore('appInfo', {
          nextTick(() => {
             // 直接使用当前应用路由AppRouter
             AppRouter.push({ path });
-            if (mainAppApis.value && mainAppApis.value.mainAppPush) {
+            if (isMicroApp()) {
                const fullPath = this.formatRoute(path);
-               mainAppApis.value.mainAppPush(fullPath);
+               MicroOpenApis.mainAppPush(fullPath);
             }
          });
       },

package/src/stores/hostInfo.ts

@@ -1,6 +1,7 @@
+import { MicroOpenApis } from '@/utils/micro-openapis';
 import { API_HOST, ApiResponse, httpPost, IUrlInfo, ResStatus, SERVER_HOST } from '@skyfox2000/fapi';
 
-import { HostInfo, MainOpenApis } from '@skyfox2000/microbase';
+import { HostInfo, isMicroApp } from '@skyfox2000/microbase';
 
 import { defineStore } from 'pinia';
 
@@ -57,11 +58,11 @@ export const useHostInfo = defineStore('hostInfo', {
        * 加载站点信息
        * @param hostApi 启动配置主机地址
        * @param hostKey 站点信息，默认为当前主域名
-       * @param mainOpenApis 宿主机开放接口
        */
-      async loadHostInfo(hostApi: string, hostKey?: string, mainOpenApis?: MainOpenApis): Promise<void> {
-         if (mainOpenApis) {
-            this._setHostInfo(mainOpenApis.getHostInfo());
+      async loadHostInfo(hostApi: string, hostKey?: string): Promise<void> {
+         if (isMicroApp()) {
+            const hostInfo = await MicroOpenApis.getHostInfo();
+            this._setHostInfo(hostInfo);
             return;
          }
 

package/src/utils/file-upload.ts

@@ -1,10 +1,12 @@
 import { hostUrl, IUrlInfo } from '@skyfox2000/fapi';
 
-import { getToken } from '@/utils/main-openapis';
 import { UploadFile, UploadStatus } from '@/typings/upload.d';
 import dayjs from 'dayjs';
 import message from 'vue-m-message';
 import { Ref } from 'vue';
+import { MicroOpenApis } from './micro-openapis';
+import { isMicroApp } from '@skyfox2000/microbase';
+import { useUserInfo } from '@/stores/userInfo';
 
 export class path {
    /**
@@ -233,7 +235,7 @@ export class AsyncUploader {
 
          // 添加授权 Token（如果需要）
          if (this.urlInfo.authorize) {
-            const token = getToken(); // 假设 getToken 是获取 Token 的方法
+            const token = isMicroApp() ? MicroOpenApis.getToken() : useUserInfo().getToken(); // 假设 getToken 是获取 Token 的方法
             if (!token) {
                reject(new Error('未授权或授权过期'));
                return;
@@ -360,4 +362,3 @@ export class AsyncUploader {
 //       console.error('上传错误：', error);
 //    }
 // })();
-

package/src/utils/micro-openapis.ts

@@ -3,6 +3,8 @@
  * 提供与主应用的通信接口，基于micro-app框架
  */
 
+import { AppInfo, HostInfo, UserInfo } from '@skyfox2000/microbase';
+
 // 定义请求数据格式
 interface ApiRequestData {
    type: 'API_REQUEST';
@@ -112,43 +114,43 @@ class MicroAppSDK {
    /**
     * 获取应用信息
     */
-   static async getAppInfo(): Promise<any> {
+   static async getAppInfo(): Promise<AppInfo> {
       return this.callMainAppMethod('getAppInfo');
    }
 
    /**
     * 获取主机信息
     */
-   static async getHostInfo(): Promise<any> {
+   static async getHostInfo(): Promise<HostInfo> {
       return this.callMainAppMethod('getHostInfo');
    }
 
    /**
     * 获取用户信息
     */
-   static async getUserInfo(): Promise<any> {
+   static async getUserInfo(): Promise<UserInfo> {
       return this.callMainAppMethod('getUserInfo');
    }
 
    /**
     * 获取授权令牌
     */
-   static async getToken(): Promise<any> {
+   static async getToken(): Promise<string> {
       return this.callMainAppMethod('getToken');
    }
 
    /**
     * 用户登出
     */
-   static async userLogout(): Promise<any> {
+   static async userLogout(): Promise<void> {
       return this.callMainAppMethod('userLogout');
    }
 
    /**
     * 主应用推送
     */
-   static async mainAppPush(params: any): Promise<any> {
-      return this.callMainAppMethod('mainAppPush', params);
+   static async mainAppPush(path: string): Promise<void> {
+      return this.callMainAppMethod('mainAppPush', path);
    }
 }