Merge pull request #1598 from wg5945/1596

PopupPicker：popup-picker-header add touchmove.prevent event #1596
airyland · Jun 21, 2017 · 2b3251e · 2b3251e
2 parents f56b26b + df2bbf8
commit 2b3251e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/components/popup-picker/index.vue b/src/components/popup-picker/index.vue
@@ -27,7 +27,7 @@
       @on-hide="onPopupHide"
       @on-show="onPopupShow">
         <div class="vux-popup-picker-container">
-          <div class="vux-popup-picker-header">
+          <div class="vux-popup-picker-header" @touchmove.prevent>
             <flexbox>
               <flexbox-item class="vux-popup-picker-header-menu vux-popup-picker-cancel" @click.native="onHide(false)">{{ cancelText || $t('cancel_text') }}</flexbox-item>
               <flexbox-item class="vux-popup-picker-header-menu vux-popup-picker-header-menu-right" @click.native="onHide(true)">{{ confirmText || $t('confirm_text') }}</flexbox-item>

diff --git a/src/components/popup-picker/metas.yml b/src/components/popup-picker/metas.yml
@@ -71,6 +71,11 @@ events:
     en: emits when popup is closed
     zh-CN: 弹窗关闭时触发
 changes:
+  next:
+    en:
+      - '[fix] popup-picker-header add touchmove.prevent event #1596'
+    zh-CN:
+      - '[fix] popup-picker头部区域屏蔽滑动事件 #1596'
   v2.3.8:
     en:
       - '[fix] Fix placeholder missing on iOS9 and iOS8 #1293'