@skyfox2000/webui 1.4.3 → 1.4.5

package/lib/es/AceEditor/index.js

@@ -1,13 +1,13 @@
 import { defineComponent as F, defineAsyncComponent as M, ref as m, watch as V, onMounted as J, createElementBlock as x, openBlock as p, Fragment as K, createElementVNode as v, createVNode as _, toDisplayString as W, unref as i, createBlock as P, withKeys as f, normalizeClass as N, withModifiers as w, withCtx as z, createCommentVNode as L } from "vue";
 import "ant-design-vue";
-import { _ as q } from "../../assets/modules/toolIcon-BddslNsJ.js";
+import { _ as q } from "../../assets/modules/toolIcon-BiWBb2pJ.js";
 import "@skyfox2000/fapi";
-import "../../assets/modules/uploadList-ZGWKyite.js";
+import "../../assets/modules/uploadList-C_hqJ4X1.js";
 import "@skyfox2000/microbase";
 import "vue-m-message";
 import "async-validator";
 import "dayjs";
-import { _ as D } from "../../assets/modules/index-C_7galsG.js";
+import { _ as D } from "../../assets/modules/index-BURe9YrF.js";
 import "vue-draggable-next";
 const h = async (s) => window.ace ? window.ace : new Promise((l, t) => {
   const o = document.createElement("script");

package/lib/es/BasicLayout/index.js

@@ -1,6 +1,6 @@
 import { defineComponent as f, ref as d, watch as _, onMounted as v, resolveComponent as h, createBlock as o, openBlock as t, withCtx as s, createElementVNode as C, normalizeClass as x, createVNode as w, KeepAlive as y, unref as n, resolveDynamicComponent as I } from "vue";
-import { _ as g } from "../../assets/modules/baseLayout-C92mDmCL.js";
-import { af as A, a as S } from "../../assets/modules/uploadList-ZGWKyite.js";
+import { _ as g } from "../../assets/modules/baseLayout-BT7tGUB1.js";
+import { af as A, a as S } from "../../assets/modules/uploadList-C_hqJ4X1.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import b from "vue-m-message";

package/lib/es/Error403/index.js

@@ -1,5 +1,5 @@
 import { defineComponent as i, createBlock as p, openBlock as m, unref as r, withCtx as e, createVNode as n, createTextVNode as a } from "vue";
-import { r as s } from "../../assets/modules/uploadList-ZGWKyite.js";
+import { r as s } from "../../assets/modules/uploadList-C_hqJ4X1.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import "vue-m-message";

package/lib/es/Error404/index.js

@@ -1,5 +1,5 @@
 import { defineComponent as i, createBlock as p, openBlock as m, unref as r, withCtx as e, createVNode as n, createTextVNode as a } from "vue";
-import { r as s } from "../../assets/modules/uploadList-ZGWKyite.js";
+import { r as s } from "../../assets/modules/uploadList-C_hqJ4X1.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import "vue-m-message";

package/lib/es/ExcelForm/index.js

@@ -1,12 +1,12 @@
 import { defineComponent as we, ref as f, computed as T, watch as W, onMounted as be, createBlock as H, openBlock as d, unref as n, withCtx as S, renderSlot as J, createElementBlock as g, createCommentVNode as K, createElementVNode as h, createVNode as C, createTextVNode as X, toDisplayString as E, normalizeClass as Ce, Fragment as ie, renderList as ne } from "vue";
-import { _ as Y } from "../../assets/modules/index-BrDxf94o.js";
+import { _ as Y } from "../../assets/modules/index-iozooZXX.js";
 import { Modal as Fe, Upload as ue, Space as _e } from "ant-design-vue";
 import { httpGet as Ue, ResStatus as fe } from "@skyfox2000/fapi";
-import { E as Te, a2 as Se, a8 as Ee } from "../../assets/modules/uploadList-ZGWKyite.js";
-import { A as Re, p as De, U as ce } from "../../assets/modules/file-upload-DGCoBLP3.js";
+import { E as Te, a2 as Se, a8 as Ee } from "../../assets/modules/uploadList-C_hqJ4X1.js";
+import { A as Re, p as De, U as ce } from "../../assets/modules/file-upload-DicHRX1r.js";
 import "@skyfox2000/microbase";
 import p from "vue-m-message";
-import { c as ke, _ as Z, h as Le, p as Ne, i as Ke } from "../../assets/modules/index-ChjM1bSE.js";
+import { c as ke, _ as Z, h as Le, p as Ne, i as Ke } from "../../assets/modules/index-BjXLzCF2.js";
 import "dayjs";
 import "vue-draggable-next";
 import "async-validator";
@@ -306,7 +306,7 @@ const Be = (l) => l.includes(",") || l.includes(`
         return p.error(v), ue.LIST_IGNORE;
       try {
         if (A(), y.value = t.name, q.value = u ? "text/csv" : "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", u) {
-          const w = await t.arrayBuffer(), O = new TextDecoder("utf-8").decode(w), { csvToExcelView: G } = await import("../../assets/modules/index-ChjM1bSE.js").then((he) => he.j), M = await G(O, t.name);
+          const w = await t.arrayBuffer(), O = new TextDecoder("utf-8").decode(w), { csvToExcelView: G } = await import("../../assets/modules/index-BjXLzCF2.js").then((he) => he.j), M = await G(O, t.name);
           if (!M.success)
             throw new Error(M.error || "CSV文件处理失败");
           const oe = await (await fetch(M.blobUrl)).arrayBuffer();

package/lib/es/MenuLayout/index.js

@@ -1,6 +1,6 @@
 import { defineComponent as f, ref as d, watch as _, onMounted as v, resolveComponent as h, createBlock as o, openBlock as t, withCtx as s, createElementVNode as C, normalizeClass as x, createVNode as w, KeepAlive as I, unref as n, resolveDynamicComponent as g } from "vue";
-import { _ as y } from "../../assets/modules/baseLayout-C92mDmCL.js";
-import { af as A, a as S } from "../../assets/modules/uploadList-ZGWKyite.js";
+import { _ as y } from "../../assets/modules/baseLayout-BT7tGUB1.js";
+import { af as A, a as S } from "../../assets/modules/uploadList-C_hqJ4X1.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import k from "vue-m-message";

package/lib/es/UploadForm/index.js

@@ -1,15 +1,15 @@
 import { defineComponent as y, ref as f, watch as S, onMounted as z, createBlock as D, openBlock as F, unref as u, withCtx as s, createVNode as m, createTextVNode as C } from "vue";
-import { _ as c } from "../../assets/modules/index-BrDxf94o.js";
+import { _ as c } from "../../assets/modules/index-iozooZXX.js";
 import { Modal as _, Space as k } from "ant-design-vue";
 import { ResStatus as E } from "@skyfox2000/fapi";
-import { a4 as h } from "../../assets/modules/uploadList-ZGWKyite.js";
+import { a4 as h } from "../../assets/modules/uploadList-C_hqJ4X1.js";
 import "@skyfox2000/microbase";
 import L from "vue-m-message";
 import "async-validator";
 import "dayjs";
-import { A as N } from "../../assets/modules/file-upload-DGCoBLP3.js";
+import { A as N } from "../../assets/modules/file-upload-DicHRX1r.js";
 import "vue-draggable-next";
-import { U as B } from "../../assets/modules/uploadList-3sClH7Na.js";
+import { U as B } from "../../assets/modules/uploadList-61wZlPUk.js";
 const K = /* @__PURE__ */ y({
   __name: "uploadForm",
   props: {

package/lib/stores/hostInfo.d.ts

@@ -1,10 +1,10 @@
-import { HostInfo, MainOpenApis } from '../../../502424_MicroBase';
+import { HostInfo } from '../../../502424_MicroBase';
 import { StoreDefinition } from 'pinia';
 export declare const useHostInfo: StoreDefinition<"hostInfo", {
     hostInfo: HostInfo;
 }, {}, {
     getSiteHostApi(): string;
-    loadHostInfo(hostApi: string, hostKey?: string, mainOpenApis?: MainOpenApis): Promise<void>;
+    loadHostInfo(hostApi: string, hostKey?: string): Promise<void>;
     clear(): void;
     _setHostInfo(hostInfo: HostInfo | null): void;
     getHostInfo(): HostInfo;

package/lib/utils/micro-openapis.d.ts

@@ -1,3 +1,4 @@
+import { AppInfo, HostInfo, UserInfo } from '../../../502424_MicroBase';
 declare class MicroAppSDK {
     private static messageId;
     private static callbacks;
@@ -5,12 +6,12 @@ declare class MicroAppSDK {
     private static callMainAppMethod;
     static handleResponseData(data: any): void;
     static init(): void;
-    static getAppInfo(): Promise<any>;
-    static getHostInfo(): Promise<any>;
-    static getUserInfo(): Promise<any>;
-    static getToken(): Promise<any>;
-    static userLogout(): Promise<any>;
-    static mainAppPush(params: any): Promise<any>;
+    static getAppInfo(): Promise<AppInfo>;
+    static getHostInfo(): Promise<HostInfo>;
+    static getUserInfo(): Promise<UserInfo>;
+    static getToken(): Promise<string>;
+    static userLogout(): Promise<void>;
+    static mainAppPush(path: string): Promise<void>;
 }
 export declare const MicroOpenApis: {
     getAppInfo: typeof MicroAppSDK.getAppInfo;

package/lib/webui.es.js

@@ -1,6 +1,6 @@
-import { u as Ee, i as Z, a as me, L as Xe, c as Ze, P as j, o as Pe, b as ea, d as aa, e as Fe, r as ce, f as ta, g as la, h as Ne, j as sa, k as ke, l as ra, _ as oa, m as na, O as Me, q as Be, n as ia, p as ca, s as L, t as ua, v as da, w as pa, x as fa, y as va, z as ma, A as Y, B as ha, C as ga, D as ba, E as Re } from "./assets/modules/uploadList-ZGWKyite.js";
-import { aa as $l, Q as Il, ac as Dl, R as El, V as Pl, a9 as Fl, a7 as Nl, a8 as Ml, ab as Bl, Y as Rl, T as Ol, a5 as Al, a2 as Ll, M as zl, a4 as Ul, U as Vl, G as Yl, $ as Kl, a3 as Wl, a6 as Hl, N as jl, S as Ql, ad as ql, F as Gl, a1 as Jl, ae as Xl, X as Zl, Z as es, W as as, af as ts, H as ls, I as ss, ag as rs, K as os, ah as ns, J as is, a0 as cs } from "./assets/modules/uploadList-ZGWKyite.js";
-import { A as ds, U as ps, p as fs } from "./assets/modules/file-upload-DGCoBLP3.js";
+import { u as Ee, i as Z, a as me, L as Xe, c as Ze, P as j, o as Pe, b as ea, d as aa, e as Fe, r as ce, f as ta, g as la, h as Ne, j as sa, k as ke, l as ra, _ as oa, m as na, O as Me, q as Be, n as ia, p as ca, s as L, t as ua, v as da, w as pa, x as fa, y as va, z as ma, A as Y, B as ha, C as ga, D as ba, E as Re } from "./assets/modules/uploadList-C_hqJ4X1.js";
+import { aa as $l, Q as Il, ac as Dl, R as El, V as Pl, a9 as Fl, a7 as Nl, a8 as Ml, ab as Bl, Y as Rl, T as Ol, a5 as Al, a2 as Ll, M as zl, a4 as Ul, U as Vl, G as Yl, $ as Kl, a3 as Wl, a6 as Hl, N as jl, S as Ql, ad as ql, F as Gl, a1 as Jl, ae as Xl, X as Zl, Z as es, W as as, af as ts, H as ls, I as ss, ag as rs, K as os, ah as ns, J as is, a0 as cs } from "./assets/modules/uploadList-C_hqJ4X1.js";
+import { A as ds, U as ps, p as fs } from "./assets/modules/file-upload-DicHRX1r.js";
 import { EnvConfig as we } from "@skyfox2000/microbase";
 import { FrontCache as re, httpPost as Oe, ResStatus as Ae, SERVER_HOST as _a, fieldMapping as oe } from "@skyfox2000/fapi";
 import he from "vue-m-message";
@@ -9,15 +9,15 @@ import "async-validator";
 import fe from "dayjs";
 import { Popover as Ca, theme as ze, Drawer as Ta, Space as te, Form as Ue, message as $a, FormItem as Ve, ConfigProvider as Ce, Popconfirm as Ia, Button as Ye, DropdownButton as Da, Menu as _e, MenuItem as xe, Dropdown as ve, Checkbox as Ea, Table as Ke, Tree as Pa, Cascader as Fa, DatePicker as Na, Input as ee, InputPassword as Ma, InputNumber as Ba, RangePicker as Ra, Textarea as Oa, TimePicker as Aa, Transfer as La, TreeSelect as za, LayoutContent as Ua } from "ant-design-vue";
 import { VueDraggableNext as Va } from "vue-draggable-next";
-import { d as We } from "./assets/modules/uploadList-3sClH7Na.js";
-import { C as ms, U as hs, a as gs, p as bs } from "./assets/modules/uploadList-3sClH7Na.js";
-import { c as He } from "./assets/modules/index-ChjM1bSE.js";
-import { _ as xs, h as ys, b as ks, a as ws, d as Ss, e as Cs, g as Ts, f as $s, n as Is, p as Ds, t as Es, v as Ps } from "./assets/modules/index-ChjM1bSE.js";
-import { _ as A } from "./assets/modules/index-BrDxf94o.js";
-import { _ as U } from "./assets/modules/toolIcon-BddslNsJ.js";
-import { a as Ns } from "./assets/modules/toolIcon-BddslNsJ.js";
-import { _ as Bs, b as Rs, c as Os, d as As, e as Ls, I as zs, f as Us, g as Vs, a as Ys } from "./assets/modules/menuTabs-Boe_4pzK.js";
-import { _ as Ws } from "./assets/modules/index-C_7galsG.js";
+import { d as We } from "./assets/modules/uploadList-61wZlPUk.js";
+import { C as ms, U as hs, a as gs, p as bs } from "./assets/modules/uploadList-61wZlPUk.js";
+import { c as He } from "./assets/modules/index-BjXLzCF2.js";
+import { _ as xs, h as ys, b as ks, a as ws, d as Ss, e as Cs, g as Ts, f as $s, n as Is, p as Ds, t as Es, v as Ps } from "./assets/modules/index-BjXLzCF2.js";
+import { _ as A } from "./assets/modules/index-iozooZXX.js";
+import { _ as U } from "./assets/modules/toolIcon-BiWBb2pJ.js";
+import { a as Ns } from "./assets/modules/toolIcon-BiWBb2pJ.js";
+import { _ as Bs, b as Rs, c as Os, d as As, e as Ls, I as zs, f as Us, g as Vs, a as Ys } from "./assets/modules/menuTabs-D_UlXkmm.js";
+import { _ as Ws } from "./assets/modules/index-BURe9YrF.js";
 import { _ as q } from "./assets/modules/_plugin-vue_export-helper-CHgC5LLL.js";
 const Te = (s, a, e, t = "remove") => {
   if (!e)

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/webui",
-   "version": "1.4.3",
+   "version": "1.4.5",
    "description": "后台前端通用组件定义",
    "type": "module",
    "keywords": [],

package/src/components/layout/header/headerExits.vue

@@ -1,16 +1,16 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import { Modal, Flex } from 'ant-design-vue';
-import { mainAppApis } from '@skyfox2000/microbase';
 import { ToolIcon, Tooltip } from '../../common';
-import { useUserInfo } from '@/index';
+import { MicroOpenApis, useUserInfo } from '@/index';
+import { isMicroApp } from '@skyfox2000/microbase';
 
 const userInfoStore = useUserInfo();
 const open = ref(false);
 const confirmExit = () => {
    open.value = false;
-   if (mainAppApis.value) {
-      mainAppApis.value.userLogout!();
+   if (isMicroApp()) {
+      MicroOpenApis.userLogout!();
    } else {
       userInfoStore.logout(true);
    }

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);
             }
          });
       },
@@ -495,7 +495,11 @@ export const useAppInfo = defineStore('appInfo', {
       logout() {
          // 清理应用信息
          this.clean();
-         window.location.assign('/');
+         if (isMicroApp()) {
+            MicroOpenApis.mainAppPush('/');
+         } else {
+            window.location.assign('/');
+         }
       },
    },
    persist: false,

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';
@@ -103,7 +105,6 @@ class MicroAppSDK {
       if (this.isInMicroApp()) {
          // 添加监听器
          (window as any).microApp.addDataListener((data: any) => {
-            console.log('收到来自主应用的数据:', data);
             this.handleResponseData(data);
          });
       }
@@ -112,43 +113,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);
    }
 }