@skyfox2000/microbase 1.0.14 → 1.2.0

package/.cursorignore

@@ -0,0 +1,8 @@
+# Add directories or file patterns to ignore during indexing (e.g. foo/ or *.csv)
+target/
+dist/
+lib/
+demo/
+mock
+node_modules/
+.vscode/

package/lib/index.d.ts

@@ -111,6 +111,13 @@ export declare enum AppSource {
  */
 export declare const combineParams: (...args: (ReqParams | undefined)[]) => ReqParams;
 
+/**
+ * 统一环境变量配置
+ */
+export declare const EnvConfig: {
+    [key: string]: string;
+};
+
 /**
  * 启动配置信息
  * - 网站配置信息
@@ -168,6 +175,11 @@ export declare interface HostInfo {
     [key: string]: any;
 }
 
+/**
+ * 初始化环境变量
+ */
+export declare const initEnv: (metaEnv: ImportMetaEnv) => void;
+
 /**
  * 从页面加载处获取接口
  */
@@ -259,10 +271,6 @@ export declare interface MainOpenApis {
      * 获取当前应用AppInfo
      */
     getAppInfo: () => AppInfo;
-    /**
-     * 主机解析图标库并同步到子应用
-     */
-    createIconLib: (iconLib: Ref<Record<string, any>>) => void;
     /**
      * 用户注册接口
      */

package/lib/microbase.es.js

@@ -1,47 +1,50 @@
 import { deepClone as l } from "@skyfox2000/fapi";
 import { ref as o, markRaw as p, h as a } from "vue";
-import { createRouter as m, createWebHashHistory as d } from "vue-router";
+import { createRouter as d, createWebHashHistory as m } from "vue-router";
 var v = /* @__PURE__ */ ((e) => (e.Market = "Market", e.Manual = "Manual", e))(v || {}), y = /* @__PURE__ */ ((e) => (e.App = "App", e.MenuApp = "MenuApp", e.Link = "Link", e.Iframe = "Iframe", e))(y || {});
-const r = (e, n) => {
-  if (!(!n || !e))
-    for (const t in n)
-      t in e && typeof e[t] == "object" && typeof n[t] == "object" && !Array.isArray(n[t]) ? r(e[t], n[t]) : e[t] = l(n[t]);
-}, P = (...e) => {
-  const n = {};
-  for (const t of e)
-    t != null && t.Option && !n.Option && (n.Option = {}), r(n.Option, t == null ? void 0 : t.Option);
-  for (const t of e)
-    t != null && t.Query && !n.Query && (n.Query = {}), r(n.Query, t == null ? void 0 : t.Query);
-  for (const t of e)
-    n.Data = t != null && t.Data ? l(t.Data) : {};
-  return n;
-}, I = () => !!window.__MICRO_APP_ENVIRONMENT__, k = () => !!window.__MICRO_APP_BASE_APPLICATION__, i = o(), A = o(), M = o(), R = () => {
+const r = (e, t) => {
+  if (!(!t || !e))
+    for (const n in t)
+      n in e && typeof e[n] == "object" && typeof t[n] == "object" && !Array.isArray(t[n]) ? r(e[n], t[n]) : e[n] = l(t[n]);
+}, k = (...e) => {
+  const t = {};
+  for (const n of e)
+    n != null && n.Option && !t.Option && (t.Option = {}), r(t.Option, n == null ? void 0 : n.Option);
+  for (const n of e)
+    n != null && n.Query && !t.Query && (t.Query = {}), r(t.Query, n == null ? void 0 : n.Query);
+  for (const n of e)
+    t.Data = n != null && n.Data ? l(n.Data) : {};
+  return t;
+}, I = () => !!window.__MICRO_APP_ENVIRONMENT__, C = () => !!window.__MICRO_APP_BASE_APPLICATION__, i = o(), A = o(), M = o(), E = () => {
   const e = window.microApp.getData(
     !0
   );
   e && (i.value = e.MainApis, A.value = e.MainEvents, M.value = e.pageUrl);
-}, w = [
+}, w = {}, R = (e) => {
+  for (const t in e)
+    w[t] = e[t];
+}, _ = [
   {
     path: "/:page(.*)",
     name: "默认页面",
     component: () => import("./assets/modules/index-DQ8DfP_z.js")
   }
-], u = m({
-  history: d(void 0),
-  routes: w
+], u = d({
+  history: m(void 0),
+  routes: _
 });
 u.afterEach((e) => {
   if (i.value) {
-    const { mainAppPush: n } = i.value;
-    n && n(e.hash);
+    const { mainAppPush: t } = i.value;
+    t && t(e.hash);
   }
 });
-const C = o({}), c = o(""), f = o({}), s = o(null), _ = async (e) => {
+const L = o({}), c = o(""), f = o({}), s = o(null), h = async (e) => {
   c.value = e, e.startsWith("/") && (e = e.substring(1));
-  const n = f.value[`./views/${e}.vue`];
-  if (n) {
-    const t = await n();
-    s.value = p(t.default), u.replace("/" + e);
+  const t = f.value[`./views/${e}.vue`];
+  if (t) {
+    const n = await t();
+    s.value = p(n.default), u.replace("/" + e);
   } else
     console.error("加载微模块" + e + "失败"), s.value = a(
       "div",
@@ -58,27 +61,29 @@ const C = o({}), c = o(""), f = o({}), s = o(null), _ = async (e) => {
       },
       [a("div", "404 NOT FOUND")]
     );
-}, E = (e) => {
-  f.value = e, window.microApp && window.microApp.addDataListener(async (n) => {
-    if (n.pageUrl === c.value) return;
-    let t = n.pageUrl;
-    t ? _(t) : console.error("微模块地址为空");
+}, N = (e) => {
+  f.value = e, window.microApp && window.microApp.addDataListener(async (t) => {
+    if (t.pageUrl === c.value) return;
+    let n = t.pageUrl;
+    n ? h(n) : console.error("微模块地址为空");
   }, !0);
 };
 export {
   y as AppAction,
   v as AppSource,
+  w as EnvConfig,
   u as LoaderRouter,
-  P as combineParams,
-  R as initMainAppData,
-  E as initModuleLoader,
-  k as isBaseMicroApp,
+  k as combineParams,
+  R as initEnv,
+  E as initMainAppData,
+  N as initModuleLoader,
+  C as isBaseMicroApp,
   I as isMicroApp,
-  _ as loadModule,
+  h as loadModule,
   i as mainAppApis,
   A as mainAppEvents,
   M as mainPageUrl,
-  C as moduleAttrs,
+  L as moduleAttrs,
   s as moduleCom,
   f as moduleRecords,
   c as moduleUrl

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/microbase",
-   "version": "1.0.14",
+   "version": "1.2.0",
    "description": "微前端通用功能与数据类型定义",
    "type": "module",
    "keywords": [],
@@ -22,8 +22,9 @@
       "build": "vue-tsc -b && vite build",
       "preview": "vite preview"
    },
-   "dependencies": {
-      "@micro-zoe/micro-app": "1.0.0-rc.18",
+   "peerDependencies": {
+      "@skyfox2000/fapi": "^1.1.19",
+      "@micro-zoe/micro-app": "^1.0.0-rc.18",
       "vue": "^3.5.13",
       "vue-router": "^4.5.0"
    },

package/src/index.ts

@@ -6,14 +6,17 @@ import type { LoginInfo, UserInfo } from "@/stores/userInfo.d";
 
 import { combineParams } from "@/utils/data";
 
-import { 
-  isMicroApp, 
-  isBaseMicroApp, 
-  mainAppApis, 
-  mainAppEvents, 
-  mainPageUrl, 
-  initMainAppData 
+import {
+   isMicroApp,
+   isBaseMicroApp,
+   mainAppApis,
+   mainAppEvents,
+   mainPageUrl,
+   initMainAppData,
+   EnvConfig,
+   initEnv,
 } from "@/utils/micro-app";
+
 import type {
   MainAppData, 
   MainOpenApis, 
@@ -44,13 +47,15 @@ export type { LoginInfo, UserInfo };
 
 export { combineParams };
 
-export { 
-  isMicroApp, 
-  isBaseMicroApp, 
-  mainAppApis, 
-  mainAppEvents, 
-  mainPageUrl, 
-  initMainAppData 
+export {
+   isMicroApp,
+   isBaseMicroApp,
+   mainAppApis,
+   mainAppEvents,
+   mainPageUrl,
+   initMainAppData,
+   EnvConfig,
+   initEnv,
 };
 export type {
   MainAppData, 

package/src/utils/micro-app.ts

@@ -3,17 +3,17 @@ import { HostInfo } from "@/stores/hostInfo";
 import { SettingInfo } from "@/stores/settingInfo";
 import { LoginInfo, UserInfo } from "@/stores/userInfo";
 import { ApiResponse } from "@skyfox2000/fapi";
-import { Ref, ref } from "vue";
+import { ref } from "vue";
 /**
  * 是否微服务运行环境
  * @returns
  */
 export const isMicroApp = (): boolean => {
-  // @ts-ignore
-  if (window.__MICRO_APP_ENVIRONMENT__) {
-    return true;
-  }
-  return false;
+   // @ts-ignore
+   if (window.__MICRO_APP_ENVIRONMENT__) {
+      return true;
+   }
+   return false;
 };
 
 /**
@@ -21,85 +21,81 @@ export const isMicroApp = (): boolean => {
  * @returns
  */
 export const isBaseMicroApp = (): boolean => {
-  // @ts-ignore
-  if (window.__MICRO_APP_BASE_APPLICATION__) {
-    return true;
-  }
-  return false;
+   // @ts-ignore
+   if (window.__MICRO_APP_BASE_APPLICATION__) {
+      return true;
+   }
+   return false;
 };
 
 /**
  * 主应用初始化数据格式
  */
 export interface MainAppData {
-  /**
-   * 主应用开放接口
-   */
-  MainApis: MainOpenApis;
-  /**
-   * 主应用开放事件
-   */
-  MainEvents: MainOpenEvents;
-  /**
-   * 加载的页面地址
-   */
-  pageUrl: string;
+   /**
+    * 主应用开放接口
+    */
+   MainApis: MainOpenApis;
+   /**
+    * 主应用开放事件
+    */
+   MainEvents: MainOpenEvents;
+   /**
+    * 加载的页面地址
+    */
+   pageUrl: string;
 }
 
 /**
  * 主应用开放接口
  */
 export interface MainOpenApis {
-  /**
-   * 获取HostInfo
-   */
-  getHostInfo: () => HostInfo;
-  /**
-   * 获取当前应用AppInfo
-   */
-  getAppInfo: () => AppInfo;
-  /**
-   * 主机解析图标库并同步到子应用
-   */
-  createIconLib: (iconLib: Ref<Record<string, any>>) => void;
-  /**
-   * 用户注册接口
-   */
-  userRegister?: () => void;
-  /**
-   * 用户登录接口
-   */
-  userLogin?: (loginInfo: LoginInfo) => Promise<ApiResponse<LoginInfo> | void>;
-  /**
-   * 用户注销接口
-   */
-  userLogout?: () => Promise<ApiResponse<any> | void>;
-  /**
-   * 获取授权码
-   * @returns 授权码
-   */
-  getToken: () => string;
-  /**
-   * 获取当前用户信息
-   */
-  getUserInfo: () => UserInfo;
-  /**
-   * 获取前端设置信息
-   */
-  getSettingInfo?: () => SettingInfo;
-  /**
-   * 子应用推送路由变更
-   */
-  mainAppPush?: (subPath: string) => void;
+   /**
+    * 获取HostInfo
+    */
+   getHostInfo: () => HostInfo;
+   /**
+    * 获取当前应用AppInfo
+    */
+   getAppInfo: () => AppInfo;
+   /**
+    * 用户注册接口
+    */
+   userRegister?: () => void;
+   /**
+    * 用户登录接口
+    */
+   userLogin?: (loginInfo: LoginInfo) => Promise<ApiResponse<LoginInfo> | void>;
+   /**
+    * 用户注销接口
+    */
+   userLogout?: () => Promise<ApiResponse<any> | void>;
+   /**
+    * 获取授权码
+    * @returns 授权码
+    */
+   getToken: () => string;
+   /**
+    * 获取当前用户信息
+    */
+   getUserInfo: () => UserInfo;
+   /**
+    * 获取前端设置信息
+    */
+   getSettingInfo?: () => SettingInfo;
+   /**
+    * 子应用推送路由变更
+    */
+   mainAppPush?: (subPath: string) => void;
 }
 /**
  * 主应用开放事件注册
  */
 export interface MainOpenEvents {
-  /**
-   * 前端设置信息变更
-   */
-  onSettingChanged?: () => void;
+   /**
+    * 前端设置信息变更
+    */
+   onSettingChanged?: () => void;
 }
 
 export const mainAppApis = ref<MainOpenApis | undefined>();
@@ -110,12 +106,28 @@ export const mainPageUrl = ref<string | undefined>();
  * 从页面加载处获取接口
  */
 export const initMainAppData = () => {
-  const mainAppData: MainAppData = window.microApp.getData(
-    true
-  ) as unknown as MainAppData;
-  if (mainAppData) {
-    mainAppApis.value = mainAppData.MainApis;
-    mainAppEvents.value = mainAppData.MainEvents;
-    mainPageUrl.value = mainAppData.pageUrl;
-  }
+   const mainAppData: MainAppData = window.microApp.getData(
+      true
+   ) as unknown as MainAppData;
+   if (mainAppData) {
+      mainAppApis.value = mainAppData.MainApis;
+      mainAppEvents.value = mainAppData.MainEvents;
+      mainPageUrl.value = mainAppData.pageUrl;
+   }
+};
+
+/**
+ * 统一环境变量配置
+ */
+export const EnvConfig: {
+   [key: string]: string;
+} = {};
+
+/**
+ * 初始化环境变量
+ */
+export const initEnv = (metaEnv: ImportMetaEnv) => {
+   for (const key in metaEnv) {
+      EnvConfig[key] = metaEnv[key];
+   }
 };

package/vite.config.ts

@@ -8,7 +8,7 @@ import dts from "vite-plugin-dts";
 export default defineConfig(({ mode }: ConfigEnv) => {
    const root = process.cwd();
    const env = loadEnv(mode, root);
-   console.log(env);
+   console.log(new Date().toLocaleTimeString(), " ", env);
 
    return {
       plugins: [