feature(2.2.2)

Author: damengbuxing

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

@@ -21,7 +21,7 @@ export default class EntryAbility extends UIAbility {
 			// 注册自定义字体图标
 			mainWindow.getUIContext().getFont().registerFont({
 				familyName: 'testFont',
-				familySrc: $rawfile('iconfont.woff')
+				familySrc: $rawfile('iconfont.ttf')
 			})
 			IBestSetUIGlobalConfig({
 				fontNames: ['testFont']

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

@@ -57,8 +57,9 @@ struct IconsPage {
 			ListItem() {
 				ComponentShowContainer({ title: "使用自定义图标" }) {
 					Row({ space: SPACE.SM }) {
-						IBestIcon({ fontName: "testFont", name: "\ue953" })
+						IBestIcon({ fontName: "testFont", name: "\ue6d4" })
 						IBestIcon({ fontName: "testFont", name: "\ue963" })
+						IBestIcon({ fontName: "testFont", name: "\ue971" })
 						IBestIcon({ fontName: "testFont", name: "\ue973" })
 					}
 				}

entry/src/main/resources/rawfile/iconfont.ttf

@@ -1,7 +1,7 @@
 /**
  * Use these variables when you tailor your ArkTS code. They must be of the const type.
  */
-export const HAR_VERSION = '2.2.1';
+export const HAR_VERSION = '2.2.2';
 export const BUILD_MODE_NAME = 'release';
 export const DEBUG = false;
 export const TARGET_NAME = 'default';

entry/src/main/resources/rawfile/iconfont.woff

@@ -1,6 +1,6 @@
 # 版本记录
 
-## 2.2.1
+## 2.2.2
 #### 新增:
 1. 新增 IBestTree 树形控件;
 2. 全局配置新增 fontNames 属性,支持在包含图标的组件上使用自定义图标;

library/BuildProfile.ets

@@ -1,6 +1,6 @@
 {
 	"name": "@ibestservices/ibest-ui",
-	"version": "2.2.1",
+	"version": "2.2.2",
 	"description": "一个轻量、简单易用、可定制主题、支持深色模式和浅色模式的鸿蒙开源UI组件库, 包含Button、Calendar、Form、Field、Picker、Popup、Toast、Dialog、ImageCropper等60+个优质组件。",
 	"main": "Index.ets",
 	"keywords": [

library/CHANGELOG.md

@@ -41,9 +41,17 @@ export struct IBestIcon {
 	isOnlineImage(): boolean {
 		return (this.name as string).startsWith("http")
 	}
+	isSingleUnicodeEscape(str: string) {
+		return str.length == 1 && /^[\u0000-\uFFFF]$/.test(str)
+	}
 	getFontFamily(){
-		let arr = ["ibestFont", getResourceStr(this.fontName)].concat(this.config.fontNames.map(e => getResourceStr(e)))
-		return Array.from<string>(new Set(arr.filter(e => e))).join(",")
+		let name = this.name as string
+		if(this.isSingleUnicodeEscape(name)){
+			let arr = this.config.fontNames.map(e => getResourceStr(e)).concat([getResourceStr(this.fontName)])
+			return Array.from<string>(new Set(arr.filter(e => e))).join(",")
+		}else {
+			return "ibestFont"
+		}
 	}
 	build() {
 		if (typeof this.name == "string" && !this.isOnlineImage()) {

library/oh-package.json5

@@ -1,5 +1,5 @@
 import { IBestStorageKey } from '../../model/Global.type'
-import { convertDimensionsWidthUnit } from '../../utils/utils'
+import { convertDimensionsWidthUnit, mergeObject } from '../../utils/utils'
 import { BORDER_RADIUS } from './border'
 import { COLOR_OPACITY, THEME_COLOR } from './color'
 import { FONT_SIZE } from './font'
@@ -56,12 +56,8 @@ export function getDefaultBaseStyle(): IBestUIBaseStyleObjType {
  */
 export function setIBestUIBaseStyle(styleData?: Partial<IBestUIBaseStyleType>) {
 	const newStyleData = getDefaultBaseStyle()
-	if (typeof styleData === 'object' && styleData !== null) {
-		Object.keys(styleData).forEach(item => {
-			if (newStyleData[item]) {
-				newStyleData[item] = (styleData as IBestUIBaseStyleObjType)[item] ?? newStyleData[item]
-			}
-		})
+	if (styleData) {
+		mergeObject(newStyleData, styleData)
 	}
 	AppStorage.setOrCreate(IBestStorageKey.BASE_STYLE, newStyleData)
 }

library/src/main/ets/components/icon/index.ets

@@ -118,6 +118,17 @@ export function random(min: number, max: number) {
 	}
 	return 0
 }
+/**
+ * 合并对象
+ */
+export function mergeObject(target: AnyType, source: AnyType) {
+	if(!source){
+		return
+	}
+	for (let key of Object.keys(source)) {
+		target[key] = source[key]
+	}
+}
 /**
  * 获取组件信息
  * @param {context} UIContext