From 85ef16f51ceab52ef755e315d0806460df0a6b58 Mon Sep 17 00:00:00 2001
From: Yao <chenyao1102@gmail.com>
Date: Wed, 17 May 2017 11:59:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?picker=20=E5=A2=9E=E5=8A=A0=20title=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=20(#30)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* picker 增加 title 显示
---
 docs/examples-docs/picker.md                  | 12 +++-
 packages/picker/src/picker-column.vue         |  1 +
 packages/picker/src/picker.vue                |  5 ++
 packages/vant-css/src/picker.css              | 11 ++++
 .../specs/{pciker.spec.js => picker.spec.js}  | 57 ++++++++++++++++++-
 5 files changed, 82 insertions(+), 4 deletions(-)
 rename test/unit/specs/{pciker.spec.js => picker.spec.js} (77%)

diff --git a/docs/examples-docs/picker.md b/docs/examples-docs/picker.md
index 4c8d30f5d..d44577c17 100644
--- a/docs/examples-docs/picker.md
+++ b/docs/examples-docs/picker.md
@@ -8,6 +8,7 @@ const citys = {
 export default {
   data() {
     return {
+      title: '地区选择',
       pickerColumns: [
         {
           values: Object.keys(citys),
@@ -113,7 +114,14 @@ export default {
 
 :::demo 带toolbar的Picker
 ```html
-<van-picker :columns="pickerColumns" show-toolbar @change="handlePickerChange" @cancel="handlePickerCancel" @confirm="handlePickerConfirm"></van-picker>
+<van-picker
+  :title="title"
+  :columns="pickerColumns"
+  show-toolbar
+  @change="handlePickerChange"
+  @cancel="handlePickerCancel"
+  @confirm="handlePickerConfirm"
+></van-picker>
 
 <script>
 const citys = {
@@ -125,6 +133,7 @@ const citys = {
 export default {
   data() {
     return {
+      title: '地区选择',
       pickerColumns: [
         {
           values: Object.keys(citys),
@@ -162,6 +171,7 @@ export default {
 | itemHeight | 选中元素区高度 | `number`  | `44` |   |
 | columns | 对象数组，配置每一列显示的数据 | `Array`  |  |   |
 | showToolbar | 是否在组件顶部显示一个toolbar | `Boolean`  | `true` |   |
+| title | 在toolbar上显示的标题文字 | `String`  |  |   |
 
 ### columns
 
diff --git a/packages/picker/src/picker-column.vue b/packages/picker/src/picker-column.vue
index 6daeefd48..fc005e909 100644
--- a/packages/picker/src/picker-column.vue
+++ b/packages/picker/src/picker-column.vue
@@ -172,6 +172,7 @@ export default {
             startTop: event.pageY,
             startTranslateTop: translateUtil.getElementTranslate(el).top
           };
+
           pickerItems = el.querySelectorAll('.van-picker-item'); // eslint-disable-line
         },
 
diff --git a/packages/picker/src/picker.vue b/packages/picker/src/picker.vue
index 5e7f7cf86..2a6a90b99 100644
--- a/packages/picker/src/picker.vue
+++ b/packages/picker/src/picker.vue
@@ -4,6 +4,7 @@
       <slot>
         <a href="javascript:void(0)" class="van-picker__cancel" @click="handlePickerCancel">取消</a>
         <a href="javascript:void(0)" class="van-picker__confirm" @click="handlePickerConfirm">完成</a>
+        <p v-if="title" class="van-picker__title">{{ title }}</p>
       </slot>
     </div>
     <div class="van-picker__columns" :class="['van-picker__columns--' + columns.length]">
@@ -65,6 +66,10 @@ export default {
       type: Boolean,
       default: false
     },
+    /**
+     * 顶部toolbar 显示的title
+     */
+    title: String,
     valueKey: String
   },
 
diff --git a/packages/vant-css/src/picker.css b/packages/vant-css/src/picker.css
index 0a89f49d0..5a49cb6ca 100644
--- a/packages/vant-css/src/picker.css
+++ b/packages/vant-css/src/picker.css
@@ -27,6 +27,17 @@
       float: right;
     }
 
+    @e title {
+      height: 40px;
+      padding: 0 10px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      word-wrap: normal;
+      word-break: break-all;
+      text-align: center;
+    }
+
     @e columns {
       position: relative;
       overflow: hidden;
diff --git a/test/unit/specs/pciker.spec.js b/test/unit/specs/picker.spec.js
similarity index 77%
rename from test/unit/specs/pciker.spec.js
rename to test/unit/specs/picker.spec.js
index ff320a182..e49b908c4 100644
--- a/test/unit/specs/pciker.spec.js
+++ b/test/unit/specs/picker.spec.js
@@ -1,6 +1,7 @@
 import Picker from 'packages/picker';
 import PickerColumn from 'packages/picker/src/picker-column';
 import { mount } from 'avoriaz';
+import Wrapper from 'avoriaz/dist/Wrapper';
 
 const itemHeight = 44;
 
@@ -177,7 +178,7 @@ describe('PickerColumn', () => {
         value: 1
       }
     });
-    
+
     expect(wrapper.hasClass('van-picker-column')).to.be.true;
     expect(wrapper.vm.values.length).to.equal(5);
 
@@ -207,12 +208,62 @@ describe('PickerColumn', () => {
   it('create a picker test translate', () => {
     wrapper = mount(PickerColumn, {
       propsData: {
-        values: [1, 2, 3, 4, 5]
+        values: [1, 2, 3, 4, 5],
+        value: 1
       }
     });
 
     expect(wrapper.vm.values.length).to.equal(5);
-    expect(wrapper.vm.value2Translate(2)).to.equal((1- Math.floor(5 / 2)) * (-itemHeight));
+    expect(wrapper.vm.value2Translate(2)).to.equal((1 - Math.floor(5 / 2)) * (-itemHeight));
     expect(wrapper.vm.translate2Value(0)).to.equal(3);
   });
+
+  it('test draggable', done => {
+    wrapper = mount(PickerColumn, {
+      propsData: {
+        values: [1, 2, 3, 4, 5]
+      },
+      attachToDocument: true
+    });
+
+    expect(wrapper.vm.values.length).to.equal(5);
+
+    setTimeout(() => {
+      const nColumn = wrapper.find('.van-picker-column-wrapper')[0];
+
+      const eventMouseObject = new window.Event('mousedown');
+      eventMouseObject.pageY = 0;
+      nColumn.element.dispatchEvent(eventMouseObject);
+
+      const eventTouchObject = new window.Event('touchstart');
+      eventTouchObject.changedTouches = [{ pageY: 0 }];
+      nColumn.element.dispatchEvent(eventTouchObject);
+    }, 500);
+
+    setTimeout(() => {
+      const nColumn = wrapper.find('.van-picker-column-wrapper')[0];
+
+      const eventMouseMoveObject = new window.Event('mousemove');
+      eventMouseMoveObject.pageY = 40;
+      document.dispatchEvent(eventMouseMoveObject);
+
+      const eventObject = new window.Event('touchmove');
+      eventObject.changedTouches = [{ pageY: 40 }];
+      nColumn.element.dispatchEvent(eventObject);
+
+      // 结束滚动
+      const eventMouseUpObject = new window.Event('mouseup');
+      document.dispatchEvent(eventMouseUpObject);
+      const eventEndObject = new window.Event('touchend');
+      eventEndObject.changedTouches = [{}];
+      nColumn.element.dispatchEvent(eventEndObject);
+    }, 1000);
+
+    setTimeout(() => {
+      const nItem = wrapper.find('.van-picker-column__item');
+      expect(nItem[1].hasClass('van-picker-column__item--selected')).to.be.true;
+
+      done();
+    }, 1200);
+  });
 });

From c87e64d58b8eca92cd43d79c187e752d31eaf265 Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Fri, 19 May 2017 11:17:34 +0800
Subject: [PATCH 2/2] update pull request template

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 83bd77bef..9ed032d1a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,7 +2,7 @@
 
 ### 提交 PR 前请确保完成以下内容:
 
-1. Fork [the repository](https://github.com/youzan/vant) and create your branch from `master`.
+1. Fork [the repository](https://github.com/youzan/vant) and create your branch from `dev`.
 2. Follow the [contributing guide](./CONTRIBUTING.md) to setup your develop environment.
 2. If you've added code that should be tested, add tests!
 3. If you've changed APIs, update the documentation.