@skyfox2000/webui 1.2.5 → 1.2.6

package/lib/assets/modules/{index-B5NckHoK.js → index-DvbJb5Ha.js}

@@ -1,8 +1,8 @@
 import { defineComponent as A, provide as B, ref as S, watch as p, onMounted as F, createBlock as n, openBlock as r, unref as a, withCtx as t, createElementVNode as N, renderSlot as b, createVNode as V, createCommentVNode as d, createTextVNode as u, toDisplayString as m } from "vue";
-import { _ as f } from "./index-DG2jNBuv.js";
+import { _ as f } from "./index-BkbOMv2e.js";
 import { Modal as E, Space as M } from "ant-design-vue";
 import "@skyfox2000/fapi";
-import { P, o as $, d as D, b as K } from "./index-C4515EtU.js";
+import { P, o as $, d as D, b as K } from "./index-D4mESG0b.js";
 import "@skyfox2000/microbase";
 import "vue-m-message";
 import "async-validator";

package/lib/assets/modules/{menuTabs-BwX6S1WN.js → menuTabs-DgX7pUbX.js}

@@ -1,6 +1,6 @@
 import { defineComponent as _, createBlock as y, createCommentVNode as I, openBlock as p, unref as t, mergeProps as C, useAttrs as q, computed as P, ref as h, watch as k, withCtx as f, createElementBlock as g, normalizeStyle as T, createElementVNode as x, inject as J, onMounted as R, createVNode as u, toDisplayString as U, Fragment as L, createTextVNode as O, reactive as Q, nextTick as W, renderList as G, withModifiers as X } from "vue";
-import { a as w, _ as b } from "./toolIcon-B5Qojob9.js";
-import { c as F, Q as j, ad as B, T as K, S as E, u as H, a as V, R as Y, r as D, ab as A } from "./index-C4515EtU.js";
+import { a as w, _ as b } from "./toolIcon-C0bp66dj.js";
+import { c as F, Q as j, ad as B, T as K, S as E, u as H, a as V, R as Y, r as D, ab as A } from "./index-D4mESG0b.js";
 import { theme as N, Breadcrumb as Z, Modal as ee, Flex as te, LayoutHeader as ne, Space as oe, Menu as se, Tabs as ie, TabPane as ce } from "ant-design-vue";
 import { mainAppApis as M } from "@skyfox2000/microbase";
 import { SERVER_HOST as z } from "@skyfox2000/fapi";

package/lib/assets/modules/{toolIcon-B5Qojob9.js → toolIcon-C0bp66dj.js}

@@ -1,7 +1,7 @@
 import { defineComponent as i, createBlock as s, openBlock as l, unref as a, withCtx as p, renderSlot as f, createCommentVNode as u, mergeProps as d } from "vue";
 import { Tooltip as I } from "ant-design-vue";
 import { SERVER_HOST as r } from "@skyfox2000/fapi";
-import { c as S } from "./index-C4515EtU.js";
+import { c as S } from "./index-D4mESG0b.js";
 const T = /* @__PURE__ */ i({
   __name: "index",
   props: {

package/lib/assets/modules/{uploadList-BdeV2JlK.js → uploadList-CWhqNLX9.js}

@@ -1,9 +1,9 @@
 import { defineComponent as $, ref as k, computed as O, watch as j, createElementBlock as p, openBlock as f, createElementVNode as r, createVNode as v, unref as l, mergeProps as B, withCtx as U, createTextVNode as E, toDisplayString as y, Fragment as M, renderList as R, normalizeClass as T, createCommentVNode as F } from "vue";
-import { _ as V } from "./index-DG2jNBuv.js";
+import { _ as V } from "./index-BkbOMv2e.js";
 import { Upload as A, Tag as K, Progress as D } from "ant-design-vue";
 import { httpPost as I, ResStatus as Q } from "@skyfox2000/fapi";
-import "./index-C4515EtU.js";
-import { U as o, p as q } from "./file-upload-CoDWKNFQ.js";
+import "./index-D4mESG0b.js";
+import { U as o, p as q } from "./file-upload-Cf9uxE2y.js";
 import { combineParams as G } from "@skyfox2000/microbase";
 import h from "vue-m-message";
 import "async-validator";

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-B5Qojob9.js";
+import { _ as q } from "../../assets/modules/toolIcon-C0bp66dj.js";
 import "@skyfox2000/fapi";
-import "../../assets/modules/index-C4515EtU.js";
+import "../../assets/modules/index-D4mESG0b.js";
 import "@skyfox2000/microbase";
 import "vue-m-message";
 import "async-validator";
 import "dayjs";
-import { _ as D } from "../../assets/modules/index-B5NckHoK.js";
+import { _ as D } from "../../assets/modules/index-DvbJb5Ha.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,8 +1,8 @@
 import { defineComponent as y, ref as I, watch as C, onMounted as b, resolveComponent as g, createBlock as n, openBlock as o, unref as e, withCtx as l, createCommentVNode as c, createVNode as r, createElementVNode as u, createElementBlock as k, toDisplayString as w, normalizeClass as S, KeepAlive as N, resolveDynamicComponent as $ } from "vue";
 import { Layout as f, LayoutSider as E } from "ant-design-vue";
-import { a as z } from "../../assets/modules/toolIcon-B5Qojob9.js";
-import { I as A, a as B, f as L, d as V, g as D } from "../../assets/modules/menuTabs-BwX6S1WN.js";
-import { ab as j, a as K, ad as M } from "../../assets/modules/index-C4515EtU.js";
+import { a as z } from "../../assets/modules/toolIcon-C0bp66dj.js";
+import { I as A, a as B, f as L, d as V, g as D } from "../../assets/modules/menuTabs-DgX7pUbX.js";
+import { ab as j, a as K, ad as M } from "../../assets/modules/index-D4mESG0b.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import P 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/index-C4515EtU.js";
+import { r as s } from "../../assets/modules/index-D4mESG0b.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/index-C4515EtU.js";
+import { r as s } from "../../assets/modules/index-D4mESG0b.js";
 import "@skyfox2000/microbase";
 import "@skyfox2000/fapi";
 import "vue-m-message";

package/lib/es/ExcelForm/index.js

@@ -1,12 +1,12 @@
 import { defineComponent as Y, ref as r, watch as V, onMounted as Z, createBlock as ee, openBlock as d, unref as i, withCtx as _, renderSlot as le, createElementVNode as c, createVNode as m, createElementBlock as f, createCommentVNode as M, createTextVNode as O, toDisplayString as F, normalizeClass as ae, Fragment as $, renderList as P } from "vue";
-import { _ as A } from "../../assets/modules/index-DG2jNBuv.js";
+import { _ as A } from "../../assets/modules/index-BkbOMv2e.js";
 import { Modal as te, Upload as I, Alert as G, Space as re } from "ant-design-vue";
 import { ResStatus as oe } from "@skyfox2000/fapi";
-import { $ as se, a5 as ie } from "../../assets/modules/index-C4515EtU.js";
-import { A as ue, p as ne, U as ce } from "../../assets/modules/file-upload-CoDWKNFQ.js";
+import { $ as se, a5 as ie } from "../../assets/modules/index-D4mESG0b.js";
+import { A as ue, p as ne, U as ce } from "../../assets/modules/file-upload-Cf9uxE2y.js";
 import "@skyfox2000/microbase";
 import n from "vue-m-message";
-import { p as ve, v as de, c as fe } from "../../assets/modules/form-excel-DitXm4uj.js";
+import { p as ve, v as de, c as fe } from "../../assets/modules/form-excel-DnROEQ0w.js";
 import "dayjs";
 import "vue-draggable-next";
 import pe from "@vue-office/excel";

package/lib/es/UploadForm/index.js

@@ -1,15 +1,15 @@
 import { defineComponent as S, ref as m, watch as k, onMounted as z, createBlock as D, openBlock as E, unref as s, withCtx as f, createVNode as v, createTextVNode as g } from "vue";
-import { _ as x } from "../../assets/modules/index-DG2jNBuv.js";
+import { _ as x } from "../../assets/modules/index-BkbOMv2e.js";
 import { Modal as L, Space as N } from "ant-design-vue";
 import { ResStatus as $ } from "@skyfox2000/fapi";
-import { a1 as B } from "../../assets/modules/index-C4515EtU.js";
-import { A as R, U as A } from "../../assets/modules/file-upload-CoDWKNFQ.js";
+import { a1 as B } from "../../assets/modules/index-D4mESG0b.js";
+import { A as R, U as A } from "../../assets/modules/file-upload-Cf9uxE2y.js";
 import "@skyfox2000/microbase";
 import t from "vue-m-message";
 import "async-validator";
 import "dayjs";
 import "vue-draggable-next";
-import { _ as M } from "../../assets/modules/uploadList-BdeV2JlK.js";
+import { _ as M } from "../../assets/modules/uploadList-CWhqNLX9.js";
 const W = /* @__PURE__ */ S({
   __name: "uploadForm",
   props: {

package/lib/stores/appInfo.d.ts

@@ -1,10 +1,8 @@
-import { Router, RouteRecordRaw } from 'vue-router';
+import { RouteRecordRaw } from 'vue-router';
 import { AppInfo, RouteRecord } from '../../../502424_MicroBase';
 import { Component } from 'vue';
 import { StoreDefinition } from 'pinia';
 export declare const useAppInfo: StoreDefinition<"appInfo", {
-    microRouter: any;
-    microActions: Record<string, () => void>;
     appInfo: AppInfo & {
         Routes: RouteRecordRaw[];
         flattenRoutes: Record<string, RouteRecord>;
@@ -15,7 +13,6 @@ export declare const useAppInfo: StoreDefinition<"appInfo", {
     ExcludeComponents: string[];
     menuLoaded: boolean;
 }, {}, {
-    init(router: Router, microActions: Record<string, () => void>): void;
     loadAppList(appList?: AppInfo[]): Promise<void>;
     getRemoteAppList(): Promise<void>;
     toDefaultApp(url?: string): Promise<void>;
@@ -29,6 +26,6 @@ export declare const useAppInfo: StoreDefinition<"appInfo", {
     }): Component;
     excludeComponent(path: string): void;
     matchedRoutes(key: string): RouteRecord[];
-    clear(): void;
+    clean(): void;
     logout(): void;
 }>;

package/lib/webui.es.js

@@ -1,6 +1,6 @@
-import { u as Xe, i as X, a as ve, c as Ze, P as te, o as ie, b as et, d as Pe, e as Ee, r as oe, f as tt, g as at, h as Fe, j as lt, k as A, l as Ne, m as Re, n as V, p as ke, q as rt, s as st, O as Oe, t as Me, _ as ot, v as nt, w as it, x as ct, y as ut, z as dt, A as Be } from "./assets/modules/index-C4515EtU.js";
-import { a7 as bl, L as xl, M as yl, S as kl, a6 as wl, a4 as Cl, a5 as Sl, a8 as $l, V as Tl, Q as Il, a2 as Dl, $ as Pl, K as El, H as Fl, a1 as Nl, R as Rl, C as Ol, X as Ml, a0 as Bl, a3 as Al, J as zl, I as Ll, N as Ul, a9 as Yl, B as Vl, Z as Kl, aa as Hl, U as jl, W as Ql, T as ql, ab as Wl, D as Gl, E as Jl, ac as Xl, G as Zl, ad as er, F as tr, Y as ar } from "./assets/modules/index-C4515EtU.js";
-import { A as rr, U as sr, a as or, g as nr, c as ir, d as cr, m as ur, p as dr, u as pr, b as fr } from "./assets/modules/file-upload-CoDWKNFQ.js";
+import { u as Xe, i as X, a as ve, c as Ze, P as te, o as ie, b as et, d as Pe, e as Ee, r as oe, f as tt, g as at, h as Fe, j as lt, k as A, l as Ne, m as Re, n as V, p as ke, q as rt, s as st, O as Oe, t as Me, _ as ot, v as nt, w as it, x as ct, y as ut, z as dt, A as Be } from "./assets/modules/index-D4mESG0b.js";
+import { a7 as bl, L as xl, M as yl, S as kl, a6 as wl, a4 as Cl, a5 as Sl, a8 as $l, V as Tl, Q as Il, a2 as Dl, $ as Pl, K as El, H as Fl, a1 as Nl, R as Rl, C as Ol, X as Ml, a0 as Bl, a3 as Al, J as zl, I as Ll, N as Ul, a9 as Yl, B as Vl, Z as Kl, aa as Hl, U as jl, W as Ql, T as ql, ab as Wl, D as Gl, E as Jl, ac as Xl, G as Zl, ad as er, F as tr, Y as ar } from "./assets/modules/index-D4mESG0b.js";
+import { A as rr, U as sr, a as or, g as nr, c as ir, d as cr, m as ur, p as dr, u as pr, b as fr } from "./assets/modules/file-upload-Cf9uxE2y.js";
 import { EnvConfig as we } from "@skyfox2000/microbase";
 import { FrontCache as le, httpPost as Ae, ResStatus as ze, SERVER_HOST as pt, fieldMapping as re } from "@skyfox2000/fapi";
 import ne from "vue-m-message";
@@ -9,15 +9,15 @@ import "async-validator";
 import de from "dayjs";
 import { Popover as ht, theme as Ve, Drawer as gt, Space as ee, Form as Ke, message as _t, FormItem as He, ConfigProvider as Se, Popconfirm as bt, Button as je, DropdownButton as xt, Menu as ge, MenuItem as _e, Dropdown as pe, Checkbox as yt, Switch as kt, Table as Qe, Tree as wt, Cascader as Ct, DatePicker as St, Input as fe, InputPassword as $t, InputNumber as Tt, RangePicker as It, Textarea as Dt, Transfer as Pt, TreeSelect as Et, LayoutContent as Ft } from "ant-design-vue";
 import { VueDraggableNext as Nt } from "vue-draggable-next";
-import { d as qe } from "./assets/modules/uploadList-BdeV2JlK.js";
-import { _ as mr, a as hr } from "./assets/modules/uploadList-BdeV2JlK.js";
-import { c as _r, p as br, v as xr } from "./assets/modules/form-excel-DitXm4uj.js";
-import { _ as B } from "./assets/modules/index-DG2jNBuv.js";
-import { _ as U } from "./assets/modules/toolIcon-B5Qojob9.js";
-import { a as kr } from "./assets/modules/toolIcon-B5Qojob9.js";
-import { _ as Q } from "./assets/modules/menuTabs-BwX6S1WN.js";
-import { a as Cr, c as Sr, d as $r, e as Tr, I as Ir, f as Dr, g as Pr, b as Er } from "./assets/modules/menuTabs-BwX6S1WN.js";
-import { _ as Nr } from "./assets/modules/index-B5NckHoK.js";
+import { d as qe } from "./assets/modules/uploadList-CWhqNLX9.js";
+import { _ as mr, a as hr } from "./assets/modules/uploadList-CWhqNLX9.js";
+import { c as _r, p as br, v as xr } from "./assets/modules/form-excel-DnROEQ0w.js";
+import { _ as B } from "./assets/modules/index-BkbOMv2e.js";
+import { _ as U } from "./assets/modules/toolIcon-C0bp66dj.js";
+import { a as kr } from "./assets/modules/toolIcon-C0bp66dj.js";
+import { _ as Q } from "./assets/modules/menuTabs-DgX7pUbX.js";
+import { a as Cr, c as Sr, d as $r, e as Tr, I as Ir, f as Dr, g as Pr, b as Er } from "./assets/modules/menuTabs-DgX7pUbX.js";
+import { _ as Nr } from "./assets/modules/index-DvbJb5Ha.js";
 const $e = (r, a, t, e = "remove") => {
   if (!t)
     if (e === "disable") {

package/package.json

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

package/src/router/index.ts

@@ -1,5 +1,5 @@
 import { useUserInfo } from '@/stores/userInfo';
-import { isMicroApp, mainAppApis, RouteRecord, EnvConfig } from '@skyfox2000/microbase';
+import { RouteRecord, EnvConfig } from '@skyfox2000/microbase';
 import { RouteLocationNormalizedGeneric, RouteRecordRaw, Router, createRouter, createWebHashHistory } from 'vue-router';
 import { useAppInfo } from '@/stores/appInfo';
 import { Ref, ref } from 'vue';
@@ -166,16 +166,6 @@ router.beforeEach((to, _from, next) => {
    }
 });
 
-/**
- * 子应用更新主应用路由
- */
-router.afterEach((to: RouteLocationNormalizedGeneric) => {
-   if (isMicroApp() && mainAppApis.value) {
-      const { mainAppPush } = mainAppApis.value;
-      if (mainAppPush) mainAppPush(to.hash);
-   }
-});
-
 /**
  * 继续执行之前挂起的导航
  * @param path 默认路径

package/src/stores/appInfo.ts

@@ -1,6 +1,14 @@
 import { defineStore } from 'pinia';
-import { Router, RouteRecordRaw } from 'vue-router';
-import { AppAction, AppInfo, AppSource, isBaseMicroApp, isMicroApp, RouteRecord } from '@skyfox2000/microbase';
+import { RouteRecordRaw } from 'vue-router';
+import {
+   AppAction,
+   AppInfo,
+   AppSource,
+   isBaseMicroApp,
+   isMicroApp,
+   mainAppApis,
+   RouteRecord,
+} from '@skyfox2000/microbase';
 import AppRouter, { addAppRoutes, continueNavigation, flattenRoute, LOGIN_PATH } from '@/router';
 import { usePageInfo } from './pageInfo';
 
@@ -102,10 +110,6 @@ const findFirstPage = (routes: RouteRecord[], path = ''): string | undefined =>
 
 export const useAppInfo = defineStore('appInfo', {
    state: (): {
-      /// 微前端基座路由
-      microRouter: any;
-      /// 微前端基座方法
-      microActions: Record<string, () => void>;
       /// 当前选中的
       appInfo: AppInfo & {
          /**
@@ -136,8 +140,6 @@ export const useAppInfo = defineStore('appInfo', {
        */
       menuLoaded: boolean;
    } => ({
-      microRouter: null,
-      microActions: {},
       appInfo: {
          Id: '',
          Name: '',
@@ -159,10 +161,6 @@ export const useAppInfo = defineStore('appInfo', {
       menuLoaded: false,
    }),
    actions: {
-      init(router: Router, microActions: Record<string, () => void>) {
-         this.microRouter = router;
-         this.microActions = microActions;
-      },
       /**
        * 加载授权应用列表
        */
@@ -347,19 +345,11 @@ export const useAppInfo = defineStore('appInfo', {
             usePageInfo().setTabActive(path);
          }
          nextTick(() => {
-            if (isBaseMicroApp()) {
-               // 跨应用路由
-               path = this.formatRoute(path);
-               if (this.microRouter) {
-                  /// 基座路由
-                  let microRouter = this.microRouter as Router;
-                  microRouter.push({ path });
-               } else {
-                  AppRouter.push({ path });
-               }
-            } else {
-               // 非微应用，直接使用当前应用路由AppRouter
-               AppRouter.push({ path });
+            // 直接使用当前应用路由AppRouter
+            AppRouter.push({ path });
+            if (mainAppApis.value && mainAppApis.value.mainAppPush) {
+               const fullPath = this.formatRoute(path);
+               mainAppApis.value.mainAppPush(fullPath);
             }
          });
       },
@@ -433,7 +423,7 @@ export const useAppInfo = defineStore('appInfo', {
          return matched.reverse();
       },
 
-      clear() {
+      clean() {
          /// 清空信息
          this.appInfo = {
             Id: '',
@@ -457,13 +447,14 @@ export const useAppInfo = defineStore('appInfo', {
       },
 
       logout() {
-         if (this.microRouter) {
-            // 避免界面跳动
-            // this.microRouter.push({ path: LOGIN_PATH + '#/' });
-            if (this.microActions && typeof this.microActions['login'] === 'function') {
-               this.microActions['login']();
+         // 清理应用信息
+         this.clean();
+         AppRouter.push({ path: LOGIN_PATH + '#/' });
+         if (isMicroApp()) {
+            if (mainAppApis.value && mainAppApis.value.mainAppPush) {
+               mainAppApis.value.mainAppPush(LOGIN_PATH + '#/');
             }
-         } else AppRouter.push({ path: LOGIN_PATH + '#/' });
+         }
       },
    },
    persist: {

package/src/stores/userInfo.ts

@@ -368,7 +368,7 @@ export const useUserInfo = defineStore('userInfo', {
 
          // 动态导入并使用appInfo
          const appInfoStore = await useAppInfo();
-         appInfoStore.clear();
+         appInfoStore.clean();
          return Promise.resolve();
       },