From 3c48de191da6b432173991dc8f0aa33a7952928d Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 20 Jun 2018 23:01:12 +0800
Subject: [PATCH] [Improvement] Tabbar: add z-index prop (#1310)

---
 packages/tabbar/en-US.md                       |  2 ++
 packages/tabbar/index.vue                      | 18 +++++++++++++++++-
 .../test/__snapshots__/demo.spec.js.snap       |  4 ++--
 packages/tabbar/zh-CN.md                       |  2 ++
 packages/uploader/demo/index.vue               |  8 +++++++-
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/packages/tabbar/en-US.md b/packages/tabbar/en-US.md
index f3ed905af..b63301c19 100644
--- a/packages/tabbar/en-US.md
+++ b/packages/tabbar/en-US.md
@@ -65,6 +65,8 @@ export default {
 | Attribute | Description | Type | Default |
 |-----------|-----------|-----------|-------------|
 | v-model | Index of current tab | `Number` | - |
+| fixed | Whether to fixed bottom | `Boolean` | `true` |
+| z-index | Z-index | `Number` | `1` |
 
 ### Tabbar Event
 
diff --git a/packages/tabbar/index.vue b/packages/tabbar/index.vue
index b2c425aa0..c1681239e 100644
--- a/packages/tabbar/index.vue
+++ b/packages/tabbar/index.vue
@@ -1,5 +1,9 @@
 <template>
-  <div class="van-hairline--top-bottom" :class="b({ fixed })">
+  <div
+    class="van-hairline--top-bottom"
+    :class="b({ fixed })"
+    :style="style"
+  >
     <slot />
   </div>
 </template>
@@ -21,6 +25,18 @@ export default create({
     fixed: {
       type: Boolean,
       default: true
+    },
+    zIndex: {
+      type: Number,
+      default: 1
+    }
+  },
+
+  computed: {
+    style() {
+      return {
+        zIndex: this.zIndex
+      };
     }
   },
 
diff --git a/packages/tabbar/test/__snapshots__/demo.spec.js.snap b/packages/tabbar/test/__snapshots__/demo.spec.js.snap
index f4d6e09fd..e1bb6471b 100644
--- a/packages/tabbar/test/__snapshots__/demo.spec.js.snap
+++ b/packages/tabbar/test/__snapshots__/demo.spec.js.snap
@@ -3,7 +3,7 @@
 exports[`renders demo correctly 1`] = `
 <div>
   <div>
-    <div class="van-hairline--top-bottom van-tabbar van-tabbar--fixed">
+    <div class="van-hairline--top-bottom van-tabbar van-tabbar--fixed" style="z-index:1;">
       <div class="van-tabbar-item">
         <div class="van-tabbar-item__icon">
           <i class="van-icon van-icon-shop" style="color:undefined;">
@@ -43,7 +43,7 @@ exports[`renders demo correctly 1`] = `
     </div>
   </div>
   <div>
-    <div class="van-hairline--top-bottom van-tabbar van-tabbar--fixed">
+    <div class="van-hairline--top-bottom van-tabbar van-tabbar--fixed" style="z-index:1;">
       <div class="van-tabbar-item">
         <div class="van-tabbar-item__icon">
           <img src="https://img.yzcdn.cn/public_files/2017/10/13/c547715be149dd3faa817e4a948b40c4.png">
diff --git a/packages/tabbar/zh-CN.md b/packages/tabbar/zh-CN.md
index dd20c9e28..90a627b98 100644
--- a/packages/tabbar/zh-CN.md
+++ b/packages/tabbar/zh-CN.md
@@ -69,6 +69,8 @@ export default {
 | 参数 | 说明 | 类型 | 默认值 |
 |-----------|-----------|-----------|-------------|
 | v-model | 当前选中标签的索引 | `Number` | - |
+| fixed | 是否固定在底部 | `Boolean` | `true` |
+| z-index | 元素 z-index | `Number` | `1` |
 
 ### Tabbar Event
 
diff --git a/packages/uploader/demo/index.vue b/packages/uploader/demo/index.vue
index 7cb9b6deb..c953ef98c 100644
--- a/packages/uploader/demo/index.vue
+++ b/packages/uploader/demo/index.vue
@@ -2,7 +2,7 @@
   <demo-section>
     <demo-block :title="$t('basicUsage')">
       <div class="demo-uploader-container">
-        <van-uploader :max-size="102400" @oversize="logContent('oversize')">
+        <van-uploader :max-size="102400" @oversize="logContent('oversize')" :before-read="beforeRead(1)">
           <van-icon name="photograph" />
         </van-uploader>
       </div>
@@ -32,6 +32,12 @@ export default {
   methods: {
     logContent(file) {
       console.log(file);
+    },
+
+    beforeRead(index) {
+      return file => {
+        console.log(index, file);
+      };
     }
   }
 };