feature/2.2.1 (#98)

* feature(2.2.1)

* feature(2.2.1)

Author: damengbuxing

AppScope/app.json5

@@ -2,8 +2,8 @@
 	"app": {
 		"bundleName": "com.ibestservice.ibest_ui",
 		"vendor": "example",
-		"versionCode": 1000013,
-		"versionName": "1.1.3",
+		"versionCode": 1000014,
+		"versionName": "1.1.4",
 		"icon": "$media:layered_image",
 		"label": "$string:app_name"
 	}

README.md

@@ -135,6 +135,7 @@ OpenHarmony ohpm 环境配置等更多内容，请参考[如何安装 OpenHarmon
 | Table 表格             | 用于展示多条结构类似的数据。                     | <a href="https://ibestui.ibestservices.com/components/table/" target="_blank">文档</a>          |
 | Tag 标签               | 用于标记关键词和概括主要内容。                    | <a href="https://ibestui.ibestservices.com/components/tag/" target="_blank">文档</a>            |
 | TextEllipsis 文本省略    | 对长文本进行省略，支持展开/收起。                  | <a href="https://ibestui.ibestservices.com/components/textEllipsis/" target="_blank">文档</a>   |
+| Tree 树形控件            | 用清晰的层级结构展示信息，可展开或折叠。               | <a href="https://ibestui.ibestservices.com/components/tree/" target="_blank">文档</a>           |
 | Watermark 水印         | 在页面上添加特定的文字或图案作为水印，可用于防止信息盗用。      | <a href="https://ibestui.ibestservices.com/components/watermark/" target="_blank">文档</a>      |
 
 ### 导航组件

build-profile.json5

@@ -47,7 +47,7 @@
 				"signingConfig": "default",
 				"compatibleSdkVersion": "5.1.1(19)",
 				"runtimeOS": "HarmonyOS",
-				"targetSdkVersion": "6.0.0(20)",
+				"targetSdkVersion": "6.0.1(21)",
 				"buildOption": {
 					"strictMode": {
 						"useNormalizedOHMUrl": true

entry/src/main/ets/entryability/EntryAbility.ets

@@ -2,7 +2,7 @@ import AbilityConstant from '@ohos.app.ability.AbilityConstant';
 import UIAbility from '@ohos.app.ability.UIAbility';
 import Want from '@ohos.app.ability.Want';
 import window from '@ohos.window';
-import { IBestInit, IBestSetGlobalConfig } from '@ibestservices/ibest-ui';
+import { IBestInit, IBestSetUIGlobalConfig } from '@ibestservices/ibest-ui';
 import { ConfigurationConstant } from '@kit.AbilityKit';
 import GlobalStore from '../utils/global';
 
@@ -23,6 +23,9 @@ export default class EntryAbility extends UIAbility {
 				familyName: 'testFont',
 				familySrc: $rawfile('iconfont.woff')
 			})
+			IBestSetUIGlobalConfig({
+				fontNames: ['testFont']
+			})
 		})
 	}
 

entry/src/main/ets/pages/Index.ets

@@ -6,15 +6,15 @@ import { common, Want, bundleManager } from '@kit.AbilityKit'
 import { getAppVersion, getResourceStr } from '../utils/utils'
 import { rcp } from '@kit.RemoteCommunicationKit'
 import fs from '@ohos.file.fs'
-import { updateManager } from '@kit.AppGalleryKit'
+import { commentManager, updateManager } from '@kit.AppGalleryKit'
 import RouterUtil from '../utils/routerUtil'
 
 interface ComponentPart {
 	title: Resource
 	list: ComponentItem[]
 }
 interface ComponentItem {
-	name: ResourceStr,
+	name: ResourceStr
 	path: string
 }
 interface Tab {
@@ -294,6 +294,10 @@ struct Index {
 					name: $r("app.string.component_textEllipsis"),
 					path: "TextEllipsis"
 				},
+				{
+					name: $r("app.string.component_tree"),
+					path: "Tree"
+				},
 				{
 					name: $r("app.string.component_watermark"),
 					path: "Watermark"
@@ -437,6 +441,7 @@ struct Index {
 	private context = this.getUIContext().getHostContext() as common.UIAbilityContext
 	private router = this.getUIContext().getRouter()
 	private navPathStack: NavPathStack = new NavPathStack()
+	private timer: number = 0
 
 	@Builder tabBuilder(index: number){
 		Column({space: 5}) {
@@ -610,7 +615,7 @@ struct Index {
 									isLink: true,
 									hasBorder: false,
 									onCellClick: () => {
-										this.showCommentDialog()
+										this.viewAppStoreDetail()
 									}
 								})
 							}
@@ -663,10 +668,15 @@ struct Index {
 		RouterUtil.navPathStackList.push(this.navPathStack)
 		this.checkUpdate()
 		this.getUiVersion()
+		this.showCommentDialog()
 		// setTimeout(() => {
-		// 	RouterUtil.push("Switch")
+		//     RouterUtil.push("Tree")
 		// }, 100)
 	}
+	aboutToDisappear(): void {
+		clearInterval(this.timer)
+		this.timer = 0
+	}
 	getTitleOpacity(){
 		// let scrollY = this.scrollTop < 50 ? this.scrollTop : 50
 		return this.scrollTop < 50 ? 0 : 1
@@ -730,10 +740,21 @@ struct Index {
 	}
 	// 提示评论
 	showCommentDialog(){
-		// 评论弹框 6.0.0 支持
-		// commentManager.showCommentDialog(this.context).then(()=>{
-		// 	console.log("succeeded in showing commentDialog.");
-		// })
+		let count = 0
+		this.timer = setInterval(() => {
+			count++
+			if(count > 120){
+				clearInterval(this.timer)
+				commentManager.showCommentDialog(this.context).then(()=>{
+					console.log("succeeded in showing commentDialog.");
+				}).catch((error: BusinessError<Object>) => {
+					console.log(`showCommentDialog failed, Code: ${error.code}, message: ${error.message}`);
+				})
+			}
+		}, 1000)
+	}
+	// 跳转应用市场详情
+	viewAppStoreDetail(){
 		let bundleName = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT).name
 		let link = 'https://appgallery.huawei.com/app/detail?id=' + bundleName + '&action=write-review'
 		this.context.openLink(link, { appLinkingOnly: false })

entry/src/main/ets/pages/base/ActionSheet.ets

@@ -61,14 +61,11 @@ struct ActionSheetPage {
 					onBtnClick: () => {
 						IBestActionSheet.show({
 							actions: ["选项一", "选项二", "选项三"],
-							onSelect: (index: number, name?: string | number) => {
-								IBestToast.show(`点击了第${index}个选项，名称为${name}`)
-							},
-							beforeClose: () => {
+							beforeClose: (index: number, name?: string | number) => {
 								return new Promise((resolve, reject) => {
 									IBestDialogUtil.open({
 										title: "提示",
-										message: "确定关闭?",
+										message: `确定选择${name}？`,
 										showCancelButton: true,
 										onConfirm: () => {
 											resolve(true)
@@ -78,6 +75,9 @@ struct ActionSheetPage {
 										}
 									})
 								})
+							},
+							onSelect: (index: number, name?: string | number) => {
+								IBestToast.show(`点击了第${index}个选项，名称为${name}`)
 							}
 						})
 					}
@@ -216,7 +216,6 @@ struct ActionSheetPage {
 						})
 					}
 				})
-
 			}
 			.width(CONTAINER_SIZE.FULL)
 			.justifyContent(FlexAlign.Center)

entry/src/main/ets/pages/base/Button.ets

@@ -197,7 +197,12 @@ struct ButtonPage {
 							})
 							IBestButton({
 								text: $r("app.string.border"),
-								btnBorderColor: "red"
+								btnBorder: {
+									width: 2,
+									color: "red",
+									style: BorderStyle.Dashed,
+									radius: 16
+								}
 							})
 							IBestButton({
 								type: "primary",

entry/src/main/ets/pages/base/Caliper.ets

@@ -12,12 +12,13 @@ export function CaliperBuilder(_: string, title: string){
 @Component
 struct CaliperPage {
     @State title: string = ''
-    @State value: number = 6
+    @State value: number = 0
     @State value1: number = 50
     @State value2: number = 0
     @State value3: number = 0
-    @State value4: number = 0
+    @State value4: number = 0.5
     @State value5: number = 0
+    @State value6: number = 0
 
     build() {
         NavDestination() {
@@ -59,15 +60,21 @@ struct CaliperPage {
                                 scales: 5,
                                 scaleSize: 2
                             })
+                            Text(this.value4.toString())
+                            IBestCaliper({
+                                value: $value4,
+                                endNum: 5,
+                                scaleSize: 0.1
+                            })
                         }.alignItems(HorizontalAlign.Start)
                     }
                 }
                 ListItem() {
                     ComponentShowContainer({ title: '自定义样式' }){
                         Column({space: SPACE.BASE}){
-                            Text(this.value4.toString())
+                            Text(this.value5.toString())
                             IBestCaliper({
-                                value: $value4,
+                                value: $value5,
                                 bgColor: "#d8e9f6",
                                 fontColor: "#038cfd",
                                 bigScaleHeight: 50,
@@ -81,13 +88,13 @@ struct CaliperPage {
                 ListItem() {
                     ComponentShowContainer({ title: '刻度对齐方式' }){
                         Column({space: SPACE.SM}){
-                            Text(this.value5.toString())
+                            Text(this.value6.toString())
                             IBestCaliper({
-                                value: $value5,
+                                value: $value6,
                                 scaleAlign: "center"
                             })
                             IBestCaliper({
-                                value: $value5,
+                                value: $value6,
                                 scaleAlign: "bottom"
                             })
                         }.alignItems(HorizontalAlign.Start)