Merge pull request #6 from PanJiaChen/master

update

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"

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>

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'
 } = {}) {
@@ -158,8 +158,8 @@ export function export_json_to_excel({
   data = [...data]
   data.unshift(header);
 
-  for (let header of multiHeader) {
+  for (let i = multiHeader.length-1; i > -1; i--) {
-    data.unshift(header)
+    data.unshift(multiHeader[i])
   }
 
   var ws_name = "SheetJS";

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>