@skyfox2000/webui 1.4.4 → 1.4.6

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-C6QsaAZ8.js";
+import { _ as q } from "../../assets/modules/toolIcon-DHKszGtC.js";
 import "@skyfox2000/fapi";
-import "../../assets/modules/uploadList-C4BvnORD.js";
+import "../../assets/modules/uploadList-DSN9t4r8.js";
 import "@skyfox2000/microbase";
 import "vue-m-message";
 import "async-validator";
 import "dayjs";
-import { _ as D } from "../../assets/modules/index-RrFsG5IK.js";
+import { _ as D } from "../../assets/modules/index-DP1u2P1k.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-CYzXPj7i.js";
-import { af as A, a as S } from "../../assets/modules/uploadList-C4BvnORD.js";
+import { _ as g } from "../../assets/modules/baseLayout-CUZpKmC0.js";
+import { af as A, a as S } from "../../assets/modules/uploadList-DSN9t4r8.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-C4BvnORD.js";
+import { r as s } from "../../assets/modules/uploadList-DSN9t4r8.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-C4BvnORD.js";
+import { r as s } from "../../assets/modules/uploadList-DSN9t4r8.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-QDkmhaJS.js";
+import { _ as Y } from "../../assets/modules/index-BqoqvtEv.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-C4BvnORD.js";
-import { A as Re, p as De, U as ce } from "../../assets/modules/file-upload-Dmi2Kiqo.js";
+import { E as Te, a2 as Se, a8 as Ee } from "../../assets/modules/uploadList-DSN9t4r8.js";
+import { A as Re, p as De, U as ce } from "../../assets/modules/file-upload-BrTPBL29.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-1Qt9-aFa.js";
+import { c as ke, _ as Z, h as Le, p as Ne, i as Ke } from "../../assets/modules/index-NDOzpgzV.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-1Qt9-aFa.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-NDOzpgzV.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-CYzXPj7i.js";
-import { af as A, a as S } from "../../assets/modules/uploadList-C4BvnORD.js";
+import { _ as y } from "../../assets/modules/baseLayout-CUZpKmC0.js";
+import { af as A, a as S } from "../../assets/modules/uploadList-DSN9t4r8.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-QDkmhaJS.js";
+import { _ as c } from "../../assets/modules/index-BqoqvtEv.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-C4BvnORD.js";
+import { a4 as h } from "../../assets/modules/uploadList-DSN9t4r8.js";
 import "@skyfox2000/microbase";
 import L from "vue-m-message";
 import "async-validator";
 import "dayjs";
-import { A as N } from "../../assets/modules/file-upload-Dmi2Kiqo.js";
+import { A as N } from "../../assets/modules/file-upload-BrTPBL29.js";
 import "vue-draggable-next";
-import { U as B } from "../../assets/modules/uploadList-Bh1TJ-XO.js";
+import { U as B } from "../../assets/modules/uploadList-C5R2XD5x.js";
 const K = /* @__PURE__ */ y({
   __name: "uploadForm",
   props: {

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-C4BvnORD.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-C4BvnORD.js";
-import { A as ds, U as ps, p as fs } from "./assets/modules/file-upload-Dmi2Kiqo.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-DSN9t4r8.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-DSN9t4r8.js";
+import { A as ds, U as ps, p as fs } from "./assets/modules/file-upload-BrTPBL29.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-Bh1TJ-XO.js";
-import { C as ms, U as hs, a as gs, p as bs } from "./assets/modules/uploadList-Bh1TJ-XO.js";
-import { c as He } from "./assets/modules/index-1Qt9-aFa.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-1Qt9-aFa.js";
-import { _ as A } from "./assets/modules/index-QDkmhaJS.js";
-import { _ as U } from "./assets/modules/toolIcon-C6QsaAZ8.js";
-import { a as Ns } from "./assets/modules/toolIcon-C6QsaAZ8.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-sfALzkA5.js";
-import { _ as Ws } from "./assets/modules/index-RrFsG5IK.js";
+import { d as We } from "./assets/modules/uploadList-C5R2XD5x.js";
+import { C as ms, U as hs, a as gs, p as bs } from "./assets/modules/uploadList-C5R2XD5x.js";
+import { c as He } from "./assets/modules/index-NDOzpgzV.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-NDOzpgzV.js";
+import { _ as A } from "./assets/modules/index-BqoqvtEv.js";
+import { _ as U } from "./assets/modules/toolIcon-DHKszGtC.js";
+import { a as Ns } from "./assets/modules/toolIcon-DHKszGtC.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-BaZAmaXz.js";
+import { _ as Ws } from "./assets/modules/index-DP1u2P1k.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.4",
+   "version": "1.4.6",
    "description": "后台前端通用组件定义",
    "type": "module",
    "keywords": [],
@@ -65,4 +65,4 @@
       "vite-plugin-dts": "^4.5.4",
       "vue-tsc": "^2.2.0"
    }
-}
+}

package/src/stores/appInfo.ts

@@ -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/userInfo.ts

@@ -4,6 +4,7 @@ import message from 'vue-m-message';
 import { isMicroApp, LoginInfo, UserInfo } from '@skyfox2000/microbase';
 import { ref } from 'vue';
 import { useAppInfo } from './appInfo';
+import { MicroOpenApis } from '@/utils/micro-openapis';
 
 const TokenError = 'Token解析失败';
 export const LoginExpiredError = 1400;
@@ -375,6 +376,11 @@ export const useUserInfo = defineStore('userInfo', {
        * @returns
        */
       async logout(exit: boolean): Promise<void> {
+         if (isMicroApp()) {
+            // 调用基座退出登录
+            MicroOpenApis.userLogout();
+            return Promise.resolve();
+         }
          try {
             if (exit) {
                // 调用后端登出接口

package/src/utils/file-upload.ts

@@ -206,7 +206,7 @@ export class AsyncUploader {
       file.status = UploadStatus.Uploading;
 
       // 以 Promise 化的方式处理上传请求
-      return new Promise((resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
          // 创建表单数据
          const formData = new FormData();
          formData.append('file', file.originFileObj as File);
@@ -235,7 +235,7 @@ export class AsyncUploader {
 
          // 添加授权 Token（如果需要）
          if (this.urlInfo.authorize) {
-            const token = isMicroApp() ? MicroOpenApis.getToken() : useUserInfo().getToken(); // 假设 getToken 是获取 Token 的方法
+            const token = isMicroApp() ? await MicroOpenApis.getToken() : useUserInfo().getToken(); // 假设 getToken 是获取 Token 的方法
             if (!token) {
                reject(new Error('未授权或授权过期'));
                return;

package/src/utils/micro-openapis.ts

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