From 144c9b69f5d590da89e1a5e0a84485a281b7856a Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Mon, 9 Dec 2019 11:44:56 +0800
Subject: [PATCH] fix: $listeners

---
 src/core/view/components/editor/index.vue     |  3 ++-
 src/core/view/components/icon/index.vue       |  2 +-
 .../components/picker-view-column/index.vue   | 21 +++++++++-------
 src/core/view/components/swiper/index.vue     |  8 +++----
 .../app-plus/view/components/picker/index.vue |  4 +++-
 .../view/components/web-view/index.vue        | 24 +++++++++----------
 .../h5/view/components/map/index.vue          |  4 +++-
 .../h5/view/components/picker/index.vue       |  4 +++-
 .../h5/view/components/web-view/index.vue     | 18 +++++++-------
 9 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/src/core/view/components/editor/index.vue b/src/core/view/components/editor/index.vue
index 9d9dc7ea..49beb817 100644
--- a/src/core/view/components/editor/index.vue
+++ b/src/core/view/components/editor/index.vue
@@ -1,7 +1,8 @@
 <template>
   <uni-editor
     :id="id"
-    class="ql-container" />
+    class="ql-container"
+    v-on="$listeners" />
 </template>
 
 <script>
diff --git a/src/core/view/components/icon/index.vue b/src/core/view/components/icon/index.vue
index c4c9dacf..921f246a 100644
--- a/src/core/view/components/icon/index.vue
+++ b/src/core/view/components/icon/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <uni-icon>
+  <uni-icon v-on="$listeners">
     <i
       :class="`uni-icon-${type}`"
       :style="{'font-size': _converPx(size),'color': color}"
diff --git a/src/core/view/components/picker-view-column/index.vue b/src/core/view/components/picker-view-column/index.vue
index 556d5dac..daa6b930 100644
--- a/src/core/view/components/picker-view-column/index.vue
+++ b/src/core/view/components/picker-view-column/index.vue
@@ -96,9 +96,9 @@ export default {
       if (this._scroller) {
         switch (e.detail.state) {
           case 'start':
-            this._handleTouchStart(e)
-            disableScrollBounce({
-              disable: true
+            this._handleTouchStart(e)
+            disableScrollBounce({
+              disable: true
             })
             break
           case 'move':
@@ -106,9 +106,9 @@ export default {
             break
           case 'end':
           case 'cancel':
-            this._handleTouchEnd(e)
-            disableScrollBounce({
-              disable: false
+            this._handleTouchEnd(e)
+            disableScrollBounce({
+              disable: false
             })
         }
       }
@@ -182,12 +182,15 @@ export default {
     this.length = (this.$slots.default && this.$slots.default.length) || 0
     return createElement('uni-picker-view-column', {
       on: {
-        wheel: this._handleWheel
+        on: this.$listeners
       }
     }, [
       createElement('div', {
         ref: 'main',
-        staticClass: 'uni-picker-view-group'
+        staticClass: 'uni-picker-view-group',
+        on: {
+          wheel: this._handleWheel
+        }
       },
       [
         createElement('div', {
@@ -332,4 +335,4 @@ export default {
     height: 1px;
     color: #e5e5e5;
   }
-</style>
+</style>
diff --git a/src/core/view/components/swiper/index.vue b/src/core/view/components/swiper/index.vue
index 73877395..0cd6b7d7 100644
--- a/src/core/view/components/swiper/index.vue
+++ b/src/core/view/components/swiper/index.vue
@@ -617,11 +617,11 @@ export default {
     }
 
     return createElement(
-      'uni-swiper',
-      [createElement('div', {
-        ref: 'slidesWrapper',
-        'class': 'uni-swiper-wrapper',
+      'uni-swiper', {
         on: this.$listeners
+      }, [createElement('div', {
+        ref: 'slidesWrapper',
+        'class': 'uni-swiper-wrapper'
       }, slidesWrapperChild)]
     )
   }
diff --git a/src/platforms/app-plus/view/components/picker/index.vue b/src/platforms/app-plus/view/components/picker/index.vue
index bc95059c..fcfc5c6d 100644
--- a/src/platforms/app-plus/view/components/picker/index.vue
+++ b/src/platforms/app-plus/view/components/picker/index.vue
@@ -1,5 +1,7 @@
 <template>
-  <uni-picker @click.stop="_show">
+  <uni-picker
+    @click.stop="_show"
+    v-on="$listeners">
     <slot />
   </uni-picker>
 </template>
diff --git a/src/platforms/app-plus/view/components/web-view/index.vue b/src/platforms/app-plus/view/components/web-view/index.vue
index f01b4ca9..64277c8d 100644
--- a/src/platforms/app-plus/view/components/web-view/index.vue
+++ b/src/platforms/app-plus/view/components/web-view/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <uni-web-view />
+  <uni-web-view v-on="$listeners"/>
 </template>
-<script>
-import {
-  WEBVIEW_INSERTED,
+<script>
+import {
+  WEBVIEW_INSERTED,
   WEBVIEW_REMOVED
 } from '../../../constants'
 let webview = false
@@ -30,7 +30,7 @@ const insertHTMLWebView = ({
         }
       })
     })
-  }
+  }
   plus.webview.currentWebview().append(webview)
 }
 
@@ -50,9 +50,9 @@ const updateHTMLWebView = ({
         color: webviewStyles.progress.color
       }
     })
-  }
+  }
   webview.loadURL(realPath)
-}
+}
 
 const removeHTMLWebView = () => {
   plus.webview.currentWebview().remove(webview)
@@ -90,12 +90,12 @@ export default {
     updateHTMLWebView({
       src: this.$getRealPath(this.src),
       webviewStyles: this.webviewStyles
-    })
-    UniViewJSBridge.publishHandler(WEBVIEW_INSERTED, {}, this.$page.id)
+    })
+    UniViewJSBridge.publishHandler(WEBVIEW_INSERTED, {}, this.$page.id)
   },
   beforeDestroy () {
-    removeHTMLWebView()
-    UniViewJSBridge.publishHandler(WEBVIEW_REMOVED, {}, this.$page.id)
+    removeHTMLWebView()
+    UniViewJSBridge.publishHandler(WEBVIEW_REMOVED, {}, this.$page.id)
   }
 }
 </script>
@@ -107,4 +107,4 @@ export default {
     top: 0;
     bottom: 0;
   }
-</style>
+</style>
diff --git a/src/platforms/h5/view/components/map/index.vue b/src/platforms/h5/view/components/map/index.vue
index f1d9c434..da220b84 100644
--- a/src/platforms/h5/view/components/map/index.vue
+++ b/src/platforms/h5/view/components/map/index.vue
@@ -1,5 +1,7 @@
 <template>
-  <uni-map :id="id">
+  <uni-map
+    :id="id"
+    v-on="$listeners">
     <div
       ref="map"
       style="width: 100%; height: 100%; position: relative; overflow: hidden;" />
diff --git a/src/platforms/h5/view/components/picker/index.vue b/src/platforms/h5/view/components/picker/index.vue
index a3dee925..ed50f725 100644
--- a/src/platforms/h5/view/components/picker/index.vue
+++ b/src/platforms/h5/view/components/picker/index.vue
@@ -1,5 +1,7 @@
 <template>
-  <uni-picker @click.stop="_show">
+  <uni-picker
+    @click.stop="_show"
+    v-on="$listeners">
     <div
       ref="picker"
       class="uni-picker-container"
diff --git a/src/platforms/h5/view/components/web-view/index.vue b/src/platforms/h5/view/components/web-view/index.vue
index 6e260a99..5c656602 100644
--- a/src/platforms/h5/view/components/web-view/index.vue
+++ b/src/platforms/h5/view/components/web-view/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <uni-web-view />
+  <uni-web-view v-on="$listeners" />
 </template>
 <script>
 export default {
@@ -9,11 +9,11 @@ export default {
       type: String,
       default: ''
     }
-  },
-  watch: {
-    src (val, oldVal) {
-      this.iframe && (this.iframe.src = this.$getRealPath(this.src))
-    }
+  },
+  watch: {
+    src (val, oldVal) {
+      this.iframe && (this.iframe.src = this.$getRealPath(this.src))
+    }
   },
   mounted () {
     const {
@@ -23,9 +23,9 @@ export default {
       height
     } = this.$el.getBoundingClientRect()
 
-    this.iframe = document.createElement('iframe')
+    this.iframe = document.createElement('iframe')
     this.iframe.style.position = 'absolute'
-    this.iframe.style.display = 'block'
+    this.iframe.style.display = 'block'
     this.iframe.style.border = 0
     this.iframe.style.top = top + 'px'
     this.iframe.style.bottom = bottom + 'px'
@@ -54,4 +54,4 @@ export default {
         top: 0;
         bottom: 0;
     }
-</style>
+</style>
-- 
GitLab