@pubinfo/core 2.0.0-beta.15 → 2.0.0-beta.17

package/dist/{pick-DMuBL1OS.js → pick-DEgsMKda.js}

@@ -1,4 +1,4 @@
-import { c3 as u, c4 as f, c5 as l, c6 as o, c7 as k } from "./menu-x8H6Akde.js";
+import { c3 as u, c4 as f, c5 as l, c6 as o, c7 as k } from "./menu-Ddxel9ck.js";
 function v(n, r, s) {
   for (var a = -1, c = r.length, t = {}; ++a < c; ) {
     var e = r[a], i = u(n, e);

package/dist/request.js

@@ -1,7 +1,7 @@
 import { createAlova as et } from "alova";
 import { createServerTokenAuthentication as tt } from "alova/client";
 import nt from "alova/vue";
-import { u as ue, $ as rt, e as Ne } from "./menu-x8H6Akde.js";
+import { u as ue, $ as rt, e as Ne } from "./menu-Ddxel9ck.js";
 import "pinia-plugin-persistedstate";
 import "vue";
 const Y = "undefined", st = void 0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/core",
   "type": "module",
-  "version": "2.0.0-beta.15",
+  "version": "2.0.0-beta.17",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -28,7 +28,7 @@
     "vue": "^3.5.13",
     "vue-i18n": "^10.0.5",
     "vue-router": "^4.5.0",
-    "@pubinfo/config": "2.0.0-beta.15"
+    "@pubinfo/config": "2.0.0-beta.17"
   },
   "dependencies": {
     "@alova/adapter-axios": "^2.0.13",
@@ -85,7 +85,7 @@
     "vue": "^3.5.13",
     "vue-i18n": "^10.0.5",
     "vue-router": "^4.5.0",
-    "@pubinfo/config": "2.0.0-beta.15"
+    "@pubinfo/config": "2.0.0-beta.17"
   },
   "scripts": {
     "dev": "vite build -w -m watch",

package/src/context.ts

@@ -1,7 +1,6 @@
 import type { Context } from './interface';
 import { createHooks } from 'hookable';
 import { auth, basic } from 'pubinfo:project/api/request';
-import layout from 'pubinfo:project/layouts/index.vue';
 
 export const hooks = createHooks();
 
@@ -24,7 +23,7 @@ export function usePubinfoContext() {
  */
 export function readProject() {
   return {
-    layout,
+    layout: () => import('pubinfo:project/layouts/index.vue'),
     request: { auth, basic },
   };
 }

package/src/layout/components/Header/TopMode/index.vue

@@ -31,8 +31,6 @@ const menuRef = ref<HTMLElement | null>();
 const { width } = useElementSize(menuRef);
 const menuHideIndex = ref(0);
 
-watchMenuItem();
-
 const moreApple = computed(() => {
   return menuHideIndex.value === menuStore.allMenus.length - 1;
 });
@@ -42,19 +40,6 @@ function moreApplyClick(index: number, item: Menu.recordMainRaw) {
   switchTo(menuIndex, item);
 }
 
-function watchMenuItem() {
-  onMounted(() => {
-    watch(
-      width,
-      () => {
-        menuHideIndex.value = fitMenus();
-      },
-      {
-        immediate: true,
-      });
-  });
-}
-
 // 计算顶部菜单宽度
 function fitMenus() {
   const containerRoot = menuRef.value!;
@@ -89,6 +74,17 @@ function fitMenus() {
 
   return restrictedIndex;
 }
+
+onMounted(() => {
+  watch(
+    width,
+    () => {
+      menuHideIndex.value = fitMenus();
+    },
+    {
+      immediate: true,
+    });
+});
 </script>
 
 <template>
@@ -99,7 +95,7 @@ function fitMenus() {
         [`menu-active-${settingsStore.settings.menu.menuActiveStyle}`]: settingsStore.settings.menu.menuActiveStyle !== '',
       }"
     >
-      <template v-for="(item, index) in menuStore.allMenus" :key="index">
+      <template v-for="(item, index) in menuStore.allMenus" :key="item?.meta?.title || index">
         <div
           class="menu-item relative transition-all"
           invisible

package/src/stores/modules/menu.ts

@@ -185,13 +185,36 @@ const useMenuStore = defineStore(
       }
       else {
         // 如果是 string 类型，则认为是路由，需要查找对应的主导航索引
-        const findIndex = allMenus.value.findIndex(item => item.children.some(r => data.indexOf(`${r.path}/`) === 0 || data === r.path));
+        const findIndex = findRootIndexByPath(allMenus.value, data);
         if (findIndex >= 0) {
           actived.value = findIndex;
         }
       }
     }
 
+    /**
+     * 根据路径查找主导航索引
+     */
+    function findRootIndexByPath(routes: Menu.recordRaw[], targetPath: string) {
+      function containsPath(route: Menu.recordRaw): boolean {
+        if (route.path === targetPath) {
+          return true;
+        }
+        if (route.children) {
+          return route.children.some(child => containsPath(child));
+        }
+        return false;
+      }
+
+      for (let i = 0; i < routes.length; i++) {
+        if (containsPath(routes[i])) {
+          return i;
+        }
+      }
+
+      return 0;
+    }
+
     return {
       menus,
       actived,

package/src/utils/watermark.ts

@@ -68,7 +68,7 @@ export default function wmFn() {
     parent_width: 0,
     parent_height: 0,
     parent_node: null,
-    monitor: true,
+    monitor: false,
   };
   let forceRemove = false;
   const watermarkDom = new MutationObserver(domChangeCallback);