Merge remote-tracking branch 'origin/main'

# Conflicts: # .data/content/contents.sqlite # .output/nitro.json # .output/public/__nuxt_content/docs/sql_dump.txt # .output/server/chunks/build/client.precomputed.mjs # .output/server/chunks/build/database.compressed.mjs # .output/server/chunks/build/server.mjs # .output/server/chunks/build/server.mjs.map # .output/server/chunks/build/styles.mjs # .output/server/chunks/nitro/nitro.mjs # .output/server/package.json # app/config/setting.ts # ecosystem.config.cjs
2026-09-11 12:26:45 +08:00
parent c29c3be942 105ed4cbee
commit b3204aa52f
143 changed files with 81 additions and 12166 deletions
@@ -115,6 +115,7 @@

 <script setup lang="ts">
 import { mainNav } from '@/config/nav'
+import { useMenu } from '@/composables/useMenu'
 import { getUserInfo } from '@/api/layout'
 import type { User } from '@/api/system/user/model'
 import { getToken, removeToken } from '@/utils/token-util'
@@ -122,7 +123,8 @@ import { clearAuthz, setAuthzFromUser } from '@/utils/permission'
 import { UserOutlined, ProfileOutlined, MessageOutlined } from '@ant-design/icons-vue'


-const nav = computed(() => mainNav)
+const menu = useMenu()
+const nav = computed(() => menu.value.length ? menu.value : mainNav)
 const route = useRoute()
 const open = ref(false)