From a20ee298cfa764cec669486bd77dee5edce7f2e8 Mon Sep 17 00:00:00 2001
From: DCloud-XHY <xionghuayu@dcloud.io>
Date: Tue, 12 Mar 2024 21:30:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=A4=BA=E4=BE=8B=E6=8A=A5=E9=94=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.uts                                           |  4 +++-
 .../scroll-view-custom-refresher-props.uvue        | 11 ++++++-----
 .../custom-refresher/custom-refresher.uvue         | 14 +++++---------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/main.uts b/main.uts
index 3d4dc082..afbd355e 100644
--- a/main.uts
+++ b/main.uts
@@ -3,7 +3,9 @@ import App from './App.uvue'
 import { createSSRApp } from 'vue'
 export function createApp() {
   const app = createSSRApp(App)
-
+  app.config.errorHandler = (err, vm, info) => {
+    console.log(err, vm, info)
+  }
   app.mixin({
     onReady() {
       setTimeout(() => {
diff --git a/pages/component/scroll-view/scroll-view-custom-refresher-props.uvue b/pages/component/scroll-view/scroll-view-custom-refresher-props.uvue
index e7c48952..a41dec90 100644
--- a/pages/component/scroll-view/scroll-view-custom-refresher-props.uvue
+++ b/pages/component/scroll-view/scroll-view-custom-refresher-props.uvue
@@ -1,6 +1,6 @@
 <template>
 	<scroll-view style="flex:1;" :refresher-enabled="true" :refresher-triggered="refresherTriggered"
-		refresher-default-style="none" @refresherpulling="onRefresherpulling" @refresherrefresh="onRefresherrefresh">
+		refresher-default-style="none" @refresherpulling="onRefresherpulling" @refresherrefresh="onRefresherrefresh" @refresherrestore="onRefreshrestore">
 		<view style="height: 25px;"></view>
 		<view v-for="i in 20" class="content-item">
 			<text class="text">item-{{i}}</text>
@@ -38,9 +38,6 @@
 		methods: {
 			onRefresherpulling(e : RefresherEvent) {
 				this.pullingDistance = e.detail.dy;
-				if (this.pullingDistance.toDouble() == 0.0) {
-					this.resetting = false;
-				}
 			},
 			onRefresherrefresh() {
 				this.refresherTriggered = true
@@ -48,7 +45,11 @@
 					this.refresherTriggered = false
 					this.resetting = true;
 				}, 1500)
-			},
+			},
+      onRefreshrestore() {
+        this.pullingDistance = 0
+      	this.resetting = false;
+      }
 		}
 	}
 </script>
diff --git a/pages/template/custom-refresher/custom-refresher.uvue b/pages/template/custom-refresher/custom-refresher.uvue
index 476aeea1..64db3a6d 100644
--- a/pages/template/custom-refresher/custom-refresher.uvue
+++ b/pages/template/custom-refresher/custom-refresher.uvue
@@ -3,6 +3,7 @@
       :refresher-enabled="true" :refresher-triggered="refresherTriggered" refresher-default-style="none"
       @refresherpulling="onRefresherpulling"
       @refresherrefresh="onRefresherrefresh"
+      @refresherrestore="onRefreshrestore"
       :refresher-threshold="refresherThreshold"
   >
     <view v-for="i in 20" class="content-item">
@@ -43,9 +44,6 @@
       onRefresherpulling(e:RefresherEvent){
         // console.log('onRefresherpulling',e.detail.dy)
         this.pullingDistance = e.detail.dy
-        if (this.pullingDistance.toDouble() == 0.0) {
-          this.resetting = false;
-        }
       },
       onRefresherrefresh(){
         this.refresherTriggered = true
@@ -53,12 +51,10 @@
           this.refresherTriggered = false
         },1500)
       },
-      // onRefresherrestore(e:RefresherEvent){
-      //   console.log('onRefresherrestore',e)
-      // },
-      // onRefresherabort(e:RefresherEvent){
-      //   console.log('onRefresherabort',e)
-      // },
+      onRefreshrestore() {
+        this.pullingDistance = 0
+      	this.resetting = false;
+      }
     }
   }
 </script>
-- 
GitLab