From e951e4128f1fc288499af6571a2c323c6e2ea5fe Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Wed, 19 Feb 2020 19:36:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20movable=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=99=90=E5=88=B6=E4=BB=85=E6=A8=AA=E5=90=91=E6=88=96?=
 =?UTF-8?q?=E7=BA=B5=E5=90=91=E7=A7=BB=E5=8A=A8=E6=97=B6=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=8F=AF=E8=83=BD=E4=B8=AD=E6=96=AD=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/components/movable-view/index.vue    | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/core/view/components/movable-view/index.vue b/src/core/view/components/movable-view/index.vue
index bb51cd4414..20a8e2b831 100644
--- a/src/core/view/components/movable-view/index.vue
+++ b/src/core/view/components/movable-view/index.vue
@@ -1,7 +1,7 @@
 <template>
   <uni-movable-view v-on="$listeners">
-    <v-uni-resize-sensor @resize="setParent"/>
-    <slot/>
+    <v-uni-resize-sensor @resize="setParent" />
+    <slot />
   </uni-movable-view>
 </template>
 <script>
@@ -317,28 +317,16 @@ export default {
           x = event.detail.dx + this.__baseX
           this.__touchInfo.historyX.shift()
           this.__touchInfo.historyX.push(x)
-          if (!this.yMove) {
-            if (!null !== this._checkCanMove) {
-              if (Math.abs(event.detail.dx / event.detail.dy) > 1) {
-                this._checkCanMove = false
-              } else {
-                this._checkCanMove = true
-              }
-            }
+          if (!this.yMove && this._checkCanMove === null) {
+            this._checkCanMove = Math.abs(event.detail.dx / event.detail.dy) < 1
           }
         }
         if (this.yMove) {
           y = event.detail.dy + this.__baseY
           this.__touchInfo.historyY.shift()
           this.__touchInfo.historyY.push(y)
-          if (!this.xMove) {
-            if (!null !== this._checkCanMove) {
-              if (Math.abs(event.detail.dy / event.detail.dx) > 1) {
-                this._checkCanMove = false
-              } else {
-                this._checkCanMove = true
-              }
-            }
+          if (!this.xMove && this._checkCanMove === null) {
+            this._checkCanMove = Math.abs(event.detail.dy / event.detail.dx) < 1
           }
         }
         this.__touchInfo.historyT.shift()
-- 
GitLab