From e6b04e56d0db4c85a10f25f07655bd4441be05f4 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 20 Sep 2018 18:56:56 +0800
Subject: [PATCH] [bugfix] setData writeable (#613)

---
 dist/action-sheet/index.js           | 4 ++++
 dist/action-sheet/index.wxml         | 1 +
 dist/area/index.js                   | 3 +++
 dist/cell/index.wxss                 | 2 +-
 dist/field/index.js                  | 2 +-
 dist/mixins/observer/behavior.js     | 2 ++
 dist/submit-bar/index.js             | 8 +++++---
 dist/tab/index.wxml                  | 2 +-
 dist/tabs/index.wxml                 | 2 +-
 packages/mixins/observer/behavior.js | 2 ++
 10 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/dist/action-sheet/index.js b/dist/action-sheet/index.js
index 31bb381c..5c908d0d 100644
--- a/dist/action-sheet/index.js
+++ b/dist/action-sheet/index.js
@@ -5,6 +5,10 @@ create({
     show: Boolean,
     title: String,
     cancelText: String,
+    zIndex: {
+      type: Number,
+      value: 100
+    },
     actions: {
       type: Array,
       value: []
diff --git a/dist/action-sheet/index.wxml b/dist/action-sheet/index.wxml
index 88876761..4d851529 100644
--- a/dist/action-sheet/index.wxml
+++ b/dist/action-sheet/index.wxml
@@ -1,6 +1,7 @@
 <van-popup
   show="{{ show }}"
   position="bottom"
+  z-index="{{ zIndex }}"
   overlay="{{ overlay }}"
   custom-class="van-action-sheet"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
diff --git a/dist/area/index.js b/dist/area/index.js
index 6d401587..12cee4e3 100644
--- a/dist/area/index.js
+++ b/dist/area/index.js
@@ -31,16 +31,19 @@ create({
       }
     }
   },
+
   data: {
     pickerValue: [0, 0, 0],
     columns: []
   },
+
   computed: {
     displayColumns() {
       const { columns = [], columnsNum } = this.data;
       return columns.slice(0, +columnsNum);
     }
   },
+
   methods: {
     onCancel() {
       this.triggerEvent('cancel', {
diff --git a/dist/cell/index.wxss b/dist/cell/index.wxss
index a0fd6ac2..db8e6837 100644
--- a/dist/cell/index.wxss
+++ b/dist/cell/index.wxss
@@ -1 +1 @@
-.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom::after,.van-hairline--left::after,.van-hairline--right::after,.van-hairline--surround::after,.van-hairline--top-bottom::after,.van-hairline--top::after,.van-hairline::after{content:'';position:absolute;top:-50%;left:-50%;right:-50%;bottom:-50%;-webkit-transform:scale(.5);transform:scale(.5);pointer-events:none;box-sizing:border-box;border:0 solid #eee}.van-hairline--top::after{border-top-width:1px}.van-hairline--left::after{border-left-width:1px}.van-hairline--right::after{border-right-width:1px}.van-hairline--bottom::after{border-bottom-width:1px}.van-hairline--top-bottom::after{border-width:1px 0}.van-hairline--surround::after{border-width:1px}.van-cell{width:100%;display:-webkit-box;display:-webkit-flex;display:flex;padding:10px 15px;box-sizing:border-box;line-height:24px;position:relative;background-color:#fff;color:#333;font-size:14px}.van-cell::after{left:15px;right:0;-webkit-transform:scaleY(.5);transform:scaleY(.5);border-bottom-width:1px}.van-cell-group{background-color:#fff}.van-cell__label{font-size:12px;line-height:1.2;color:#666}.van-cell__title,.van-cell__value{-webkit-box-flex:1;-webkit-flex:1;flex:1}.van-cell__value{overflow:hidden;text-align:right;vertical-align:middle}.van-cell__left-icon{font-size:16px;line-height:24px;margin-right:5px;vertical-align:middle}.van-cell__right-icon{color:#999;font-size:12px;line-height:24px;margin-left:5px}.van-cell--clickable:active{background-color:#e8e8e8}.van-cell--required{overflow:visible}.van-cell--required::before{content:'*';position:absolute;left:7px;font-size:14px;color:#f44}.van-cell--center{-webkit-box-align:center;-webkit-align-items:center;align-items:center}
\ No newline at end of file
+.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom::after,.van-hairline--left::after,.van-hairline--right::after,.van-hairline--surround::after,.van-hairline--top-bottom::after,.van-hairline--top::after,.van-hairline::after{content:'';position:absolute;top:-50%;left:-50%;right:-50%;bottom:-50%;-webkit-transform:scale(.5);transform:scale(.5);pointer-events:none;box-sizing:border-box;border:0 solid #eee}.van-hairline--top::after{border-top-width:1px}.van-hairline--left::after{border-left-width:1px}.van-hairline--right::after{border-right-width:1px}.van-hairline--bottom::after{border-bottom-width:1px}.van-hairline--top-bottom::after{border-width:1px 0}.van-hairline--surround::after{border-width:1px}.van-cell{width:100%;display:-webkit-box;display:-webkit-flex;display:flex;padding:10px 15px;box-sizing:border-box;line-height:24px;position:relative;background-color:#fff;color:#333;font-size:14px}.van-cell::after{left:15px;right:0;-webkit-transform:scaleY(.5);transform:scaleY(.5);border-bottom-width:1px}.van-cell-group{background-color:#fff}.van-cell__label{font-size:12px;line-height:1.2;color:#666}.van-cell__title,.van-cell__value{-webkit-box-flex:1;-webkit-flex:1;flex:1}.van-cell__title:empty,.van-cell__value:empty{display:none}.van-cell__value{overflow:hidden;text-align:right;vertical-align:middle}.van-cell__left-icon{font-size:16px;line-height:24px;margin-right:5px;vertical-align:middle}.van-cell__right-icon{color:#999;font-size:12px;line-height:24px;margin-left:5px}.van-cell--clickable:active{background-color:#e8e8e8}.van-cell--required{overflow:visible}.van-cell--required::before{content:'*';position:absolute;left:7px;font-size:14px;color:#f44}.van-cell--center{-webkit-box-align:center;-webkit-align-items:center;align-items:center}
\ No newline at end of file
diff --git a/dist/field/index.js b/dist/field/index.js
index b42679ac..4fb39fa2 100644
--- a/dist/field/index.js
+++ b/dist/field/index.js
@@ -66,7 +66,7 @@ create({
         'van-field--error': data.error,
         'van-field__textarea': data.type === 'textarea',
         'van-field__input--disabled': data.disabled,
-        [`van-field__input--${data.inputAlign}`]: data.inputAlign
+        [`van-field--${data.inputAlign}`]: data.inputAlign
       });
     }
   },
diff --git a/dist/mixins/observer/behavior.js b/dist/mixins/observer/behavior.js
index 47e988c3..9162ef04 100644
--- a/dist/mixins/observer/behavior.js
+++ b/dist/mixins/observer/behavior.js
@@ -22,6 +22,8 @@ export const behavior = Behavior({
       return needUpdate;
     };
 
+    Object.defineProperty(this, 'setData', { writable: true });
+
     this.setData = (data, callback) => {
       data && setData.call(this, data, callback);
       setData.call(this, calcComputed());
diff --git a/dist/submit-bar/index.js b/dist/submit-bar/index.js
index 3ca5a92c..f9466aa8 100644
--- a/dist/submit-bar/index.js
+++ b/dist/submit-bar/index.js
@@ -5,6 +5,7 @@ create({
     'price-class',
     'button-class'
   ],
+
   props: {
     tip: [String, Boolean],
     type: Number,
@@ -22,21 +23,22 @@ create({
       value: 'danger'
     }
   },
-  options: {
-    multipleSlots: true
-  },
+
   computed: {
     hasPrice() {
       return typeof this.data.price === 'number';
     },
+
     priceStr() {
       return (this.data.price / 100).toFixed(2);
     },
+
     tipStr() {
       const { tip } = this.data;
       return typeof tip === 'string' ? tip : '';
     }
   },
+
   methods: {
     onSubmit(event) {
       this.$emit('submit', event.detail);
diff --git a/dist/tab/index.wxml b/dist/tab/index.wxml
index ee7168f3..508c827d 100644
--- a/dist/tab/index.wxml
+++ b/dist/tab/index.wxml
@@ -1,6 +1,6 @@
 <view
   wx:if="{{ inited }}"
-  class="van-tab__pane"
+  class="custom-class van-tab__pane"
   style="{{ active ? '' : 'display: none' }}"
 >
   <slot />
diff --git a/dist/tabs/index.wxml b/dist/tabs/index.wxml
index 4b55d7c9..6c2bffe1 100644
--- a/dist/tabs/index.wxml
+++ b/dist/tabs/index.wxml
@@ -1,4 +1,4 @@
-<view class="van-tabs van-tabs--{{ type }}">
+<view class="custom-class van-tabs van-tabs--{{ type }}">
   <view class="van-tabs__wrap {{ scrollable ? 'van-tabs__wrap--scrollable' : '' }} {{ type === 'line' && border ? 'van-hairline--top-bottom' : '' }}">
     <scroll-view
       scroll-x="{{ scrollable }}"
diff --git a/packages/mixins/observer/behavior.js b/packages/mixins/observer/behavior.js
index 47e988c3..9162ef04 100644
--- a/packages/mixins/observer/behavior.js
+++ b/packages/mixins/observer/behavior.js
@@ -22,6 +22,8 @@ export const behavior = Behavior({
       return needUpdate;
     };
 
+    Object.defineProperty(this, 'setData', { writable: true });
+
     this.setData = (data, callback) => {
       data && setData.call(this, data, callback);
       setData.call(this, calcComputed());