Merge pull request #47 from namklaw/master

【BUG】修复IE情况的显示异常

Former-commit-id: b25d3cb05edeb76763c63ccf87f0888d39a624d2 [formerly b25d3cb05edeb76763c63ccf87f0888d39a624d2 [formerly b25d3cb05edeb76763c63ccf87f0888d39a624d2 [formerly b25d3cb05edeb76763c63ccf87f0888d39a624d2 [formerly 3f998e49afc3dae28b3e0c7c554fbc5a0fad1f9e [formerly ef3ea5574b2745e51de917a4ae439262f5751632]]]]]
Former-commit-id: 9654e22674859badbfc8f1abb63723138d59a5a8
Former-commit-id: 7ee90e91ecd008ff19826a8a91f28e5744967b9a
Former-commit-id: 960d455510ea9bc6b8313de7fab427c715e0f110 [formerly 3f2511e3d4def73ef9128a608322fcabe7bac1a1]
Former-commit-id: dcb9037897a4177e420ff3c5d1bf4938c862544b
Former-commit-id: b2b7a8a6b4534c65fe26e38461174dbeca1bf6ec
Former-commit-id: d1453d96289bc108662567a624ae24f8c64c5f0d
Former-commit-id: ea3e2d4630826617887388ed6eacbd3467ab0aca
Former-commit-id: 7f0bd4e9adb04103b80ce2dbbed394ce07db6aeb

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 @@
-e8bc36218d0778ed548d888e1fdf30405ccd2da4
+bf52f3ee655f3879d00f81acaa74de5608e5df93

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-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"

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/>

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'