From c2a2fec0670f20e4887a9df41465d012f5d65a49 Mon Sep 17 00:00:00 2001
From: Yulong Jing <yulong.jing@hotmail.com>
Date: Thu, 20 Dec 2018 14:49:14 +0800
Subject: [PATCH 1/6] fix[Example]: add <el-form-item> wrapper for validate
 (#1428)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

创建文章里js里有验证规则，但是由于少了<el-form-item>元素而不起作用。
---
 src/views/example/components/ArticleDetail.vue | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/example/components/ArticleDetail.vue b/src/views/example/components/ArticleDetail.vue
index ce22b3b4..12a42f60 100644
--- a/src/views/example/components/ArticleDetail.vue
+++ b/src/views/example/components/ArticleDetail.vue
@@ -60,13 +60,16 @@
           <span v-show="contentShortLength" class="word-counter">{{ contentShortLength }}字</span>
         </el-form-item>
 
-        <div class="editor-container">
-          <Tinymce ref="editor" :height="400" v-model="postForm.content" />
-        </div>
-
-        <div style="margin-bottom: 20px;">
-          <Upload v-model="postForm.image_uri" />
-        </div>
+        <el-form-item prop="content">
+          <div class="editor-container">
+            <Tinymce ref="editor" :height="400" v-model="postForm.content" />
+          </div>
+        </el-form-item>
+        <el-form-item prop="image_uri">
+          <div style="margin-bottom: 20px;">
+            <Upload v-model="postForm.image_uri" />
+          </div>
+        </el-form-item>
       </div>
     </el-form>
 

From 1b394ae41757a91e7288820f8e3a24e561ff095a Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Thu, 20 Dec 2018 15:01:22 +0800
Subject: [PATCH 2/6] refine[Example]: refine style

---
 src/components/Tinymce/index.vue              |  1 +
 .../example/components/ArticleDetail.vue      | 24 ++++---------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
index 9032a6a8..ce0fe6a9 100644
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -185,6 +185,7 @@ export default {
 <style scoped>
 .tinymce-container {
   position: relative;
+  line-height: normal;
 }
 .tinymce-container>>>.mce-fullscreen {
   z-index: 10000;
diff --git a/src/views/example/components/ArticleDetail.vue b/src/views/example/components/ArticleDetail.vue
index 12a42f60..129016d7 100644
--- a/src/views/example/components/ArticleDetail.vue
+++ b/src/views/example/components/ArticleDetail.vue
@@ -60,15 +60,12 @@
           <span v-show="contentShortLength" class="word-counter">{{ contentShortLength }}字</span>
         </el-form-item>
 
-        <el-form-item prop="content">
-          <div class="editor-container">
-            <Tinymce ref="editor" :height="400" v-model="postForm.content" />
-          </div>
+        <el-form-item prop="content" style="margin-bottom: 30px;">
+          <Tinymce ref="editor" :height="400" v-model="postForm.content" />
         </el-form-item>
-        <el-form-item prop="image_uri">
-          <div style="margin-bottom: 20px;">
-            <Upload v-model="postForm.image_uri" />
-          </div>
+
+        <el-form-item prop="image_uri" style="margin-bottom: 30px;">
+          <Upload v-model="postForm.image_uri" />
         </el-form-item>
       </div>
     </el-form>
@@ -250,17 +247,6 @@ export default {
         float: left;
       }
     }
-    .editor-container {
-      min-height: 500px;
-      margin: 0 0 30px;
-      .editor-upload-btn-container {
-        text-align: right;
-        margin-right: 10px;
-        .editor-upload-btn {
-          display: inline-block;
-        }
-      }
-    }
   }
   .word-counter {
     width: 40px;

From a56145509d25ce16adfba9d4419f5b1fcc173f2c Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 24 Dec 2018 10:45:47 +0800
Subject: [PATCH 3/6] perf[Tinymce]: remove importcss plugin #1452

---
 src/components/Tinymce/plugins.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Tinymce/plugins.js b/src/components/Tinymce/plugins.js
index 8fc207e8..058d2aef 100644
--- a/src/components/Tinymce/plugins.js
+++ b/src/components/Tinymce/plugins.js
@@ -2,6 +2,6 @@
 // Detail plugins list see https://www.tinymce.com/docs/plugins/
 // Custom builds see https://www.tinymce.com/download/custom-builds/
 
-const plugins = ['advlist anchor autolink autosave code codesample colorpicker colorpicker contextmenu directionality emoticons fullscreen hr image imagetools importcss insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textcolor textpattern visualblocks visualchars wordcount']
+const plugins = ['advlist anchor autolink autosave code codesample colorpicker colorpicker contextmenu directionality emoticons fullscreen hr image imagetools insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textcolor textpattern visualblocks visualchars wordcount']
 
 export default plugins

From 6f1db28ea280ebea456398003911a26dad596a98 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 24 Dec 2018 11:12:24 +0800
Subject: [PATCH 4/6] feat[Breadcrumb]: add hide Breadcrumb option #1442

---
 src/components/Breadcrumb/index.vue | 5 +++--
 src/router/index.js                 | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 554abe8d..4b321e06 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,8 +1,9 @@
 <template>
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item,index) in levelList" v-if="item.meta.title" :key="item.path">
-        <span v-if="item.redirect==='noredirect'||index==levelList.length-1" class="no-redirect">{{ generateTitle(item.meta.title) }}</span>
+      <el-breadcrumb-item v-for="(item,index) in levelList" v-if="item.meta.title&&item.meta.breadcrumb!==false" :key="item.path">
+        <span v-if="item.redirect==='noredirect'||index==levelList.length-1" class="no-redirect">{{
+        generateTitle(item.meta.title) }}</span>
         <a v-else @click.prevent="handleLink(item)">{{ generateTitle(item.meta.title) }}</a>
       </el-breadcrumb-item>
     </transition-group>
diff --git a/src/router/index.js b/src/router/index.js
index ab328c46..73b09697 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,10 +24,11 @@ import nestedRouter from './modules/nested'
 * redirect: noredirect           if `redirect:noredirect` will no redirect in the breadcrumb
 * name:'router-name'             the name is used by <keep-alive> (must set!!!)
 * meta : {
-    roles: ['admin','editor']     will control the page roles (you can set multiple roles)
+    roles: ['admin','editor']    will control the page roles (you can set multiple roles)
     title: 'title'               the name show in submenu and breadcrumb (recommend set)
-    icon: 'svg-name'             the icon show in the sidebar,
-    noCache: true                if true ,the page will no be cached(default is false)
+    icon: 'svg-name'             the icon show in the sidebar
+    noCache: true                if true, the page will no be cached(default is false)
+    breadcrumb: false            if false, the item will hidden in breadcrumb(default is true)
   }
 **/
 export const constantRouterMap = [

From 90ee05df9371c658d94eedfe8a7ba8f5476dea12 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 24 Dec 2018 16:23:12 +0800
Subject: [PATCH 5/6] perf: use WeChat 7.0 new version icon color

---
 src/views/login/socialsignin.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login/socialsignin.vue b/src/views/login/socialsignin.vue
index d5f48830..62a63acc 100644
--- a/src/views/login/socialsignin.vue
+++ b/src/views/login/socialsignin.vue
@@ -60,7 +60,7 @@ export default {
       margin-right: 5px;
     }
     .wx-svg-container {
-      background-color: #8ada53;
+      background-color: #24da70;
     }
     .qq-svg-container {
       background-color: #6BA2D6;

From afdb893dcda349502b528812a1ba25795dd12baa Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 24 Dec 2018 17:51:05 +0800
Subject: [PATCH 6/6] refactor[login]: refactor login page style

---
 src/views/login/index.vue | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index bbd3287b..5e872595 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -39,19 +39,21 @@
 
       <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">{{ $t('login.logIn') }}</el-button>
 
-      <div class="tips">
-        <span>{{ $t('login.username') }} : admin</span>
-        <span>{{ $t('login.password') }} : {{ $t('login.any') }}</span>
-      </div>
-      <div class="tips">
-        <span style="margin-right:18px;">{{ $t('login.username') }} : editor</span>
-        <span>{{ $t('login.password') }} : {{ $t('login.any') }}</span>
-      </div>
+      <div style="position:relative">
+        <div class="tips">
+          <span>{{ $t('login.username') }} : admin</span>
+          <span>{{ $t('login.password') }} : {{ $t('login.any') }}</span>
+        </div>
+        <div class="tips">
+          <span style="margin-right:18px;">{{ $t('login.username') }} : editor</span>
+          <span>{{ $t('login.password') }} : {{ $t('login.any') }}</span>
+        </div>
 
-      <el-button class="thirdparty-button" type="primary" @click="showDialog=true">{{ $t('login.thirdparty') }}</el-button>
+        <el-button class="thirdparty-button" type="primary" @click="showDialog=true">{{ $t('login.thirdparty') }}</el-button>
+      </div>
     </el-form>
 
-    <el-dialog :title="$t('login.thirdparty')" :visible.sync="showDialog" append-to-body>
+    <el-dialog :title="$t('login.thirdparty')" :visible.sync="showDialog">
       {{ $t('login.thirdpartyTips') }}
       <br>
       <br>
@@ -213,18 +215,17 @@ $dark_gray:#889aa4;
 $light_gray:#eee;
 
 .login-container {
-  position: fixed;
-  height: 100%;
+  min-height: 100%;
   width: 100%;
   background-color: $bg;
+  overflow: hidden;
   .login-form {
-    position: absolute;
-    left: 0;
-    right: 0;
+    position: relative;
     width: 520px;
     max-width: 100%;
-    padding: 35px 35px 15px 35px;
-    margin: 120px auto;
+    padding: 160px 35px 0;
+    margin: 0 auto;
+    overflow: hidden;
   }
   .tips {
     font-size: 14px;
@@ -270,8 +271,8 @@ $light_gray:#eee;
   }
   .thirdparty-button {
     position: absolute;
-    right: 35px;
-    bottom: 28px;
+    right: 0;
+    bottom: 6px;
   }
 }
 </style>