diff --git a/README.md b/README.md index a37029064caf52fa3207b7ed77bacc4085f0522f..d8b974dda94342059d101f5e8a3e640debcb356f 100644 --- a/README.md +++ b/README.md @@ -67,15 +67,15 @@ customRefresh: null, ### 使用限制 1、目前只支持List、Scroll、Tabs、Grid和WaterFlow系统容器组件； -2、不支持设置系统容器组件的弹簧效果和阴影效果，使用时需要将系统组件edgeEffect属性的值设置为(EdgeEffect.None)； +2、暂不支持设置系统容器组件的弹簧效果和阴影效果，使用时需要将系统组件edgeEffect属性的值设置为(EdgeEffect.None)； -3、不支持页面触底时自动触发上拉加载功能； +3、暂不支持页面触底时自动触发上拉加载功能； -4、不支持在页面数据不满一屏时触发上拉加载功能； +4、暂不支持在页面数据不满一屏时触发上拉加载功能； -5、不支持通过代码的方式去触发下拉刷新功能； +5、暂不支持通过代码的方式去触发下拉刷新功能； -6、不支持在下拉刷新动画结束时提供手势结束的回调； +6、暂不支持在下拉刷新动画结束时提供手势结束的回调； ### 支持lazyForEarch的数据作为数据源 LazyForEach从提供的数据源中按需迭代数据，并在每次迭代过程中创建相应的组件。当LazyForEach在滚动容器中使用了，框架会根据滚动容器可视区域按需创建组件，当组件滑出可视区域外时，框架会进行组件销毁回收以降低内存占用 @@ -148,6 +148,7 @@ interface DataChangeListener { | setRefreshTextColor | ResourceColor | 下拉加载完毕后提示文本的字体颜色 | '#999999' | | setRefreshTextSize | number 或 string 或 Resource | 下拉加载完毕后提示文本的字体大小 | 18 | | setRefreshAnimDuration | number | 下拉动画执行一次的时间，仅在自定义下拉刷新动画时有效 | 1000 | +| setRefreshCompleteTextHoldTime | number | 下拉刷新完毕后, 刷新成功文本停留的时间 | 1000 | | setLoadImgHeight | number | 上拉动画中图片的高度 | 30 | | setLoadBackgroundColor | ResourceColor | 上拉动画区域背景色 | 'rgba(0,0,0,0)' | | setLoadTextColor | ResourceColor | 上拉文本的字体颜色 | '#999999' | diff --git a/changelog.md b/changelog.md index dc513ac42de28618240c6f2f048b89973a6b7b25..bd060d7aa0f8cdcf37e4f8584cb8c7da23c81ab3 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +## 2.1.0-rc.1 +1、新增设置下拉刷新成功后刷新成功文本的停留时间接口setRefreshCompleteTextHoldTime + ## 2.1.0-rc.0 1、新版装饰器语法整改 diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index 5ad9f538d6663dd2045c6c34c08a27faf104fd98..80b2d359219cdec34aaf2827ec7234764f9e5196 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -4,7 +4,7 @@ "name": "entry", "description": "example description", "repository": {}, - "version": "2.1.0-rc.0", + "version": "2.1.0-rc.1", "dependencies": { "@ohos/pulltorefresh": "file:../library" } diff --git a/entry/src/main/ets/pages/customConfig.ets b/entry/src/main/ets/pages/customConfig.ets index efe966b643b0ac39cd439a91aabb68a027173f3c..90135870ae502571bfe44c1aa81212a342793704 100644 --- a/entry/src/main/ets/pages/customConfig.ets +++ b/entry/src/main/ets/pages/customConfig.ets @@ -46,6 +46,7 @@ struct Index { .setLoadTextPullUp1('请继续上拉...')// 上拉1阶段文本 .setLoadTextPullUp2('释放即可刷新')// 上拉2阶段文本 .setLoadTextLoading('加载中...') // 上拉加载更多中时的文本 + .setRefreshCompleteTextHoldTime(500) //上拉刷新后停留的时间, 默认一秒, 建议设置500 } build() { diff --git a/library/oh-package.json5 b/library/oh-package.json5 index 8691290ac2f93c9cb507d4c6ec90a131946d359a..7c1b27935d08a437c63daed8e3a1332ceeb1ae7d 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.1.0-rc.0", + "version": "2.1.0-rc.1", "dependencies": {}, "tags": [ "UI" diff --git a/library/src/main/ets/components/PullToRefresh/PullToRefresh.ets b/library/src/main/ets/components/PullToRefresh/PullToRefresh.ets index bc34baeb35098f49e17bad5c4890552f92664845..4d0284efcdc588459f40ff7ab41ab24f04e8da76 100644 --- a/library/src/main/ets/components/PullToRefresh/PullToRefresh.ets +++ b/library/src/main/ets/components/PullToRefresh/PullToRefresh.ets @@ -409,7 +409,7 @@ export struct PullToRefresh { } setTimeout(() => { this.closeRefresh(); - }, 1000); + }, this.refreshConfigurator?.getRefreshCompleteTextHoldTime() ?? 1000); } }); } diff --git a/library/src/main/ets/components/PullToRefresh/PullToRefreshConfigurator.ets b/library/src/main/ets/components/PullToRefresh/PullToRefreshConfigurator.ets index 1c04be3e911ec927f9d902f16533300248ab51db..f993a8ae38f1b22dad76565918e7d1756f2e2d51 100644 --- a/library/src/main/ets/components/PullToRefresh/PullToRefreshConfigurator.ets +++ b/library/src/main/ets/components/PullToRefresh/PullToRefreshConfigurator.ets @@ -25,6 +25,7 @@ export class PullToRefreshConfigurator { private refreshTextColor?: ResourceColor = '#999999'; // 下拉加载完毕后提示文本的字体颜色 private refreshTextSize?: number | string | Resource = 18; // 下拉加载完毕后提示文本的字体大小 private refreshAnimDuration?: number = 1000; // 下拉动画执行一次的时间 + private refreshCompleteTextHoldTime?: number = 1000; //下拉刷新完毕后, 刷新成功文本停留的时间 private loadImgHeight?: number = 30; // 上拉图片高度 private loadBackgroundColor?: ResourceColor = 'rgba(0,0,0,0)'; // 上拉动画区域背景色 private loadTextColor?: ResourceColor = '#999999'; // 上拉文本的字体颜色 @@ -87,6 +88,15 @@ export class PullToRefreshConfigurator { return this.animDuration; } + setRefreshCompleteTextHoldTime(refreshCompleteTextHoldTime: number) { + this.refreshCompleteTextHoldTime = refreshCompleteTextHoldTime; + return this; + } + + getRefreshCompleteTextHoldTime(): number { + return this.refreshCompleteTextHoldTime !== undefined ? this.refreshCompleteTextHoldTime : 1000; + } + getRefreshWidth(): number { if (this.refreshHeight !== undefined) { return this.refreshHeight / 3 * 4; diff --git a/oh-package.json5 b/oh-package.json5 index 1e0d7192ad72f5140bd863a83059fdb2e790cead..d271ade4fdacdf9241b97b40868868ee7bd78072 100644 --- a/oh-package.json5 +++ b/oh-package.json5 @@ -6,6 +6,7 @@ "name": "pulltorefresh", "description": "example description", "repository": {}, - "version": "2.1.0-rc.0", - "dependencies": {} + "version": "2.1.0-rc.1", + "dependencies": {}, + "modelVersion": "" }