@pubinfo/core 2.0.0-rc.3 → 2.0.0-rc.5

package/src/features/stores/utils/routerHelper.ts

@@ -1,6 +1,6 @@
 import type { RouterMetaRawBaseOptions } from '#/vue-router';
 import type { RequireExactlyOne } from 'type-fest';
-import { cloneDeep, isUndefined, omitBy } from 'lodash-es';
+import { cloneDeep, isEmpty, isUndefined, omitBy } from 'lodash-es';
 import { setupDefaultLayout, setupPage } from '@/core';
 import { RESOURCE_TYPE } from '@/features/enum';
 
@@ -26,7 +26,7 @@ export function formatBackRoutes(
 ): BackEndRoute[] {
   const backEndRoutes = filterRoutes(routes, [RESOURCE_TYPE.BUTTON]);
 
-  return backEndRoutes.map((route: API.PubResourceTreeBo) => {
+  const formatRoutes = backEndRoutes.map((route: API.PubResourceTreeBo) => {
     const children = route?.children && route.children.length > 0
       ? formatBackRoutes(route.children, route)
       : [];
@@ -37,7 +37,6 @@ export function formatBackRoutes(
       icon: route?.icon,
       ...route?.meta,
 
-      // CLOSE: 根据资源类型设置正确的显示属性
       // 应用和动态应用不需要在侧边栏和标签栏显示，因为它们通过TopMode渲染
       ...(route.type === RESOURCE_TYPE.APP || route.type === RESOURCE_TYPE.DYNAMIC_APP
         ? {
@@ -56,7 +55,6 @@ export function formatBackRoutes(
         : {}),
     }, isUndefined) as BackEndRoute['meta'];
 
-    // TODO: 这里的逻辑可能需要根据实际情况调整
     const finalRoute = cloneDeep(omitBy<BackEndRoute>({
       name: route?.meta?.routeName ?? undefined,
       path: route?.meta?.url ?? undefined,
@@ -87,6 +85,8 @@ export function formatBackRoutes(
         return finalRoute;
     }
   });
+
+  return isEmpty(parent) ? filterEmptyComponentRoutes(formatRoutes) : formatRoutes;
 }
 
 /** 过滤指定类型的路由 */
@@ -99,6 +99,37 @@ function filterRoutes(routes: API.PubResourceTreeBo[] = [], excludes: string[])
   });
 }
 
+/** 过滤找不到SFC组件的路由 */
+function filterEmptyComponentRoutes(routes: BackEndRoute[], minDepth = 3): BackEndRoute[] {
+  function recurse(route: BackEndRoute): BackEndRoute | null {
+    const children = route.children?.map(recurse).filter(Boolean) as BackEndRoute[] | undefined;
+
+    if (children && children.length > 0) {
+      return { ...route, children };
+    }
+
+    if (children?.length === 0 && route.component) {
+      // 叶子且有 component
+      const { children, ...rest } = route;
+      return { ...rest, children: [] };
+    }
+
+    return null;
+  }
+
+  function maxDepth(route: BackEndRoute): number {
+    if (!route.children || route.children.length === 0) {
+      return 1;
+    }
+    return 1 + Math.max(...route.children.map(maxDepth));
+  }
+
+  return routes
+    .map(recurse)
+    .filter((r): r is BackEndRoute => !!r)
+    .filter(r => maxDepth(r) >= minDepth);
+}
+
 /** 转换目录 */
 function transformIndex(route: BackEndRoute, parent: API.PubResourceTreeBo = {}): BackEndRoute {
   switch (parent.type) {

package/src/index.ts

@@ -3,11 +3,11 @@ import {
   Authentication,
   Authorization,
   LayoutComponent,
-  Locales,
   NProgress,
   PiniaPlugin,
   PreAccess,
   Settings,
+  SystemInfo,
 } from './built-in';
 import { createApp } from './core';
 import { createPubinfoContext } from './features/context/index.ts';
@@ -71,8 +71,8 @@ export function createPubinfo(options: PubinfoOptions) {
       Authorization(),
       LayoutComponent(),
       Settings(),
-      Locales(),
       NProgress(),
+      SystemInfo(),
       ...(options.modules ?? []),
     ],
   });
@@ -109,7 +109,12 @@ export * from './features';
 export {
   cleanup,
   cleanupWithoutUser,
+  clearPersistedState,
   createContext,
+  createRawContext,
+  getPersistedState,
+  getPubinfoNamespace,
+  setPersistedState,
   storage,
   wrapProxy,
 } from './utils';

package/src/utils/global.ts

@@ -0,0 +1,161 @@
+import type { UseContext } from 'unctx';
+import { createContext as createRawContext } from 'unctx';
+
+type PubinfoNamespace = Record<string, unknown>;
+
+function ensureNamespace(): PubinfoNamespace {
+  const g = globalThis as typeof globalThis & { __PUBINFO__?: PubinfoNamespace };
+  if (!g.__PUBINFO__) {
+    g.__PUBINFO__ = {};
+  }
+  return g.__PUBINFO__;
+}
+
+/**
+ * Return the shared __PUBINFO__ namespace, creating it if necessary.
+ */
+export function getPubinfoNamespace(): PubinfoNamespace {
+  return ensureNamespace();
+}
+
+interface PersistedContextOptions {
+  /**
+   * Optional key used to hydrate persisted state.
+   * Defaults to transforming `FooCtx` into `FooState`.
+   */
+  stateKey?: string
+  /**
+   * Toggle hydration behaviour. Enabled by default.
+   */
+  hydrate?: boolean
+  /**
+   * Automatically persist whenever ctx.set() is called.
+   */
+  persistOnSet?: boolean
+}
+
+/**
+ * Create (or reuse) a context stored on the global namespace and
+ * hydrate it from a persisted state if available.
+ */
+export function createContext<T>(
+  contextKey: string,
+  options: PersistedContextOptions = {},
+): UseContext<T> {
+  const namespace = ensureNamespace();
+
+  const normalized = normalizeKeys(contextKey, options.stateKey);
+
+  if (!namespace[normalized.contextKey]) {
+    const existing = normalized.aliasKey ? namespace[normalized.aliasKey] : undefined;
+    namespace[normalized.contextKey] = (existing as UseContext<T> | undefined) ?? createRawContext<T>();
+  }
+
+  const ctx = namespace[normalized.contextKey] as UseContext<T> & { __pubinfo_persisted?: boolean };
+
+  if (normalized.aliasKey) {
+    namespace[normalized.aliasKey] = ctx;
+  }
+
+  const { hydrate = true, persistOnSet = true } = options;
+  const hydrateKey = normalized.stateKey;
+
+  if (hydrateKey && persistOnSet && !ctx.__pubinfo_persisted) {
+    const originalSet = ctx.set.bind(ctx);
+    const originalUnset = ctx.unset.bind(ctx);
+
+    ctx.set = (instance?: T, replace?: boolean) => {
+      originalSet(instance, replace);
+      if (instance !== undefined) {
+        setPersistedState(hydrateKey, instance);
+      }
+      else {
+        clearPersistedState(hydrateKey);
+      }
+    };
+
+    ctx.unset = () => {
+      clearPersistedState(hydrateKey);
+      originalUnset();
+    };
+
+    ctx.__pubinfo_persisted = true;
+  }
+
+  if (hydrate && hydrateKey) {
+    const savedState = namespace[hydrateKey];
+    if (savedState !== undefined) {
+      try {
+        ctx.set(savedState as T);
+      }
+      catch {
+        // ignore hydration failures; callers can recover manually
+      }
+    }
+  }
+
+  return ctx;
+}
+
+/** Persist a value inside the __PUBINFO__ namespace. */
+export function setPersistedState<T>(stateKey: string, state: T) {
+  const namespace = ensureNamespace();
+  namespace[stateKey] = state;
+}
+
+/** Retrieve a value from the __PUBINFO__ namespace. */
+export function getPersistedState<T>(stateKey: string): T | undefined {
+  const namespace = ensureNamespace();
+  return namespace[stateKey] as T | undefined;
+}
+
+/** Remove a value from the __PUBINFO__ namespace. */
+export function clearPersistedState(stateKey: string) {
+  const namespace = ensureNamespace();
+  if (stateKey in namespace) {
+    delete namespace[stateKey];
+  }
+}
+
+interface NormalizedKeys {
+  contextKey: string
+  stateKey?: string
+  aliasKey?: string
+}
+
+function normalizeKeys(contextKey: string, explicitStateKey?: string): NormalizedKeys {
+  if (explicitStateKey) {
+    return { contextKey, stateKey: explicitStateKey };
+  }
+
+  if (contextKey.endsWith('Ctx')) {
+    const base = contextKey.slice(0, -3);
+    return {
+      contextKey,
+      stateKey: base ? `${base}State` : undefined,
+    };
+  }
+
+  if (contextKey.endsWith('Context')) {
+    const base = contextKey.slice(0, -7);
+    if (base) {
+      return {
+        contextKey: `${base}Ctx`,
+        stateKey: `${base}State`,
+        aliasKey: contextKey,
+      };
+    }
+  }
+
+  const base = contextKey;
+  if (!base) {
+    return { contextKey, stateKey: undefined };
+  }
+
+  const normalizedContextKey = `${base}Ctx`;
+  return {
+    contextKey: normalizedContextKey,
+    stateKey: `${base}State`,
+    aliasKey: normalizedContextKey !== contextKey ? contextKey : undefined,
+  };
+}

package/src/utils/index.ts

@@ -1,5 +1,6 @@
 export * from './cleanup';
+export * from './global';
 export * from './path';
 export * from './proxy';
 export * from './storage';
-export { createContext } from 'unctx';
+export { createContext as createRawContext } from 'unctx';

package/src/utils/proxy.ts

@@ -1,3 +1,5 @@
+import { getPersistedState } from './global';
+
 export function wrapProxy<T extends Record<K, any>, K extends keyof T>(
   fn: () => T,
   key: K,
@@ -10,14 +12,11 @@ export function wrapProxy<T extends Record<K, any>, K extends keyof T>(
       }
       catch (e) {
         // 1. 从全局缓存读取
-        const g: any = globalThis as any;
-        if (g.__PUBINFO__?.state) {
-          const cached = g.__PUBINFO__.state as T;
-          if (cached && cached[key]) {
-            const inst = cached[key];
-            const val = (inst as any)[prop];
-            return typeof val === 'function' ? val.bind(inst) : val;
-          }
+        const cached = getPersistedState<T>('state');
+        if (cached && cached[key]) {
+          const inst = cached[key];
+          const val = (inst as any)[prop];
+          return typeof val === 'function' ? val.bind(inst) : val;
         }
         throw e;
       }

package/types/global.d.ts

@@ -0,0 +1,7 @@
+declare const __SYSTEM_INFO__: {
+  pkg: {
+    dependencies: Record<string, string>
+    devDependencies: Record<string, string>
+  }
+  buildTime: string
+};

package/types/menu.d.ts

@@ -24,6 +24,16 @@ export declare namespace Menu {
       icon?: string
       activeIcon?: string
       auth?: string | string[]
+      iconOptions?: {
+        angle?: number | string
+        background?: string | {
+          from: string
+          to: string
+        }
+        boxType?: 'square' | 'prism'
+        iconColor?: string
+        radius?: number | string
+      }
       sidebar?: boolean
       isDev?: boolean
       devText?: string

package/types/settings.d.ts

@@ -314,13 +314,6 @@ declare namespace Settings {
      */
     enableNotification?: boolean
 
-    /**
-     * 是否开启国际化
-     *
-     * @默认值 `true`
-     */
-    enableI18n?: boolean
-
     /**
      * 是否开启全屏
      *

package/types/vue-router.d.ts

@@ -4,7 +4,6 @@ import type { User } from './user';
 
 export interface RouterMetaRawBaseOptions {
   title: string | (() => string)
-  i18n: string
   icon: string
   activeIcon: string
   defaultOpened: boolean
@@ -36,7 +35,6 @@ export declare namespace Route {
 
   type mainMeta
     = | 'title'
-      | 'i18n'
       | 'icon'
       | 'activeIcon'
       | 'auth'
@@ -60,7 +58,6 @@ export declare namespace Route {
   interface breadcrumb {
     path: string
     title?: string | (() => string)
-    i18n?: string
     icon?: string
     activeIcon?: string
     hide: boolean

package/dist/SettingHome-Df7-AlWB.js

@@ -1,55 +0,0 @@
-import { _ as f } from "./HDivider.vue_vue_type_script_setup_true_lang-DIHR-9Yv.js";
-import { _ as b } from "./HInput.vue_vue_type_script_setup_true_lang-DBqCXRnn.js";
-import { _ as g } from "./HToggle-B-ZjSh6S.js";
-import { bL as V, bN as x } from "./index-Beb7_0-E.js";
-import { defineComponent as H, toRefs as v, createBlock as N, openBlock as C, withCtx as i, createElementVNode as s, createVNode as o, createTextVNode as a, unref as t } from "vue";
-import { R as _ } from "./question-line-CfkciTFq.js";
-const R = { class: "setting-item" }, S = { class: "label" }, T = { class: "setting-item" }, $ = { class: "label" }, Q = /* @__PURE__ */ H({
-  name: "SettingHome",
-  __name: "SettingHome",
-  setup(k) {
-    const { settingsStore: d } = V(), { home: n, toolbar: r } = v(d.settings);
-    return (B, e) => {
-      const m = x, p = g, u = b, c = f;
-      return C(), N(c, { title: "主页" }, {
-        default: i(() => [
-          s("div", R, [
-            s("div", S, [
-              e[2] || (e[2] = a(" 是否启用 ")),
-              o(m, { text: "该功能开启时，登录成功默认进入主页，反之则默认进入导航栏里第一个导航页面" }, {
-                default: i(() => [
-                  o(t(_))
-                ]),
-                _: 1
-              })
-            ]),
-            o(p, {
-              modelValue: t(n).enable,
-              "onUpdate:modelValue": e[0] || (e[0] = (l) => t(n).enable = l)
-            }, null, 8, ["modelValue"])
-          ]),
-          s("div", T, [
-            s("div", $, [
-              e[3] || (e[3] = a(" 主页名称 ")),
-              o(m, { text: "开启国际化时，该设置无效" }, {
-                default: i(() => [
-                  o(t(_))
-                ]),
-                _: 1
-              })
-            ]),
-            o(u, {
-              modelValue: t(n).title,
-              "onUpdate:modelValue": e[1] || (e[1] = (l) => t(n).title = l),
-              disabled: t(r).enableI18n
-            }, null, 8, ["modelValue", "disabled"])
-          ])
-        ]),
-        _: 1
-      });
-    };
-  }
-});
-export {
-  Q as default
-};