Merge remote-tracking branch 'ruoyi/master'

# Conflicts: # README.md # ruoyi-ui/src/views/index.vue
2023-09-01 09:49:24 +08:00
parent f1bf2fdc9d f5a1b0c550
commit 84d107a4af
19 changed files with 90 additions and 58 deletions
--- a/ruoyi-ui/src/components/TopNav/index.vue
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@@ -6,7 +6,10 @@
  >
    <template v-for="(item, index) in topMenus">
      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
-        ><svg-icon :icon-class="item.meta.icon" />
+        ><svg-icon
+          v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+          :icon-class="item.meta.icon"
+        />
        {{ item.meta.title }}</el-menu-item
      >
    </template>