From d1f32a05a8e9c2f4fb8a83b0cb2660b8a5d19eb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Tue, 19 Mar 2019 10:18:04 +0800
Subject: [PATCH 1/5] fix[HeaderSearch]: fixed bug in vue2.6+ (#1733)

---
 src/components/HeaderSearch/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue
index 2227a93e..c4276d96 100644
--- a/src/components/HeaderSearch/index.vue
+++ b/src/components/HeaderSearch/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div :class="{'show':show}" class="header-search">
-    <svg-icon class-name="search-icon" icon-class="search" @click="click" />
+    <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
     <el-select
       ref="headerSearchSelect"
       v-model="search"

From abb1d91a9eac0d0523ac1e6f8dc091b0ed9ff65d Mon Sep 17 00:00:00 2001
From: Mrli2016 <mrli2016@126.com>
Date: Tue, 19 Mar 2019 10:31:12 +0800
Subject: [PATCH 2/5] fix[Sticky]: fixed bug when set stickyTop

---
 src/components/Sticky/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/Sticky/index.vue b/src/components/Sticky/index.vue
index 5624a989..fa165bc7 100644
--- a/src/components/Sticky/index.vue
+++ b/src/components/Sticky/index.vue
@@ -1,6 +1,9 @@
 <template>
   <div :style="{height:height+'px',zIndex:zIndex}">
-    <div :class="className" :style="{top:stickyTop+'px',zIndex:zIndex,position:position,width:width,height:height+'px'}">
+    <div
+      :class="className"
+      :style="{top:(isSticky ? stickyTop +'px' : ''),zIndex:zIndex,position:position,width:width,height:height+'px'}"
+    >
       <slot>
         <div>sticky</div>
       </slot>

From 715fe3e6841ef19cc36e26895e336adbbdb94db6 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Tue, 19 Mar 2019 10:36:50 +0800
Subject: [PATCH 3/5] perf[Sticky]: refine demo

---
 src/views/components-demo/sticky.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/components-demo/sticky.vue b/src/views/components-demo/sticky.vue
index 618f383e..c49b089d 100644
--- a/src/views/components-demo/sticky.vue
+++ b/src/views/components-demo/sticky.vue
@@ -49,7 +49,9 @@
       <div>placeholder</div>
       <div>placeholder</div>
       <div>placeholder</div>
-      <div>placeholder</div>
+      <sticky :sticky-top="200">
+        <el-button type="primary"> placeholder</el-button>
+      </sticky>
       <div>placeholder</div>
       <div>placeholder</div>
       <div>placeholder</div>

From ccb227fbec5c72e8182097078de759860a8f1570 Mon Sep 17 00:00:00 2001
From: toruksmakto <42709228+toruksmakto@users.noreply.github.com>
Date: Tue, 19 Mar 2019 18:33:59 +0800
Subject: [PATCH 4/5] fix[Excel]: fixed export bug (#1736)

---
 src/vendor/Export2Excel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vendor/Export2Excel.js b/src/vendor/Export2Excel.js
index 3a2e8aed..20784f3a 100644
--- a/src/vendor/Export2Excel.js
+++ b/src/vendor/Export2Excel.js
@@ -145,11 +145,11 @@ export function export_table_to_excel(id) {
 }
 
 export function export_json_to_excel({
-  multiHeader,
+  multiHeader = [],
   header,
   data,
   filename,
-  merges,
+  merges = [],
   autoWidth = true,
   bookType=  'xlsx'
 } = {}) {

From 63dba8b7d89c63b012afdd0a3b387ba32a53fd35 Mon Sep 17 00:00:00 2001
From: MaYuanhai <414199639@qq.com>
Date: Thu, 21 Mar 2019 11:04:33 +0800
Subject: [PATCH 5/5] perf[ThemePicker]: add predefine (#1743)

---
 src/components/ThemePicker/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue
index be3a573a..f6784710 100644
--- a/src/components/ThemePicker/index.vue
+++ b/src/components/ThemePicker/index.vue
@@ -1,6 +1,7 @@
 <template>
   <el-color-picker
     v-model="theme"
+    :predefine="['#409EFF', '#11a983', '#13c2c2', '#6959CD', '#f5222d', '#eb2f96', '#DB7093', '#e6a23c', '#8B8989', '#212121']"
     class="theme-picker"
     popper-class="theme-picker-dropdown"
   />