From 51b6229efe887898e8b25aad027c831c77040178 Mon Sep 17 00:00:00 2001
From: Lu Chaohai <luchaohai@cn.ibm.com>
Date: Tue, 31 Jul 2018 13:02:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=A8=E5=A4=A9=E8=A1=8D=E7=94=9F=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5=E7=9A=84bug=EF=BC=9Aflex=E4=B8=8B=E7=9A=84margin-righ?=
 =?UTF-8?q?t=E5=AF=BC=E8=87=B4=E7=9A=84=E3=80=82=20=E5=9C=A8=E6=98=A8?=
 =?UTF-8?q?=E5=A4=A9=E7=9A=84=E5=9F=BA=E7=A1=80=E4=B8=8A=EF=BC=9A=201.=20?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E4=BA=86flex.css=EF=BC=8C=E8=BF=99=E4=B8=AA?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=8F=AF=E4=BB=A5=E5=9C=A8=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=B8=AD=E7=BB=A7=E7=BB=AD=E6=96=B9=E4=BE=BF?=
 =?UTF-8?q?=E5=BF=AB=E9=80=9F=E6=9E=84=E5=BB=BA=E4=B8=9A=E5=8A=A1=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E2=80=94=E2=80=94=20=E5=8F=AF=E4=BB=A5=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=A1=B5=E9=9D=A2=E8=AF=B4=E6=98=8E=202.=20?=
 =?UTF-8?q?=E5=B0=86=E5=B8=83=E5=B1=80=E7=9A=84=E9=83=A8=E5=88=86=E4=BB=8E?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B8=AD=E8=84=B1=E7=A6=BB=E5=87=BA=E6=9D=A5?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8html=E9=87=8C=E4=B8=80=E7=9B=AE=E4=BA=86?=
 =?UTF-8?q?=E7=84=B6=E3=80=82=203.=20=E6=B5=8B=E8=AF=95=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=EF=BC=9A=20=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=EF=BC=9AChrome?=
 =?UTF-8?q?=EF=BC=8CIE11=EF=BC=8CEdge=20=E2=80=94=E2=80=94=20=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=AD=A3=E5=B8=B8=20=E2=80=94=E2=80=94=20=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86=E6=B2=A1=E6=9C=891px=E7=9A=84=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E2=80=94=E2=80=94=20=E6=A0=87=E7=AD=BE=E8=BF=87=E5=A4=9A?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=AD=A3=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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                                        |  3 ++-
 .../style/theme/theme-base.scss.REMOVED.git-id      |  2 +-
 .../header-aside/components/menu-side/index.vue     |  2 +-
 src/layout/header-aside/components/tabs/index.vue   |  6 +++---
 src/layout/header-aside/layout.vue                  | 13 +++++++------
 src/main.js                                         |  2 ++
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index eea8cc09..1e3cb758 100644
--- a/package.json
+++ b/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",
diff --git a/src/assets/style/theme/theme-base.scss.REMOVED.git-id b/src/assets/style/theme/theme-base.scss.REMOVED.git-id
index 82445b47..df6711a8 100644
--- a/src/assets/style/theme/theme-base.scss.REMOVED.git-id
+++ b/src/assets/style/theme/theme-base.scss.REMOVED.git-id
@@ -1 +1 @@
-2bcada21f21b92f000ee330f0c920982f9a96857
\ No newline at end of file
+ec0716e48b92232d3ddf7fdca575a565c951dff7
\ No newline at end of file
diff --git a/src/layout/header-aside/components/menu-side/index.vue b/src/layout/header-aside/components/menu-side/index.vue
index 44bae49a..e387b810 100644
--- a/src/layout/header-aside/components/menu-side/index.vue
+++ b/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>
diff --git a/src/layout/header-aside/components/tabs/index.vue b/src/layout/header-aside/components/tabs/index.vue
index 6d4b84a4..8c31778f 100644
--- a/src/layout/header-aside/components/tabs/index.vue
+++ b/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-content">
+  <div class="d2-multiple-page-control-group" flex>
+    <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"
diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue
index 6ce51d75..41c56f3d 100644
--- a/src/layout/header-aside/layout.vue
+++ b/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-header">
+        <div class="d2-theme-container-main" flex-box="1" flex="dir:top">
+          <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/>
diff --git a/src/main.js b/src/main.js
index 3445e48e..57483b5c 100644
--- a/src/main.js
+++ b/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'