Merge branch 'dev'

Former-commit-id: 10e6f58aea459fbcaeda4f8fc428e41d749f4dd5

src/layout/header-aside/layout.vue

@@ -8,7 +8,7 @@
     <!-- 主体内容 -->
     <div class="d2-layout-header-aside-content" flex="dir:top">
       <!-- 顶栏 -->
-      <div class="d2-theme-header">
+      <div class="d2-theme-header" flex-box="0">
         <div class="logo-group" :style="{width: isMenuAsideCollapse ? asideWidthCollapse : asideWidth}">
           <img v-if="isMenuAsideCollapse" :src="`${$baseUrl}image/theme/${d2adminThemeActiveSetting.name}/logo/icon-only.png`">
           <img v-else :src="`${$baseUrl}image/theme/${d2adminThemeActiveSetting.name}/logo/all.png`">
@@ -29,6 +29,7 @@
       <div class="d2-theme-container" flex-box="1" flex>
         <!-- 主体 侧边栏 -->
         <div
+          flex-box="0"
           ref="aside"
           class="d2-theme-container-aside"
           :style="{width: isMenuAsideCollapse ? asideWidthCollapse : asideWidth}">