menu bug fixed

lambda-platform · May 4, 2023 · c76615f · c76615f
1 parent f06c6ea
commit c76615f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/components/Menu/HomeMenuRender.vue b/src/components/Menu/HomeMenuRender.vue
@@ -89,7 +89,10 @@ export default defineComponent({
       return getTitle(item, this.cruds)
     },
     hasItems (item) {
-      return item && item.children !== undefined ? item.children.length > 0 : false
+      if(item && item.children !== undefined && item.children.length > 0){
+        return item.children.filter(mItem => this.permissions[mItem.id] && this.permissions[mItem.id].show === true).length > 0
+      }
+      return  false
     },
   },
 })

diff --git a/src/components/Menu/Menu.vue b/src/components/Menu/Menu.vue
@@ -9,7 +9,9 @@
     :inlineIndent="21"
     :class="mode !== 'horizontal' ? 'SysMenu' : ''"
   >
-    <template v-for="m in menu.filter(mItem=>permissions.permissions[mItem.id].show === true)" :key="getPath(m)" >
+    <template v-for="m in menu.filter(
+        (mItem) => permissions.permissions[mItem.id] && permissions.permissions[mItem.id].show === true
+      )" :key="getPath(m)" >
       <RenderSubMenu :item="m" :cruds="kruds" :permissions="permissions.permissions"  :mode="mode" :collapsed="collapsed"  />
     </template>
   </a-menu>

diff --git a/src/plugins/core/axios.ts b/src/plugins/core/axios.ts
@@ -15,5 +15,7 @@ export function initAxios() {
 }
 export function setToken(token) {
   axios.defaults.headers.common['Authorization'] = 'Bearer '+token;
+  axios.defaults.headers.common['Content-Type'] =  'application/json';
+  axios.defaults.withCredentials = true;
 }
 export default axios