@pubinfo/core 2.0.3 → 2.0.5

package/dist/utils/index.d.ts

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

package/dist/utils/publicKey.d.ts

@@ -0,0 +1,4 @@
+/**
+ * 使用 `publicKey` 进行加密
+ */
+export declare function publicKeyEncryption(content: string): Promise<string>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/core",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -26,8 +26,8 @@
     "pinia": "^3.0.3",
     "vue": "^3.5.17",
     "vue-router": "^4.5.1",
-    "@pubinfo/config": "2.0.3",
-    "@pubinfo/vite": "2.0.3"
+    "@pubinfo/config": "2.0.5",
+    "@pubinfo/vite": "2.0.5"
   },
   "dependencies": {
     "@alova/adapter-axios": "^2.0.16",
@@ -85,8 +85,8 @@
     "vite-plugin-dts": "^4.5.4",
     "vue": "^3.5.17",
     "vue-router": "^4.5.1",
-    "@pubinfo/config": "2.0.3",
-    "@pubinfo/vite": "2.0.3"
+    "@pubinfo/config": "2.0.5",
+    "@pubinfo/vite": "2.0.5"
   },
   "scripts": {
     "dev": "vite build -w -m watch",

package/src/built-in/layout-component/components/Header/{TopMode → HeaderFullMenu}/index.vue

@@ -9,7 +9,7 @@ import More from './More.vue';
 import NotCursor from './NotCursor.vue';
 
 defineOptions({
-  name: 'TopMode',
+  name: 'LayoutHeaderFullMenu',
 });
 
 const { settingsStore, menuStore, generateTitle } = useContext();

package/src/built-in/layout-component/components/Header/HeaderMenu.vue

@@ -0,0 +1,19 @@
+<script setup lang="ts">
+import { useContext } from '../../composables/useContext';
+
+defineOptions({
+  name: 'LayoutHeaderMenu',
+});
+
+const HeaderFullMenu = defineAsyncComponent(() => import('./HeaderFullMenu/index.vue'));
+const HeaderThinMenu = defineAsyncComponent(() => import('./HeaderThinMenu.vue'));
+
+const { settingsStore } = useContext();
+</script>
+
+<template>
+  <!-- 顶部模式 -->
+  <HeaderFullMenu v-if="settingsStore.settings.menu.menuMode === 'head'" />
+  <!-- 顶部精简模式 -->
+  <HeaderThinMenu v-else-if="settingsStore.settings.menu.menuMode === 'only-head'" />
+</template>

package/src/built-in/layout-component/components/Header/{TopThinMode.vue → HeaderThinMenu.vue}

@@ -5,7 +5,7 @@ import Menu from '../Menu/index.vue';
 =               Vue SFC Options 配置           =
 ============================================= */
 defineOptions({
-  name: 'TopThinMode',
+  name: 'LayoutHeaderThinMenu',
 });
 /* =============================================
 =                   逻辑代码                   =

package/src/built-in/layout-component/components/Header/index.vue

@@ -2,14 +2,12 @@
 import { useContext } from '../../composables/useContext';
 import Logo from '../Logo/index.vue';
 import Tools from '../Tools/index.vue';
+import HeaderMenu from './HeaderMenu.vue';
 
 defineOptions({
   name: 'LayoutHeader',
 });
 
-const TopMode = defineAsyncComponent(() => import('./TopMode/index.vue'));
-const TopThinMode = defineAsyncComponent(() => import('./TopThinMode.vue'));
-
 const { settingsStore } = useContext();
 </script>
 
@@ -23,10 +21,7 @@ const { settingsStore } = useContext();
           </slot>
 
           <slot name="menu">
-            <!-- 顶部模式 -->
-            <TopMode v-if="settingsStore.settings.menu.menuMode === 'head'" />
-            <!-- 顶部精简模式 -->
-            <TopThinMode v-else-if="settingsStore.settings.menu.menuMode === 'only-head'" />
+            <HeaderMenu />
           </slot>
         </div>
 

package/src/built-in/layout-component/components/Sidebar/index.vue

@@ -1,10 +1,17 @@
 <script setup lang="ts">
+import { useContext } from '../../composables/useContext';
 import MainSidebar from './MainSidebar.vue';
 import SubSidebar from './SubSidebar.vue';
 
 defineOptions({
   name: 'LayoutSidebar',
 });
+
+const { settingsStore } = useContext();
+
+defineExpose({
+  toggleSidebarCollapse: () => settingsStore.toggleSidebarCollapse(),
+});
 </script>
 
 <template>

package/src/built-in/layout-component/composables/useGetComputedStyle.ts

@@ -7,10 +7,10 @@ import { useContext } from './useContext';
  * @returns 样式属性值的整数形式
  */
 export function useGetComputedStyle(property: string, root: HTMLElement = document.documentElement) {
-  return Number.parseInt(getComputedStyle(root).getPropertyValue(property));
+  return getComputedStyle(root).getPropertyValue(property).trim();
 }
 
-type unit = `${string}px`;
+type unit = string;
 
 /**
  * 根据各种设置和条件计算主侧边栏和子侧边栏的实际宽度。
@@ -28,7 +28,7 @@ export function useGetSidebarActualWidth() {
       return '0px';
     }
     else {
-      return `${useGetComputedStyle('--g-main-sidebar-width')}px`;
+      return useGetComputedStyle('--g-main-sidebar-width');
     }
   });
 
@@ -39,18 +39,18 @@ export function useGetSidebarActualWidth() {
    */
   const subSidebarActualWidth = computed<unit>(() => {
     let actualWidth = useGetComputedStyle('--g-sub-sidebar-width');
-    const subSidebarActualWidth = settingsStore.settings.menu.subMenuCollapse;
+    const _subSidebarActualWidth = settingsStore.settings.menu.subMenuCollapse;
     const subMenuOnlyOneHide = settingsStore.settings.menu.subMenuOnlyOneHide;
     const menuMode = settingsStore.settings.menu.menuMode;
     const isMobile = settingsStore.mode !== 'mobile';
     const onlySideOrHead = ['only-side', 'only-head'].includes(menuMode);
 
-    if (subSidebarActualWidth && isMobile) {
+    if (_subSidebarActualWidth && isMobile) {
       actualWidth = useGetComputedStyle('--g-sub-sidebar-collapse-width');
     }
 
     if (onlySideOrHead && isMobile) {
-      actualWidth = 0;
+      actualWidth = '0px';
     }
     if (
       subMenuOnlyOneHide
@@ -60,10 +60,13 @@ export function useGetSidebarActualWidth() {
         || menuStore.sidebarMenus[0]?.children.every(item => item.meta?.sidebar === false)
       )
     ) {
-      actualWidth = 0;
+      actualWidth = '0px';
     }
-    return `${actualWidth}px`;
+    return actualWidth;
   });
 
-  return { mainSidebarActualWidth, subSidebarActualWidth };
+  return {
+    mainSidebarActualWidth,
+    subSidebarActualWidth,
+  };
 }

package/src/built-in/layout-component/index.ts

@@ -6,7 +6,12 @@ import { defineSystemRoutes } from '@/features';
 import { Provider as LayoutProvider } from './provider';
 import Layout from './Layout.vue';
 import LayoutContent from './components/Content/index.vue';
+
 import LayoutHeader from './components/Header/index.vue';
+import LayoutHeaderMenu from './components/Header/HeaderMenu.vue';
+import LayoutHeaderFullMenu from './components/Header/HeaderFullMenu/index.vue';
+import LayoutHeaderThinMenu from './components/Header/HeaderThinMenu.vue';
+
 import LayoutSidebar from './components/Sidebar/index.vue';
 import LayoutTopbar from './components/Topbar/index.vue';
 
@@ -71,6 +76,10 @@ export const Tool = {
 
 Layout.Provider = LayoutProvider;
 Layout.Header = LayoutHeader;
+Layout.HeaderMenu = LayoutHeaderMenu;
+Layout.HeaderFullMenu = LayoutHeaderFullMenu;
+Layout.HeaderThinMenu = LayoutHeaderThinMenu;
+Layout.Header = LayoutHeader;
 Layout.Content = LayoutContent;
 Layout.Sidebar = LayoutSidebar;
 Layout.Topbar = LayoutTopbar;
@@ -79,7 +88,12 @@ export {
   LayoutProvider,
   Layout,
   LayoutContent,
+
   LayoutHeader,
+  LayoutHeaderMenu,
+  LayoutHeaderFullMenu,
+  LayoutHeaderThinMenu,
+
   LayoutSidebar,
   LayoutTopbar,
 

package/src/core/ctx.ts

@@ -1,5 +1,5 @@
 import { createHooks } from 'hookable';
-import { getPubinfoNamespace } from '@/utils';
+import { getPubinfoNamespace } from '../utils/global';
 
 const HOOKS_KEY = '__pubinfo_core_hooks__';
 type HookStore = ReturnType<typeof createHooks>;

package/src/core/resolver/icon.ts

@@ -1,5 +1,5 @@
 import type { ModuleRecord } from './resolver';
-import { getPubinfoNamespace } from '@/utils';
+import { getPubinfoNamespace } from '../../utils/global';
 import { loadProjectModules, readProjectModules } from './resolver';
 
 // 持久化图标模块，支持 HMR 后恢复

package/src/features/stores/modules/user.ts

@@ -5,8 +5,8 @@ import { defineStore } from 'pinia';
 import { postAuthChangeLoginOrg, postAuthLogin } from '@/features/api/modules/auth';
 import { getRbacResourceGrantedResources, getRbacUserUserEntireInfo, putRbacUserChangePassword } from '@/features/api/modules/rbac';
 import { usePubinfoContext } from '@/features/context';
+import { publicKeyEncryption } from '@/utils';
 import { STORE_NAME } from '../enum';
-import { getEncryptedData } from '../utils';
 
 export interface UserStore {
   /** 用户信息 */
@@ -117,7 +117,7 @@ const useUserStore = defineStore<STORE_NAME.USER, UserStore>(
         captchas: code,
         loginType = 'password',
       } = data;
-      const loginPwd = await getEncryptedData(password);
+      const loginPwd = await publicKeyEncryption(password);
       const result = await postAuthLogin({
         loginType,
         loginName,
@@ -179,8 +179,8 @@ const useUserStore = defineStore<STORE_NAME.USER, UserStore>(
       if (form.token) {
         headers.authorization = form.token;
       }
-      const encryptedOldpassword = await getEncryptedData(form.oldPassword);
-      const encryptedNewpassword = await getEncryptedData(form.newPassword);
+      const encryptedOldpassword = await publicKeyEncryption(form.oldPassword);
+      const encryptedNewpassword = await publicKeyEncryption(form.newPassword);
       const res = await putRbacUserChangePassword({
         oldPassword: encryptedOldpassword,
         newPassword: encryptedNewpassword,

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

@@ -1,2 +1 @@
-export * from './crypto';
 export * from './routerHelper';

package/src/index.ts

@@ -114,6 +114,7 @@ export {
   createRawContext,
   getPersistedState,
   getPubinfoNamespace,
+  publicKeyEncryption,
   setPersistedState,
   storage,
   wrapProxy,

package/src/utils/index.ts

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

package/src/{features/stores/utils/crypto.ts → utils/publicKey.ts}

@@ -7,18 +7,17 @@ function compilePublicKey(key: string) {
   return compiled({ publickKey: key });
 }
 
-async function getPem() {
-  const { data } = await getAuthLoginKey();
-  return compilePublicKey(data!);
+async function getPublicKey() {
+  const res = await getAuthLoginKey();
+  return compilePublicKey(res.data ?? '');
 }
 
-async function encryptWithPublicKey(publicKey: string, data: string) {
+/**
+ * 使用 `publicKey` 进行加密
+ */
+export async function publicKeyEncryption(content: string) {
+  const publicKey = await getPublicKey();
   const encryptor = new JSEncrypt();
   encryptor.setPublicKey(publicKey);
-  return encryptor.encrypt(data) as string;
-}
-
-export async function getEncryptedData(str: string) {
-  const key = await getPem();
-  return await encryptWithPublicKey(key, str);
+  return encryptor.encrypt(content) as string;
 }

package/dist/TopThinMode-C4ENwLBo.js

@@ -1,35 +0,0 @@
-import { defineComponent as a, ref as l, createElementBlock as m, openBlock as i, withModifiers as c, createVNode as d, normalizeClass as f, unref as e } from "vue";
-import { bL as p, bT as _ } from "./index-Dm0Yz_my.js";
-import { useRoute as h } from "vue-router";
-const y = /* @__PURE__ */ a({
-  name: "TopThinMode",
-  __name: "TopThinMode",
-  setup(v) {
-    const o = h(), { settingsStore: n, menuStore: u } = p(), s = l();
-    function r(t) {
-      s.value.scrollBy({
-        left: (t.deltaY || t.detail) > 0 ? 50 : -50
-      });
-    }
-    return (t, M) => (i(), m("div", {
-      ref_key: "menuRef",
-      ref: s,
-      class: "menu-container",
-      onWheel: c(r, ["prevent"])
-    }, [
-      d(_, {
-        menu: e(u).allMenus,
-        value: e(o).meta.activeMenu || e(o).path,
-        mode: "horizontal",
-        "show-collapse-name": "",
-        rounded: e(n).settings.menu.isRounded,
-        class: f(["menu", {
-          [`menu-active-${e(n).settings.menu.menuActiveStyle}`]: e(n).settings.menu.menuActiveStyle !== ""
-        }])
-      }, null, 8, ["menu", "value", "rounded", "class"])
-    ], 544));
-  }
-});
-export {
-  y as default
-};

package/dist/features/stores/utils/crypto.d.ts

@@ -1 +0,0 @@
-export declare function getEncryptedData(str: string): Promise<string>;