@pisell/core 1.0.25 → 1.0.26

package/es/menuManager/index.js

@@ -55,10 +55,27 @@ export var MenuManager = /*#__PURE__*/function () {
   }, {
     key: "findMenuItemByPath",
     value: function findMenuItemByPath(items, path) {
+      // 首先尝试精确匹配
       var menu = this.menuMaps[path];
       if (menu) {
         return menu;
       }
+
+      // 提取路径的主要部分（去掉查询参数和hash）
+      var getPathname = function getPathname(url) {
+        var questionMarkIndex = url.indexOf('?');
+        var hashIndex = url.indexOf('#');
+        var endIndex = url.length;
+        if (questionMarkIndex !== -1 && hashIndex !== -1) {
+          endIndex = Math.min(questionMarkIndex, hashIndex);
+        } else if (questionMarkIndex !== -1) {
+          endIndex = questionMarkIndex;
+        } else if (hashIndex !== -1) {
+          endIndex = hashIndex;
+        }
+        return url.substring(0, endIndex);
+      };
+      var inputPathname = getPathname(path);
       var _iterator = _createForOfIteratorHelper(items),
         _step;
       try {
@@ -69,6 +86,12 @@ export var MenuManager = /*#__PURE__*/function () {
           if (item !== null && item !== void 0 && (_item$path = item.path) !== null && _item$path !== void 0 && _item$path.includes('/:') && path.startsWith(item.path.split('/:')[0])) {
             return item;
           }
+
+          // 比较路径的主要部分（忽略查询参数）
+          var itemPathname = getPathname(item.path);
+          if (itemPathname === inputPathname) {
+            return item;
+          }
           if (item.children) {
             var found = this.findMenuItemByPath(item.children, path);
             if (found) return found;

package/lib/menuManager/index.js

@@ -62,10 +62,28 @@ var MenuManager = class {
     if (menu) {
       return menu;
     }
+    const getPathname = (url) => {
+      const questionMarkIndex = url.indexOf("?");
+      const hashIndex = url.indexOf("#");
+      let endIndex = url.length;
+      if (questionMarkIndex !== -1 && hashIndex !== -1) {
+        endIndex = Math.min(questionMarkIndex, hashIndex);
+      } else if (questionMarkIndex !== -1) {
+        endIndex = questionMarkIndex;
+      } else if (hashIndex !== -1) {
+        endIndex = hashIndex;
+      }
+      return url.substring(0, endIndex);
+    };
+    const inputPathname = getPathname(path);
     for (const item of items) {
       if (((_a = item == null ? void 0 : item.path) == null ? void 0 : _a.includes("/:")) && path.startsWith(item.path.split("/:")[0])) {
         return item;
       }
+      const itemPathname = getPathname(item.path);
+      if (itemPathname === inputPathname) {
+        return item;
+      }
       if (item.children) {
         const found = this.findMenuItemByPath(item.children, path);
         if (found) return found;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/core",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",