diff --git a/src/assets/sass/_global.scss b/src/assets/sass/_global.scss index 575a4bd8..287d915e 100644 --- a/src/assets/sass/_global.scss +++ b/src/assets/sass/_global.scss @@ -168,6 +168,13 @@ $alignSelfs: auto, flex-start, flex-end, center, baseline, stretch; } } } + &_g { + @for $i from -20 to 20 { + &-#{$i} { + flex-grow: #{$i}; + } + } + } // justify-content &_j_c { @each $var in $justifyContents { diff --git a/src/router/index.js b/src/router/index.js index b2dd48b1..514adc2c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -102,7 +102,7 @@ function addRoutes(menus = [], routeList = []) { component: dynamics[`../views/modules/iframe/index.vue`], meta: { id: item.id, - title: item.name, + label: item.name, type: item.type, url: item.url, dynamic: true, diff --git a/src/utils/enum.js b/src/utils/enum.js index 49261541..876c9ecb 100644 --- a/src/utils/enum.js +++ b/src/utils/enum.js @@ -52,7 +52,8 @@ export const MenuType = { MENU: 1, BUTTON: 2, IFRAME: 3, - URL: 4 + URL: 4, + GROUP: 5 } // 文件存储类型 export const FileStorageType = { diff --git a/src/views/layout/components/headbar/components/menu/index.vue b/src/views/layout/components/headbar/components/menu/index.vue index 72acff50..bc3f6e3c 100644 --- a/src/views/layout/components/headbar/components/menu/index.vue +++ b/src/views/layout/components/headbar/components/menu/index.vue @@ -34,10 +34,15 @@ watchEffect(() => { :active-text-color="menuTheme.activeTextColor" :unique-opened="true" mode="horizontal"> + + + +
+
@@ -45,12 +50,20 @@ watchEffect(() => { diff --git a/src/views/layout/components/headbar/index.vue b/src/views/layout/components/headbar/index.vue index 2708b488..834b94ad 100644 --- a/src/views/layout/components/headbar/index.vue +++ b/src/views/layout/components/headbar/index.vue @@ -1,25 +1,27 @@ diff --git a/src/views/layout/components/sub-menu/index.vue b/src/views/layout/components/sub-menu/index.vue index 93d1cade..03c52b6d 100644 --- a/src/views/layout/components/sub-menu/index.vue +++ b/src/views/layout/components/sub-menu/index.vue @@ -26,7 +26,14 @@ const clickHandle = () => {