paas-component-library 1.0.93 → 1.0.94

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "paas-component-library",
   "private": false,
-  "version": "1.0.93",
+  "version": "1.0.94",
   "type": "module",
   "files": [
     "dist",

package/src/components/PaasMenu/index.vue

@@ -148,28 +148,30 @@ export default {
 
         autoSelectMenu() {
             let path = window.location.hash || '';
-            path = path.replace('#', '');
+            path = path.replace('#', '').split('?')[0];
 
             if (!this.data || this.data.length === 0) return;
 
-            let current = this.current;
-            if (!current) {
-                current = this.data[0]?.url || '';
+            let matchedItem = null;
+            let currentFromStore = this.current;
+
+            if (path && path !== '/') {
+                matchedItem = this.findItemByKey(this.data, path);
+                if (!matchedItem) {
+                    matchedItem = this.findItemByPathPrefix(this.data, path);
+                }
             }
-            if (path === '' || path === '/') {
-                path = current;
+
+            if (!matchedItem && currentFromStore) {
+                matchedItem = this.findItemByKey(this.data, currentFromStore);
+            }
+
+            if (!matchedItem) {
+                matchedItem = this.findFirstLeaf(this.data);
             }
-            const matchedItem = this.findItemByKey(this.data, current);
 
             if (matchedItem) {
                 this.selectAndOpenMenu(matchedItem);
-                this.$router.replace(path); // 避免堆叠历史
-            } else {
-                const firstItem = this.findFirstLeaf(this.data);
-                if (firstItem) {
-                    this.selectAndOpenMenu(firstItem);
-                    this.$router.replace(path); // 避免堆叠历史
-                }
             }
         },
 
@@ -202,6 +204,20 @@ export default {
             return null;
         },
 
+        findItemByPathPrefix(menuList, path) {
+            if (!menuList || !path) return null;
+            for (const item of menuList) {
+                if (path.startsWith(item.key + '/') || path === item.key) {
+                    return item;
+                }
+                if (item.children) {
+                    const found = this.findItemByPathPrefix(item.children, path);
+                    if (found) return found;
+                }
+            }
+            return null;
+        },
+
         findFirstLeaf(menuList) {
             for (const item of menuList) {
                 if (item.children && item.children.length > 0) {