From 581a76ac81392ee0e7f48abeb07c847bb777e63a Mon Sep 17 00:00:00 2001
From: liangguirong <liangguirong4@h-partners.com>
Date: Wed, 5 Jun 2024 16:25:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0=E5=92=8C=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E4=B8=8A=E6=8B=89=E5=8A=A0=E8=BD=BD=E5=9C=A8=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=AE=8C=E6=88=90=E4=B9=8B=E5=90=8E=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=AE=8B=E7=95=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: liangguirong <liangguirong4@h-partners.com>
---
 changelog.md                                                  | 4 ++++
 entry/oh-package.json5                                        | 2 +-
 library/oh-package.json5                                      | 2 +-
 .../src/main/ets/components/PullToRefresh/PullToRefresh.ets   | 2 ++
 oh-package.json5                                              | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/changelog.md b/changelog.md
index 9428dcc..dd38f1f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,7 @@
+## 2.0.6-rc.0
+
+1、修复自定义下拉刷新和自定义上拉加载在刷新完成之后页面残留的问题
+
 ## 2.0.5
 
 1、修复页面滑动到顶部时，偶现无法下拉的问题
diff --git a/entry/oh-package.json5 b/entry/oh-package.json5
index 60a300d..30a222a 100644
--- a/entry/oh-package.json5
+++ b/entry/oh-package.json5
@@ -4,7 +4,7 @@
   "name": "entry",
   "description": "example description",
   "repository": {},
-  "version": "2.0.5",
+  "version": "2.0.6-rc.0",
   "dependencies": {
     "@ohos/pulltorefresh": "file:../library"
   }
diff --git a/library/oh-package.json5 b/library/oh-package.json5
index 2d9d0b2..ac5fe2a 100644
--- a/library/oh-package.json5
+++ b/library/oh-package.json5
@@ -14,7 +14,7 @@
   "main": "index.ets",
   "repository": "https://gitee.com/openharmony-sig/PullToRefresh",
   "type": "module",
-  "version": "2.0.5",
+  "version": "2.0.6-rc.0",
   "dependencies": {},
   "tags": [
     "UI"
diff --git a/library/src/main/ets/components/PullToRefresh/PullToRefresh.ets b/library/src/main/ets/components/PullToRefresh/PullToRefresh.ets
index db7c006..0c7ba71 100644
--- a/library/src/main/ets/components/PullToRefresh/PullToRefresh.ets
+++ b/library/src/main/ets/components/PullToRefresh/PullToRefresh.ets
@@ -166,6 +166,7 @@ export struct PullToRefresh {
       }
       .width('100%')
       .height('100%')
+      .visibility((this.state == IS_PULL_DOWN_1 || this.state == IS_PULL_DOWN_2  || this.state == IS_REFRESHING) ? Visibility.Visible : Visibility.Hidden)
     } else {
       Stack() {
         Text(this.refreshText)
@@ -202,6 +203,7 @@ export struct PullToRefresh {
       }
       .width('100%')
       .height('100%')
+      .visibility((this.state == IS_PULL_UP_1  || this.state == IS_PULL_UP_2   || this.state == IS_LOADING ) ? Visibility.Visible : Visibility.Hidden)
     } else {
       Row() {
         Stack() {
diff --git a/oh-package.json5 b/oh-package.json5
index 69af36d..2ce6eb6 100644
--- a/oh-package.json5
+++ b/oh-package.json5
@@ -6,6 +6,6 @@
   "name": "pulltorefresh",
   "description": "example description",
   "repository": {},
-  "version": "2.0.5",
+  "version": "2.0.6-rc.0",
   "dependencies": {}
 }
-- 
Gitee