From fdeae9ccf56f4b9ee28eddb6a71ceba39cbaadb9 Mon Sep 17 00:00:00 2001 From: Tatiana Titova Date: Thu, 26 Jun 2025 18:00:13 +0300 Subject: [PATCH 1/4] Add @idlizer/arktscgen dependency Signed-off-by: Tatiana Titova --- ui2abc/libarkts/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ui2abc/libarkts/package.json b/ui2abc/libarkts/package.json index 6d79dbb254..b0bd837a51 100644 --- a/ui2abc/libarkts/package.json +++ b/ui2abc/libarkts/package.json @@ -29,6 +29,7 @@ "panda_sdk_version": "next" }, "dependencies": { + "@idlizer/arktscgen": "2.1.9-arktscgen-6", "@koalaui/ets-tsc": "4.9.5-r6", "@koalaui/build-common": "1.7.6+devel", "@koalaui/compat": "1.7.6+devel", -- Gitee From ac97e4644108da379cc223e470fca18abea98643 Mon Sep 17 00:00:00 2001 From: Tatiana Titova Date: Thu, 10 Jul 2025 16:15:30 +0300 Subject: [PATCH 2/4] Add empty string to resolve disambigous signatures Signed-off-by: Tatiana Titova --- .../shopping/entry/src/main/ets/pages/detailPage/detail.ets | 4 ++-- .../shopping/user/src/ets/pages/detailPage/detail.ets | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arkoala-arkts/loader/app/shopping/entry/src/main/ets/pages/detailPage/detail.ets b/arkoala-arkts/loader/app/shopping/entry/src/main/ets/pages/detailPage/detail.ets index 21944bcec0..49d11078b3 100644 --- a/arkoala-arkts/loader/app/shopping/entry/src/main/ets/pages/detailPage/detail.ets +++ b/arkoala-arkts/loader/app/shopping/entry/src/main/ets/pages/detailPage/detail.ets @@ -361,7 +361,7 @@ export struct Detail { .margin({ top: 5, bottom: 5 }) Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { - Text() + Text("") Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { ForEach(this.phoneType, (item: PhoneTypeModel) => { Image(`${item.uri}`) @@ -650,4 +650,4 @@ export struct Detail { .backgroundColor('#10000000') }.hideTitleBar(true) } -} \ No newline at end of file +} diff --git a/arkoala-arkts/shopping/user/src/ets/pages/detailPage/detail.ets b/arkoala-arkts/shopping/user/src/ets/pages/detailPage/detail.ets index e5d11dc484..4f9ba748b8 100644 --- a/arkoala-arkts/shopping/user/src/ets/pages/detailPage/detail.ets +++ b/arkoala-arkts/shopping/user/src/ets/pages/detailPage/detail.ets @@ -364,7 +364,7 @@ export struct Detail { .margin({ top: 5, bottom: 5 } as Margin) Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { - Text() + Text("") Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { ForEach(this.phoneType, (item: PhoneTypeModel) => { Image(`${item.uri}`) -- Gitee From 450d4412b6ad703bcc5ecef4fb23fe65d92fb158 Mon Sep 17 00:00:00 2001 From: Tatiana Titova Date: Thu, 10 Jul 2025 17:52:52 +0300 Subject: [PATCH 3/4] Add empty string to resolve disambigous signatures in tests Signed-off-by: Tatiana Titova --- arkoala-arkts/ets-plugin/test/ets/Rewrite.ets | 6 +++--- .../ets-plugin/test/ets/dollar-dollar/components.ets | 4 ++-- .../ets-plugin/test/ets/ets-component-call/ets-call.ets | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arkoala-arkts/ets-plugin/test/ets/Rewrite.ets b/arkoala-arkts/ets-plugin/test/ets/Rewrite.ets index 301cea778f..49350193e1 100644 --- a/arkoala-arkts/ets-plugin/test/ets/Rewrite.ets +++ b/arkoala-arkts/ets-plugin/test/ets/Rewrite.ets @@ -134,7 +134,7 @@ function looks() { @Component struct StylesExample { build() { - Text() + Text("") .width(17) .looks() } @@ -150,7 +150,7 @@ struct StylesMethodExample { } build() { - Text() + Text("") .width(17) .nice() } @@ -196,7 +196,7 @@ function attributeExtend(n: number, animatable: AnimatableValue) { @Component struct AnimatableExtendExample { build() { - Text() + Text("") .width(17) .attributeExtend(50, new AnimatableValue()) } diff --git a/arkoala-arkts/ets-plugin/test/ets/dollar-dollar/components.ets b/arkoala-arkts/ets-plugin/test/ets/dollar-dollar/components.ets index 3e7cfa06f3..14e836df88 100644 --- a/arkoala-arkts/ets-plugin/test/ets/dollar-dollar/components.ets +++ b/arkoala-arkts/ets-plugin/test/ets/dollar-dollar/components.ets @@ -61,5 +61,5 @@ struct DollarDollar { @Builder function builder() { - Text() -} \ No newline at end of file + Text("") +} diff --git a/arkoala-arkts/ets-plugin/test/ets/ets-component-call/ets-call.ets b/arkoala-arkts/ets-plugin/test/ets/ets-component-call/ets-call.ets index 8686b96009..c7feeaa4eb 100644 --- a/arkoala-arkts/ets-plugin/test/ets/ets-component-call/ets-call.ets +++ b/arkoala-arkts/ets-plugin/test/ets/ets-component-call/ets-call.ets @@ -27,7 +27,7 @@ export function callBuiltinComponent() { @Builder export function callFunctionWithReservedName() { - Text() + Text("") } @Builder @@ -52,4 +52,4 @@ function main() { Column({ space: 30 }) { Flex({ justifyContent: 30 }) } -} \ No newline at end of file +} -- Gitee From 95159e886f010299a13af4e39c88b861011bd70e Mon Sep 17 00:00:00 2001 From: wuxiesaber Date: Sat, 19 Jul 2025 14:25:48 +0800 Subject: [PATCH 4/4] adjust number2int in map and set Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICN2J6 Signed-off-by: wuxiesaber Change-Id: Ib36ebf17a202cf4a18b0ffbedc5eb82dde11b133 --- incremental/compat/src/arkts/observable.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/incremental/compat/src/arkts/observable.ts b/incremental/compat/src/arkts/observable.ts index bd1aa5afb1..b670b11bf5 100644 --- a/incremental/compat/src/arkts/observable.ts +++ b/incremental/compat/src/arkts/observable.ts @@ -595,7 +595,7 @@ class ObservableMap extends Map { return ObservableHandler.find(this) } - override get size(): number { + override get size(): int { this.handler?.onAccess() return super.size } @@ -699,7 +699,7 @@ class ObservableSet extends Set { return new Set(this.elements.keys()).toString() } - override get size(): number { + override get size(): int { this.handler?.onAccess() return this.elements.size } -- Gitee