@skyfox2000/microbase 1.0.3 → 1.0.5

package/lib/index.d.ts

@@ -109,17 +109,7 @@ export declare enum AppSource {
 /**
  * 深度合并QOD参数
  */
-export declare const combineParams: (...args: ReqParams[]) => ReqParams;
-
-/**
- * 路由权限判断
- * @param route 指定路由
- * @param isLogin 是否已登录
- * @param userRoles 用户角色
- * @param userPermits 用户权限
- * @returns 权限判断结果
- */
-export declare const hasPermission: (route: RouteRecord, isLogin: boolean, userRoles: string[], userPermits: string[]) => boolean;
+export declare const combineParams: (...args: (ReqParams | undefined)[]) => ReqParams;
 
 /**
  * 启动配置信息

package/lib/microbase.es.js

@@ -1,65 +1,49 @@
-import { deepClone as d } from "@skyfox2000/fapi";
-import { ref as i, markRaw as A, h as m } from "vue";
-import { createRouter as M, createWebHashHistory as _ } from "vue-router";
-var w = /* @__PURE__ */ ((e) => (e.Market = "Market", e.Manual = "Manual", e))(w || {}), D = /* @__PURE__ */ ((e) => (e.App = "App", e.MenuApp = "MenuApp", e.Link = "Link", e.Iframe = "Iframe", e))(D || {}), I = /* @__PURE__ */ ((e) => (e[e.LEFT = 1] = "LEFT", e[e.RIGHT = 2] = "RIGHT", e))(I || {});
-const l = (e, t) => {
+import { deepClone as u } 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";
+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 || {}), A = /* @__PURE__ */ ((e) => (e[e.LEFT = 1] = "LEFT", e[e.RIGHT = 2] = "RIGHT", e))(A || {});
+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]) ? l(e[n], t[n]) : e[n] = d(t[n]);
-}, C = (...e) => {
+      n in e && typeof e[n] == "object" && typeof t[n] == "object" && !Array.isArray(t[n]) ? r(e[n], t[n]) : e[n] = u(t[n]);
+}, E = (...e) => {
   const t = {};
   for (const n of e)
-    n != null && n.Option && !t.Option && (t.Option = {}), l(t.Option, n == null ? void 0 : n.Option);
+    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 = {}), l(t.Query, n == null ? void 0 : n.Query);
+    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 ? d(n.Data) : {};
+    t.Data = n != null && n.Data ? u(n.Data) : {};
   return t;
-}, N = () => !!window.__MICRO_APP_ENVIRONMENT__, U = () => !!window.__MICRO_APP_BASE_APPLICATION__, u = i(), P = i(), E = i(), b = () => {
+}, L = () => !!window.__MICRO_APP_ENVIRONMENT__, O = () => !!window.__MICRO_APP_BASE_APPLICATION__, i = o(), M = o(), _ = o(), k = () => {
   const e = window.microApp.getData(
     !0
   );
-  u.value = e.MainApis, P.value = e.MainEvents, E.value = e.pageUrl;
-}, O = [
+  i.value = e.MainApis, M.value = e.MainEvents, _.value = e.pageUrl;
+}, h = [
   {
     path: "/:page(.*)",
     name: "默认页面",
     component: () => import("./assets/modules/index-DQ8DfP_z.js")
   }
-], v = M({
-  history: _(void 0),
-  routes: O
-}), Q = (e, t, n, s) => {
-  var c, f;
-  const o = ((c = e.meta) == null ? void 0 : c.roles) ?? [], r = (f = e.meta) == null ? void 0 : f.permission;
-  if (!t)
-    return o.length === 0 && !r;
-  if (t && (n.length > 0 || s.length > 0)) {
-    if (o.length === 0 && !r)
-      return !0;
-    if (o.length && !r)
-      return o.some((a) => n.includes(a));
-    if (!o.length && r)
-      return s.includes(r);
-    if (o.length && r)
-      return o.some((a) => n.includes(a)) && s.includes(r);
-  }
-  return !1;
-};
-v.afterEach((e) => {
-  if (u.value) {
-    const { mainAppPush: t } = u.value;
+], l = m({
+  history: d(void 0),
+  routes: h
+});
+l.afterEach((e) => {
+  if (i.value) {
+    const { mainAppPush: t } = i.value;
     t && t(e.hash);
   }
 });
-const H = i({}), h = i(""), y = i({}), p = i(null), k = async (e) => {
-  h.value = e, e.startsWith("/") && (e = e.substring(1));
-  const t = y.value[`./views/${e}.vue`];
+const T = o({}), c = o(""), f = o({}), s = o(null), w = async (e) => {
+  c.value = e, e.startsWith("/") && (e = e.substring(1));
+  const t = f.value[`./views/${e}.vue`];
   if (t) {
     const n = await t();
-    p.value = A(n.default), v.replace("/" + e);
+    s.value = p(n.default), l.replace("/" + e);
   } else
-    console.error("加载微模块" + e + "失败"), p.value = m(
+    console.error("加载微模块" + e + "失败"), s.value = a(
       "div",
       {
         style: {
@@ -72,32 +56,31 @@ const H = i({}), h = i(""), y = i({}), p = i(null), k = async (e) => {
           // 使文本垂直居中
         }
       },
-      [m("div", "404 NOT FOUND")]
+      [a("div", "404 NOT FOUND")]
     );
-}, R = (e) => {
-  y.value = e, window.microApp && window.microApp.addDataListener(async (t) => {
-    if (t.pageUrl === h.value) return;
+}, C = (e) => {
+  f.value = e, window.microApp && window.microApp.addDataListener(async (t) => {
+    if (t.pageUrl === c.value) return;
     let n = t.pageUrl;
-    k(n);
+    w(n);
   }, !0);
 };
 export {
-  D as AppAction,
-  w as AppSource,
-  v as LoaderRouter,
-  I as RowOperate,
-  C as combineParams,
-  Q as hasPermission,
-  b as initMainAppData,
-  R as initModuleLoader,
-  U as isBaseMicroApp,
-  N as isMicroApp,
-  k as loadModule,
-  u as mainAppApis,
-  P as mainAppEvents,
-  E as mainPageUrl,
-  H as moduleAttrs,
-  p as moduleCom,
-  y as moduleRecords,
-  h as moduleUrl
+  y as AppAction,
+  v as AppSource,
+  l as LoaderRouter,
+  A as RowOperate,
+  E as combineParams,
+  k as initMainAppData,
+  C as initModuleLoader,
+  O as isBaseMicroApp,
+  L as isMicroApp,
+  w as loadModule,
+  i as mainAppApis,
+  M as mainAppEvents,
+  _ as mainPageUrl,
+  T as moduleAttrs,
+  s as moduleCom,
+  f as moduleRecords,
+  c as moduleUrl
 };

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/microbase",
-   "version": "1.0.3",
+   "version": "1.0.5",
    "description": "微前端通用功能与数据类型定义",
    "type": "module",
    "keywords": [],

package/src/router/loader-router.ts

@@ -88,58 +88,6 @@ const router: Router = createRouter({
    routes: routes
 });
 
-/**
- * 路由权限判断
- * @param route 指定路由
- * @param isLogin 是否已登录
- * @param userRoles 用户角色
- * @param userPermits 用户权限
- * @returns 权限判断结果
- */
-export const hasPermission = (
-   route: RouteRecord,
-   isLogin: boolean,
-   userRoles: string[],
-   userPermits: string[]
-): boolean => {
-   const roles = route.meta?.roles ?? [];
-   const permission = route.meta?.permission;
-
-   // 如果用户未登录，且路由没有角色和权限要求，则允许访问
-   if (!isLogin) {
-      return roles.length === 0 && !permission;
-   }
-
-   // 如果用户已登录或有角色和权限信息
-   if (isLogin && (userRoles.length > 0 || userPermits.length > 0)) {
-      // 没有角色码和权限码，都可以访问
-      if (roles.length === 0 && !permission) {
-         return true;
-      }
-
-      // 路由有角色码无权限码，符合任何一个角色都可以访问
-      if (roles.length && !permission) {
-         return roles.some((role) => userRoles.includes(role));
-      }
-
-      // 路由无角色码有权限码，符合权限码即可访问
-      if (!roles.length && permission) {
-         return userPermits.includes(permission);
-      }
-
-      // 路由同时有角色码和权限码，必须用户角色和权限同时满足才可访问
-      if (roles.length && permission) {
-         return (
-            roles.some((role) => userRoles.includes(role)) &&
-            userPermits.includes(permission)
-         );
-      }
-   }
-
-   // 默认返回 false，即无匹配条件时不允许访问
-   return false;
-};
-
 /**
  * 子应用更新主应用路由
  */

package/src/utils/data.ts

@@ -26,7 +26,7 @@ const mergeDeep = (
 /**
  * 深度合并QOD参数
  */
-export const combineParams = (...args: ReqParams[]): ReqParams => {
+export const combineParams = (...args: (ReqParams | undefined)[]): ReqParams => {
    const mergedParams: ReqParams = {};
 
    // 合并选项对象