@skyfox2000/microbase 1.0.4 → 1.0.6

package/lib/index.d.ts

@@ -109,7 +109,7 @@ export declare enum AppSource {
 /**
  * 深度合并QOD参数
  */
-export declare const combineParams: (...args: ReqParams[]) => ReqParams;
+export declare const combineParams: (...args: (ReqParams | undefined)[]) => ReqParams;
 
 /**
  * 启动配置信息
@@ -379,14 +379,6 @@ export declare type RouteRecord = RouteRecordRaw & {
     children?: RouteRecord[];
 };
 
-/**
- * 表格行操作区位置
- */
-export declare enum RowOperate {
-    LEFT = 1,
-    RIGHT = 2,
-}
-
 /**
  * 前端个性化配置
  */
@@ -400,9 +392,15 @@ export declare interface SettingInfo {
      */
     menuCollapse: boolean;
     /**
-     * 表格行操作区位置
+     * 表格头配置
      */
-    rowOperate: RowOperate;
+    tableColumns: {
+        /**
+         * PageUrl
+         * Columns
+         */
+        [key: string]: Record<string, any>[]
+    };
     /**
      * 使用语言
      */
@@ -439,8 +437,19 @@ export declare interface UserInfo {
     readonly TenantId: string | null;
     /**
      * 用户级别
+     * - Super 超级管理员
+     * - Admin 系统管理员
+     * - User 用户
      */
     readonly UserLevel: string;
+    /**
+     * 角色列表
+     */
+    readonly Roles?: string[]
+    /**
+     * 权限列表
+     */
+    readonly Permissions?: string[];
 }
 
 export { }

package/lib/microbase.es.js

@@ -1,26 +1,26 @@
 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]) ? 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 = {}), 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 ? u(n.Data) : {};
-  return t;
-}, L = () => !!window.__MICRO_APP_ENVIRONMENT__, O = () => !!window.__MICRO_APP_BASE_APPLICATION__, i = o(), M = o(), _ = o(), k = () => {
+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] = u(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 ? u(t.Data) : {};
+  return n;
+}, I = () => !!window.__MICRO_APP_ENVIRONMENT__, k = () => !!window.__MICRO_APP_BASE_APPLICATION__, i = o(), A = o(), M = o(), R = () => {
   const e = window.microApp.getData(
     !0
   );
-  i.value = e.MainApis, M.value = e.MainEvents, _.value = e.pageUrl;
-}, h = [
+  i.value = e.MainApis, A.value = e.MainEvents, M.value = e.pageUrl;
+}, w = [
   {
     path: "/:page(.*)",
     name: "默认页面",
@@ -28,20 +28,20 @@ const r = (e, t) => {
   }
 ], l = m({
   history: d(void 0),
-  routes: h
+  routes: w
 });
 l.afterEach((e) => {
   if (i.value) {
-    const { mainAppPush: t } = i.value;
-    t && t(e.hash);
+    const { mainAppPush: n } = i.value;
+    n && n(e.hash);
   }
 });
-const T = o({}), c = o(""), f = o({}), s = o(null), w = async (e) => {
+const C = o({}), c = o(""), f = o({}), s = o(null), _ = async (e) => {
   c.value = e, e.startsWith("/") && (e = e.substring(1));
-  const t = f.value[`./views/${e}.vue`];
-  if (t) {
-    const n = await t();
-    s.value = p(n.default), l.replace("/" + e);
+  const n = f.value[`./views/${e}.vue`];
+  if (n) {
+    const t = await n();
+    s.value = p(t.default), l.replace("/" + e);
   } else
     console.error("加载微模块" + e + "失败"), s.value = a(
       "div",
@@ -58,28 +58,27 @@ const T = o({}), c = o(""), f = o({}), s = o(null), w = async (e) => {
       },
       [a("div", "404 NOT FOUND")]
     );
-}, C = (e) => {
-  f.value = e, window.microApp && window.microApp.addDataListener(async (t) => {
-    if (t.pageUrl === c.value) return;
-    let n = t.pageUrl;
-    w(n);
+}, E = (e) => {
+  f.value = e, window.microApp && window.microApp.addDataListener(async (n) => {
+    if (n.pageUrl === c.value) return;
+    let t = n.pageUrl;
+    _(t);
   }, !0);
 };
 export {
   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,
+  P as combineParams,
+  R as initMainAppData,
+  E as initModuleLoader,
+  k as isBaseMicroApp,
+  I as isMicroApp,
+  _ as loadModule,
   i as mainAppApis,
-  M as mainAppEvents,
-  _ as mainPageUrl,
-  T as moduleAttrs,
+  A as mainAppEvents,
+  M as mainPageUrl,
+  C as moduleAttrs,
   s as moduleCom,
   f as moduleRecords,
   c as moduleUrl

package/package.json

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

package/src/index.ts

@@ -1,14 +1,71 @@
-export * from "@/stores/appInfo.d";
-export * from "@/stores/hostInfo.d";
-export * from "@/stores/settingInfo.d";
-export * from "@/stores/userInfo.d";
+import { AppSource, AppAction } from "@/stores/appInfo.d";
+import type { AppInfo } from "@/stores/appInfo.d";
+import type { HostInfo } from "@/stores/hostInfo.d";
+import type { SettingInfo } from "@/stores/settingInfo.d";
+import type { LoginInfo, UserInfo } from "@/stores/userInfo.d";
 
+import { combineParams } from "@/utils/data";
 
-export * from "@/utils/data";
-export * from "@/utils/micro-app";
+import { 
+  isMicroApp, 
+  isBaseMicroApp, 
+  mainAppApis, 
+  mainAppEvents, 
+  mainPageUrl, 
+  initMainAppData 
+} from "@/utils/micro-app";
+import type {
+  MainAppData, 
+  MainOpenApis, 
+  MainOpenEvents
+} from "@/utils/micro-app";
 
-export * from "@/router/loader-router";
+import type { 
+  MenuLink, 
+  RouteMeta, 
+  RouteRecord 
+} from "@/router/loader-router";
 import LoaderRouter from "@/router/loader-router";
+
+import { 
+  moduleAttrs, 
+  moduleUrl, 
+  moduleRecords, 
+  moduleCom, 
+  loadModule, 
+  initModuleLoader 
+} from "@/components/loader/index";
+
+export { AppSource, AppAction };
+export type { AppInfo };
+export type { HostInfo };
+export type { SettingInfo };
+export type { LoginInfo, UserInfo };
+
+export { combineParams };
+
+export { 
+  isMicroApp, 
+  isBaseMicroApp, 
+  mainAppApis, 
+  mainAppEvents, 
+  mainPageUrl, 
+  initMainAppData 
+};
+export type {
+  MainAppData, 
+  MainOpenApis, 
+  MainOpenEvents
+};
+
+export type { MenuLink, RouteMeta, RouteRecord };
 export { LoaderRouter };
 
-export * from "@/components/loader/index";
+export { 
+  moduleAttrs, 
+  moduleUrl, 
+  moduleRecords, 
+  moduleCom, 
+  loadModule, 
+  initModuleLoader 
+};

package/src/stores/settingInfo.d.ts

@@ -1,10 +1,3 @@
-/**
- * 表格行操作区位置
- */
-export enum RowOperate {
-   LEFT = 1,
-   RIGHT = 2,
-}
 /**
  * 前端个性化配置
  */
@@ -18,9 +11,15 @@ export interface SettingInfo {
     */
    menuCollapse: boolean;
    /**
-    * 表格行操作区位置
+    * 表格头配置
     */
-   rowOperate: RowOperate;
+   tableColumns: {
+      /**
+       * PageUrl
+       * Columns
+       */
+      [key: string]: Record<string, any>[]
+   };
    /**
     * 使用语言
     */

package/src/stores/userInfo.d.ts

@@ -20,8 +20,19 @@ export interface UserInfo {
    readonly TenantId: string | null;
    /**
     * 用户级别
+    * - Super 超级管理员
+    * - Admin 系统管理员
+    * - User 用户
     */
    readonly UserLevel: string;
+   /**
+    * 角色列表
+    */
+   readonly Roles?: string[]
+   /**
+    * 权限列表
+    */
+   readonly Permissions?: string[];
 }
 
 /**

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 = {};
 
    // 合并选项对象