@lambo-design/pro-layout 1.0.0-beta.155 → 1.0.0-beta.157

package/package.json

@@ -1,17 +1,17 @@
-{
-  "name": "@lambo-design/pro-layout",
-  "version": "1.0.0-beta.155",
-  "description": "",
-  "main": "index.js",
-  "scripts": {},
-  "author": "lambo",
-  "license": "ISC",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "devDependencies": {
-    "@lambo-design/core": "workspace:^",
-    "@lambo-design/shared": "workspace:^"
-  }
-}
+{
+  "name": "@lambo-design/pro-layout",
+  "version": "1.0.0-beta.157",
+  "description": "",
+  "main": "index.js",
+  "author": "lambo",
+  "license": "ISC",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "devDependencies": {
+    "@lambo-design/shared": "^1.0.0-beta.97",
+    "@lambo-design/core": "^4.7.1-beta.105"
+  },
+  "scripts": {}
+}

package/src/components/pro-layout-sider-menu-item.vue

@@ -44,6 +44,10 @@ export default {
     serverContext: {
       type: String,
       default: () => config.upmsServerContext
+    },
+    collectedMenus: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
@@ -51,31 +55,36 @@ export default {
       isCollected: {}, // 使用对象来记录每个子菜单的收藏状态
     };
   },
-  mounted() {
-    this.fetchCollectedMenus();
-  },
+  // mounted() {
+  //   this.fetchCollectedMenus();
+  // },
   methods: {
-    fetchCollectedMenus() {
-      ajax.get(this.serverContext + "/manage/upmsMenuCollect/list").then(resp => {
-        const collectedMenus = resp.data.data;
-        if (Array.isArray(collectedMenus)) {
-          collectedMenus.forEach(menu => {
-            // 使用 menu 的 name 属性作为键
-            this.$set(this.isCollected, menu.name, true);
-          });
-        } else {
-          console.error("Expected an array but got:", typeof collectedMenus);
-        }
-        ;
-      }).catch(err => {
-        console.error("Error fetching collected menus:", err);
-      });
-    },
+    // fetchCollectedMenus() {
+    //   ajax.get(this.serverContext + "/manage/upmsMenuCollect/list").then(resp => {
+    //     const collectedMenus = resp.data.data;
+    //     if (Array.isArray(collectedMenus)) {
+    //       collectedMenus.forEach(menu => {
+    //         // 使用 menu 的 name 属性作为键
+    //         this.$set(this.isCollected, menu.name, true);
+    //       });
+    //     } else {
+    //       console.error("Expected an array but got:", typeof collectedMenus);
+    //     }
+    //     ;
+    //   }).catch(err => {
+    //     console.error("Error fetching collected menus:", err);
+    //   });
+    // },
     addHistory(item) {
       let res = menuHistory(item.meta.appId, item.meta.pid)
     },
     toggleCollect(item) {
       const self = this;
+      self.collectedMenus.forEach(menu => {
+        // 使用 menu 的 name 属性作为键
+        self.$set(self.isCollected, menu.name, true);
+      });
+
       let list = this.$store.state.app.originalPermissionList;
 
       let item1 = list.find(item1 => item1.name == item.component);

package/src/components/pro-layout-sider.vue

@@ -8,7 +8,9 @@
         <template v-if="item.children && item.children.length === 1">
           <ProLayoutSiderMenuItem v-if="showChildren(item)"
                                   :key="`menu-${item.name}`"
-                                  :parent-item="item" :server-context="serverContext">
+                                  :parent-item="item"
+                                  :collected-menus="collectedMenus"
+                                  :server-context="serverContext">
           </ProLayoutSiderMenuItem>
           <MenuItem v-else :key="`menu-${item.children[0].name}`"
                     :name="getNameOrHref(item, true)">
@@ -68,6 +70,7 @@ import {
   tagExists
 } from "@lambo-design/shared/utils/platform";
 import config from "@lambo-design/shared/config/config";
+import ajax from "@lambo-design/shared/utils/ajax";
 
 export default {
   name: "pro-layout-sider",
@@ -101,10 +104,14 @@ export default {
       selectedTopParent: '',
       activeIcon: null,
       tagValue: '',
-      tagList: []
+      tagList: [],
+      collectedMenus: [],
     }
   },
   mixins:[sider],
+  mounted() {
+    this.fetchCollectedMenus();
+  },
   methods: {
     initListener(){
       Bus.$on('nav-list',(data)=>{
@@ -244,7 +251,24 @@ export default {
         }
       }
       return openNames
-    }
+    },
+    fetchCollectedMenus() {
+      ajax.get(this.serverContext + "/manage/upmsMenuCollect/list").then(resp => {
+        const collectedMenus = resp.data.data;
+        if (Array.isArray(collectedMenus)) {
+          this.collectedMenus = collectedMenus
+          // collectedMenus.forEach(menu => {
+          //   // 使用 menu 的 name 属性作为键
+          //   this.$set(this.isCollected, menu.name, true);
+          // });
+        } else {
+          console.error("Expected an array but got:", typeof collectedMenus);
+        }
+        ;
+      }).catch(err => {
+        console.error("Error fetching collected menus:", err);
+      });
+    },
   },
   watch:{
     activeName(){