-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #79 from meadmin-cn/release
Release 1.1.19
- Loading branch information
Showing
23 changed files
with
372 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <template> | ||
| <div> | ||
| <mel-icon-expand v-if="themeConfig.menuCollapse" class="fold-expand pointer" @click="setMenuCollapse"> | ||
| </mel-icon-expand> | ||
| <mel-icon-fold v-else class="fold-expand pointer" @click="setMenuCollapse"></mel-icon-fold> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts" name="Expand"> | ||
| import { useSettingStore } from '@/store'; | ||
| const { themeConfig } = storeToRefs(useSettingStore()); | ||
| const setMenuCollapse = () => { | ||
| themeConfig.value.menuCollapse = !themeConfig.value.menuCollapse; | ||
| }; | ||
| </script> | ||
| <style lang="scss" scoped> | ||
| .expand { | ||
| } | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
src/layout/components/header/components/topBar/components/topMenu.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| <template> | ||
| <div style="position: relative; height: 100%"> | ||
| <el-menu class="top-menu" :default-active="activeMenu" mode="horizontal"> | ||
| <layout-menu-item | ||
| v-for="item in menus" | ||
| :key="item.path" | ||
| :no-child="true" | ||
| :item="item" | ||
| :collapse="themeConfig.menuCollapse" | ||
| /> | ||
| </el-menu> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts" name="TopMenu"> | ||
| import { useRouteStore, useSettingStore } from '@/store'; | ||
| const { themeConfig } = storeToRefs(useSettingStore()); | ||
| const routeStore = useRouteStore(); | ||
| const route = useRoute(); | ||
| const menus = computed(() => { | ||
| return routeStore.routes.filter((item) => { | ||
| return item.meta && !item.meta.hideMenu && item.meta.title; | ||
| }); | ||
| }); | ||
| const activeMenu = computed(() => { | ||
| return route.meta.menuIndex?.[0] + ''; | ||
| }); | ||
| </script> | ||
| <style lang="scss" scoped> | ||
| .top-menu { | ||
| position: absolute; | ||
| left: 0; | ||
| top: 0; | ||
| height: 100%; | ||
| right: 0; | ||
| border-bottom: 0; | ||
| --el-menu-item-height: #{$header-top-height}; | ||
| } | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.