昨天衍生出来的bug：flex下的margin-right导致的。

在昨天的基础上：
1. 引入了flex.css，这个工具可以在实际开发中继续方便快速构建业务页面 —— 可以加一个页面说明
2. 将布局的部分从样式中脱离出来，在html里一目了然。
3. 测试情况：
测试环境：Chrome，IE11，Edge
—— 显示正常
—— 边框没有1px的问题
—— 标签过多显示正常


Former-commit-id: ed2ba5a009542d7ac1567c42445ba0cf0cf3b6f9 [formerly 175c91524fec7b37b134643b51eab50e4e9c2bc7] [formerly ed2ba5a009542d7ac1567c42445ba0cf0cf3b6f9 [formerly 175c91524fec7b37b134643b51eab50e4e9c2bc7] [formerly ed2ba5a009542d7ac1567c42445ba0cf0cf3b6f9 [formerly 175c91524fec7b37b134643b51eab50e4e9c2bc7] [formerly 175c91524fec7b37b134643b51eab50e4e9c2bc7 [formerly 75fc769098a2dd22f2570580e1e38a9211ba59a3 [formerly f5bb3ce14be07f93eeb61ef9b88df0a63a01a491]]]]]
Former-commit-id: 4ffb48d759ea3ba129aeeb77cfefb7b86fd91c76
Former-commit-id: f882c1ae2673b927ceb11f6eadeff0b43d5660d2
Former-commit-id: 0fec60f6d05afe04465adf11b0f3130c4b454b58 [formerly 072223429c32f5c05283726b1b5ad67cc7a6054b]
Former-commit-id: 7f6b6f9f23a0379c39bbedf03fe6520d437747ac
Former-commit-id: 9d55f0ff8170414c478360c6dddd74dafcc50e17
Former-commit-id: 3e81c2411638572ae500f07f2efb9976e8c1e710
Former-commit-id: b82c259e86a5a604901a12128a768da8262581b0
Former-commit-id: b0152867003988582a71dc6797f74f9189c7e051

package.json

@@ -46,7 +46,8 @@
     "vue-router": "^3.0.1",
     "vue-splitpane": "^1.0.2",
     "vuex": "^3.0.1",
-    "xlsx": "^0.12.0"
+    "xlsx": "^0.12.0",
+    "flex.css": "^1.1.7"
   },
   "devDependencies": {
     "@kazupon/vue-i18n-loader": "^0.3.0",

src/assets/style/theme/theme-base.scss.REMOVED.git-id

@@ -1 +1 @@
-2bcada21f21b92f000ee330f0c920982f9a96857
+ec0716e48b92232d3ddf7fdca575a565c951dff7

src/layout/header-aside/components/menu-side/index.vue

@@ -11,7 +11,7 @@
         <d2-layout-header-aside-menu-sub v-else :menu="menu" :key="menuIndex"/>
       </template>
     </el-menu>
-    <div v-if="menuAside.length === 0 && !isMenuAsideCollapse" class="d2-layout-header-aside-menu-empty">
+    <div v-if="menuAside.length === 0 && !isMenuAsideCollapse" class="d2-layout-header-aside-menu-empty" flex="dir:top main:center cross:center">
       <d2-icon name="inbox"/>
       <span>没有侧栏菜单</span>
     </div>

src/layout/header-aside/components/tabs/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="d2-multiple-page-control-group">
+  <div class="d2-multiple-page-control-group" flex>
-    <div class="d2-multiple-page-control-content">
+    <div class="d2-multiple-page-control-content" flex-box="1">
       <div class="d2-multiple-page-control-content-inner">
         <el-tabs
           class="d2-multiple-page-control"
@@ -18,7 +18,7 @@
         </el-tabs>
       </div>
     </div>
-    <div class="d2-multiple-page-control-btn">
+    <div class="d2-multiple-page-control-btn" flex-box="0">
       <el-dropdown
         split-button
         @click="handleControlBtnClick"

src/layout/header-aside/layout.vue

@@ -6,9 +6,9 @@
     <!-- 半透明遮罩 -->
     <div class="d2-layout-header-aside-mask"></div>
     <!-- 主体内容 -->
-    <div class="d2-layout-header-aside-content">
+    <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`">
@@ -26,20 +26,21 @@
         </div>
       </div>
       <!-- 下面 主体 -->
-      <div class="d2-theme-container">
+      <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}">
           <d2-menu-side/>
         </div>
         <!-- 主体 -->
-        <div class="d2-theme-container-main">
+        <div class="d2-theme-container-main" flex-box="1" flex="dir:top">
-          <div class="d2-theme-container-main-header">
+          <div class="d2-theme-container-main-header" flex-box="0">
             <d2-tabs/>
           </div>
-          <div class="d2-theme-container-main-body">
+          <div class="d2-theme-container-main-body" flex-box="1">
             <transition name="fade-transverse">
               <keep-alive :include="d2adminKeepAliveInclude">
                 <router-view/>

src/main.js

@@ -1,6 +1,8 @@
 import 'babel-polyfill'
 import Vue from 'vue'
 import App from './App'
+// flex.css
+import 'flex.css'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import VCharts from 'v-charts'