From 645e9024f4638b5ec99581b7f2883931dfe1e4e1 Mon Sep 17 00:00:00 2001
From: lin-xin <2981207131@qq.com>
Date: Fri, 13 Apr 2018 14:57:02 +0800
Subject: [PATCH] =?UTF-8?q?'=E9=87=8D=E5=86=99mavonEditor=E7=9A=84flex?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=85=BC=E5=AE=B9IE'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                  |  2 +-
 package.json                     |  2 +-
 src/components/page/Markdown.vue |  2 +
 src/main.js                      |  4 +-
 static/css/mavon-flex.css        | 70 ++++++++++++++++++++++++++++++++
 5 files changed, 76 insertions(+), 4 deletions(-)
 create mode 100644 static/css/mavon-flex.css

diff --git a/config/index.js b/config/index.js
index b8e6882..4c93b97 100644
--- a/config/index.js
+++ b/config/index.js
@@ -65,7 +65,7 @@ module.exports = {
      * Source Maps
      */
 
-    productionSourceMap: true,
+    productionSourceMap: false,
     // https://webpack.js.org/configuration/devtool/#production
     devtool: '#source-map',
 
diff --git a/package.json b/package.json
index 064cb1f..0fd5007 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
   },
   "browserslist": [
     "> 1%",
-    "last 2 versions",
+    "last 5 versions",
     "not ie <= 8"
   ]
 }
diff --git a/src/components/page/Markdown.vue b/src/components/page/Markdown.vue
index a93cc6b..b4cdc73 100644
--- a/src/components/page/Markdown.vue
+++ b/src/components/page/Markdown.vue
@@ -20,6 +20,8 @@
 <script>
     import { mavonEditor } from 'mavon-editor'
     import 'mavon-editor/dist/css/index.css'
+    // 重写mavon的flex样式来兼容IE
+    import 'static/css/mavon-flex.css'
     export default {
         data: function(){
             return {
diff --git a/src/main.js b/src/main.js
index 8449b5e..b08d2f3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,7 +18,7 @@ router.beforeEach((to, from, next) => {
         role === 'admin' ? next() : next('/login');
     }else{
         // 简单的判断IE10及以下不进入富文本编辑器，该组件不兼容
-        if(navigator.userAgent.indexOf('MSIE') && to.path === '/editor'){
+        if(navigator.userAgent.indexOf('MSIE') > -1 && to.path === '/editor'){
             Vue.prototype.$alert('vue-quill-editor组件不兼容IE10及以下浏览器，请使用更高版本的浏览器查看', '浏览器不兼容通知', {
                 confirmButtonText: '确定'
             });
@@ -27,7 +27,7 @@ router.beforeEach((to, from, next) => {
         }
     }
 })
-console.log(navigator.userAgent);
+
 new Vue({
     router,
     render: h => h(App)
diff --git a/static/css/mavon-flex.css b/static/css/mavon-flex.css
new file mode 100644
index 0000000..bbe1362
--- /dev/null
+++ b/static/css/mavon-flex.css
@@ -0,0 +1,70 @@
+.v-note-wrapper{
+    display: flex;
+    flex-direction: column;
+}
+.v-note-wrapper .v-note-op{
+    display: flex;
+    flex: none;
+}
+.v-note-wrapper .v-note-op .left,
+.v-note-wrapper .v-note-op .right{
+    flex: 1;
+}
+.v-note-wrapper {
+  display: flex;
+  flex-direction: column;
+}
+.v-note-wrapper .v-note-op {
+  display: flex;
+  flex: none;
+}
+.v-note-wrapper .v-note-op .left,
+.v-note-wrapper .v-note-op .right {
+  flex: 1;
+}
+
+.v-note-wrapper .v-note-panel {
+  display: flex;
+  flex: 1;
+  min-height: 500px;
+}
+.v-note-wrapper .v-note-panel .v-note-edit.divarea-wrapper {
+  flex: 0 0 50%;
+}
+
+.v-note-wrapper .v-note-panel .v-note-edit.divarea-wrapper.single-edit {
+  flex: 0 0 100%;
+}
+.v-note-wrapper .v-note-panel .v-note-edit.divarea-wrapper.single-show {
+  width: 0;
+  flex: 0 0 0;
+  display: none;
+}
+
+.v-note-wrapper .v-note-panel .v-note-show {
+  flex: 0 0 50%;
+}
+.v-note-wrapper .v-note-panel .v-note-show.single-show {
+  flex: 0 0 100%;
+}
+
+.v-note-wrapper .v-note-panel .v-note-navigation-wrapper {
+  display: flex;
+  flex-direction: column;
+}
+
+.v-note-wrapper .v-note-panel .v-note-navigation-wrapper .v-note-navigation-title {
+  flex: none;
+}
+
+.v-note-wrapper .v-note-panel .v-note-navigation-wrapper .v-note-navigation-content {
+  flex: 1;
+}
+.v-note-img-wrapper{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.v-note-img-wrapper img {
+    flex: 0 0 auto;
+}
\ No newline at end of file