From b1b9744e9bac32ad73a7b1b9664639ac7eabd78b Mon Sep 17 00:00:00 2001 From: liangguirong Date: Tue, 19 Dec 2023 11:31:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=AD=A3=E5=BC=8F=E7=89=88=E6=9C=AC2.0.5?= =?UTF-8?q?;=202.=E6=B7=BB=E5=8A=A0=E6=BB=A1=E5=B1=8F=E4=B8=8B=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=A1=B5=E9=9D=A2=E7=9A=84demo=203.=E4=BF=AE=E6=94=B9?= =?UTF-8?q?demo=E4=B8=ADtabsTestPage=E6=96=87=E4=BB=B6=E9=87=8C=E9=9D=A2Ta?= =?UTF-8?q?bs=E7=BB=84=E4=BB=B6=E7=9A=84=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liangguirong --- changelog.md | 2 +- entry/oh-package.json5 | 4 +- entry/src/main/ets/pages/fullScreen.ets | 83 +++++++++++++++++++ entry/src/main/ets/pages/index.ets | 5 ++ entry/src/main/ets/pages/tabsTestPage.ets | 2 +- .../resources/base/profile/main_pages.json | 3 +- library/oh-package.json5 | 4 +- oh-package.json5 | 2 +- 8 files changed, 97 insertions(+), 8 deletions(-) create mode 100644 entry/src/main/ets/pages/fullScreen.ets diff --git a/changelog.md b/changelog.md index c0533bb..9428dcc 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,4 @@ -## 2.0.5-rc.0 +## 2.0.5 1、修复页面滑动到顶部时，偶现无法下拉的问题 2、修复下拉刷新回滑时list组件底层跟着滑动的问题 diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index b42313a..60a300d 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -4,8 +4,8 @@ "name": "entry", "description": "example description", "repository": {}, - "version": "2.0.5-rc.0", + "version": "2.0.5", "dependencies": { "@ohos/pulltorefresh": "file:../library" } -} \ No newline at end of file +} diff --git a/entry/src/main/ets/pages/fullScreen.ets b/entry/src/main/ets/pages/fullScreen.ets new file mode 100644 index 0000000..2349670 --- /dev/null +++ b/entry/src/main/ets/pages/fullScreen.ets @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { PullToRefresh } from '@ohos/pulltorefresh' + +@Entry +@Component +struct Index { + @State refreshText: string = ''; + private dataNumbers: string[] = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']; + private dataStrings: string[] = ['我的评论', '与我相关', '个人中心1', '个人中心2', '个人中心3', '我的发布', '设置', '退出登录']; + @State data: string[] = this.dataStrings; + // 需绑定列表或宫格组件 + private scroller: Scroller = new Scroller(); + + build() { + Column() { + PullToRefresh({ + // 必传项，列表组件所绑定的数据 + data: $data, + // 必传项，需绑定传入主体布局内的列表或宫格组件 + scroller: this.scroller, + // 必传项，自定义主体布局，内部有列表或宫格组件 + customList: () => { + // 一个用@Builder修饰过的UI方法 + this.getListView(); + }, + // 可选项，下拉刷新回调 + onRefresh: () => { + return new Promise((resolve, reject) => { + // 模拟网络请求操作，请求网络2秒后得到数据，通知组件，变更列表数据 + setTimeout(() => { + resolve('刷新成功'); + this.data = this.dataNumbers; + }, 2000); + }); + }, + // 可选项，上拉加载更多回调 + onLoadMore: () => { + return new Promise((resolve, reject) => { + // 模拟网络请求操作，请求网络2秒后得到数据，通知组件，变更列表数据 + setTimeout(() => { + resolve(''); + this.data.push("增加的条目" + this.data.length); + }, 2000); + }); + }, + customLoad: null, + customRefresh: null, + }) + } + } + + @Builder + private getListView() { + List({ space: 0, scroller: this.scroller }) { + ForEach(this.data, (item: string) => { + ListItem() { + Text(item) + .fontSize(20) + } + .width('100%') + .height('100%') + .backgroundColor('#95efd2') + }) + } + .backgroundColor('#eeeeee') + .divider({ strokeWidth: 1, color: 0x222222 }) + .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果 + .scrollSnapAlign(ScrollSnapAlign.CENTER) + } +} \ No newline at end of file diff --git a/entry/src/main/ets/pages/index.ets b/entry/src/main/ets/pages/index.ets index bf291ae..24b8a3c 100644 --- a/entry/src/main/ets/pages/index.ets +++ b/entry/src/main/ets/pages/index.ets @@ -34,6 +34,11 @@ struct Index { .onClick(() => { router.push({ url: 'pages/customRefreshAnim' }) }) + Button('满屏下展示页面') + .margin({ top: 10 }) + .onClick(() => { + router.push({ url: 'pages/fullScreen' }) + }) Button('Tab配合PullToRefresh') .margin({ top: 10 }) .onClick(() => { diff --git a/entry/src/main/ets/pages/tabsTestPage.ets b/entry/src/main/ets/pages/tabsTestPage.ets index 05e3c79..bad11dd 100644 --- a/entry/src/main/ets/pages/tabsTestPage.ets +++ b/entry/src/main/ets/pages/tabsTestPage.ets @@ -65,7 +65,7 @@ struct TabsExample { .onChange((index: number) => { this.currentIndex = index }) - .width('100%').height('100%') + .width('100%') .margin({ top: 52 }) .backgroundColor('#F1F3F5') }.width('100%') diff --git a/entry/src/main/resources/base/profile/main_pages.json b/entry/src/main/resources/base/profile/main_pages.json index bbeaf13..8aaf28b 100644 --- a/entry/src/main/resources/base/profile/main_pages.json +++ b/entry/src/main/resources/base/profile/main_pages.json @@ -5,6 +5,7 @@ "pages/customConfig", "pages/customRefreshAnim", "pages/tabsTestPage", - "pages/lazyForEachGuide" + "pages/lazyForEachGuide", + "pages/fullScreen" ] } diff --git a/library/oh-package.json5 b/library/oh-package.json5 index a0d4b2d..2d9d0b2 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-rc.0", + "version": "2.0.5", "dependencies": {}, "tags": [ "UI" @@ -22,4 +22,4 @@ "license": "Apache License 2.0", "devDependencies": {}, "name": "@ohos/pulltorefresh" -} \ No newline at end of file +} diff --git a/oh-package.json5 b/oh-package.json5 index 3231b78..69af36d 100644 --- a/oh-package.json5 +++ b/oh-package.json5 @@ -6,6 +6,6 @@ "name": "pulltorefresh", "description": "example description", "repository": {}, - "version": "2.0.5-rc.0", + "version": "2.0.5", "dependencies": {} } -- Gitee From be3dd16124603aa29e2b221916edb2e9be60d7c7 Mon Sep 17 00:00:00 2001 From: liangguirong Date: Thu, 21 Dec 2023 15:35:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E6=AD=A3=E5=BC=8F=E7=89=88=E6=9C=AC2.0.5?= =?UTF-8?q?;111=202.=E6=B7=BB=E5=8A=A0=E6=BB=A1=E5=B1=8F=E4=B8=8B=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=A1=B5=E9=9D=A2=E7=9A=84demo;111=203.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9demo=E4=B8=ADtabsTestPage=E6=96=87=E4=BB=B6=E9=87=8C?= =?UTF-8?q?=E9=9D=A2Tabs=E7=BB=84=E4=BB=B6=E7=9A=84=E9=AB=98=E5=BA=A6;111?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liangguirong --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 79048be..e534fbb 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,7 @@ customRefresh: null, ## 约束与限制 在下述版本验证通过： +- DevEco Studio: 4.1 Canary(4.1.3.317), SDK: API11 (4.1.0.36) - DevEco Studio: 4.0 (4.0.3.512), SDK: API10 (4.0.10.9) - DevEco Studio: 4.0 Canary2(4.0.3.300), SDK: API10 (4.0.8.6) -- Gitee