From cbd2231fbaa1344ac17e99feff0f43cbb35e3c91 Mon Sep 17 00:00:00 2001 From: liyi0309 Date: Wed, 10 Sep 2025 16:33:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?levelorder=20=E5=AF=B9=E6=8E=A5=20Signed-of?= =?UTF-8?q?f-by:=20liyi0309=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arkui-ohos/@ohos.promptAction.ts | 43 ++++++------------- 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.promptAction.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.promptAction.ts index f00c17e5f63..18009817e77 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.promptAction.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.promptAction.ts @@ -37,40 +37,23 @@ export enum ImmersiveMode { EXTEND = 1, } -export class LevelOrderInternal { - public static fromPtr(ptr: KPointer): LevelOrder { - return new LevelOrder(ptr) - } -} -export class LevelOrder implements MaterializedBase { - peer?: Finalizable | undefined = undefined - public getPeer(): Finalizable | undefined { - return this.peer - } - constructor(peerPtr?: KPointer) { - if(!peerPtr) { - peerPtr = LevelOrder.construct() - } - this.peer = new Finalizable(peerPtr!, LevelOrder.getFinalizer()) - } - static construct(): KPointer { - throw new Error("No impl"); - } - static getFinalizer(): KPointer { - throw new Error("No impl"); - } +export class LevelOrder { + private order_: number = 0.0; + private static ORDER_MIN: number = -100000.0; + private static ORDER_MAX: number = 100000.0; + constructor() {} public static clamp(order: number): LevelOrder { - const order_casted = order as (number) - return LevelOrder.clamp_serialize(order_casted) + let levelOrderImpl = new LevelOrder(); + levelOrderImpl.setOrder(order); + return levelOrderImpl; } public getOrder(): number { - return this.getOrder_serialize() + return this.order_; } - private static clamp_serialize(order: number): LevelOrder { - throw new Error("No impl"); - } - private getOrder_serialize(): number { - throw new Error("No impl"); + + private setOrder(order: number): void { + this.order_ = order < LevelOrder.ORDER_MIN ? + LevelOrder.ORDER_MIN : (order > LevelOrder.ORDER_MAX ? LevelOrder.ORDER_MAX : order); } } -- Gitee From fd454dea48f5b812984667a4507a6a76cba92ef7 Mon Sep 17 00:00:00 2001 From: wangweiyuan2 Date: Fri, 12 Sep 2025 12:27:19 +0800 Subject: [PATCH 2/2] 201 Signed-off-by: wangweiyuan2 --- .../arkui-ohos/@ohos.promptAction.ts | 43 +++++++++++++------ .../src/generated/arkoala_api_generated.h | 2 +- .../native/src/generated/bridge_generated.cc | 4 +- .../interface/arkoala_api_generated.h | 4 ++ .../rich_editor_base_controller_accessor.cpp | 11 +++-- 5 files changed, 42 insertions(+), 22 deletions(-) diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.promptAction.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.promptAction.ts index 18009817e77..f00c17e5f63 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.promptAction.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/@ohos.promptAction.ts @@ -37,23 +37,40 @@ export enum ImmersiveMode { EXTEND = 1, } -export class LevelOrder { - private order_: number = 0.0; - private static ORDER_MIN: number = -100000.0; - private static ORDER_MAX: number = 100000.0; - constructor() {} +export class LevelOrderInternal { + public static fromPtr(ptr: KPointer): LevelOrder { + return new LevelOrder(ptr) + } +} +export class LevelOrder implements MaterializedBase { + peer?: Finalizable | undefined = undefined + public getPeer(): Finalizable | undefined { + return this.peer + } + constructor(peerPtr?: KPointer) { + if(!peerPtr) { + peerPtr = LevelOrder.construct() + } + this.peer = new Finalizable(peerPtr!, LevelOrder.getFinalizer()) + } + static construct(): KPointer { + throw new Error("No impl"); + } + static getFinalizer(): KPointer { + throw new Error("No impl"); + } public static clamp(order: number): LevelOrder { - let levelOrderImpl = new LevelOrder(); - levelOrderImpl.setOrder(order); - return levelOrderImpl; + const order_casted = order as (number) + return LevelOrder.clamp_serialize(order_casted) } public getOrder(): number { - return this.order_; + return this.getOrder_serialize() } - - private setOrder(order: number): void { - this.order_ = order < LevelOrder.ORDER_MIN ? - LevelOrder.ORDER_MIN : (order > LevelOrder.ORDER_MAX ? LevelOrder.ORDER_MAX : order); + private static clamp_serialize(order: number): LevelOrder { + throw new Error("No impl"); + } + private getOrder_serialize(): number { + throw new Error("No impl"); } } diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h index 8da8283a96d..a650145897b 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/framework/native/src/generated/arkoala_api_generated.h @@ -24939,7 +24939,7 @@ typedef struct GENERATED_ArkUIRichEditorBaseControllerAccessor { void (*setTypingStyle)(Ark_RichEditorBaseController peer, const Ark_RichEditorTextStyle* value); void (*setTypingParagraphStyle)(Ark_RichEditorBaseController peer, - const Ark_RichEditorTextStyle* value); + const Ark_RichEditorParagraphStyle* value); void (*setSelection)(Ark_RichEditorBaseController peer, const Ark_Number* selectionStart, const Ark_Number* selectionEnd, diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/framework/native/src/generated/bridge_generated.cc b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/framework/native/src/generated/bridge_generated.cc index 64fae05e858..d5f76227089 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/framework/native/src/generated/bridge_generated.cc +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/framework/native/src/generated/bridge_generated.cc @@ -33082,8 +33082,8 @@ KOALA_INTEROP_DIRECT_V3(RichEditorBaseController_setTypingStyle, Ark_NativePoint void impl_RichEditorBaseController_setTypingParagraphStyle(Ark_NativePointer thisPtr, KSerializerBuffer thisArray, int32_t thisLength) { Ark_RichEditorBaseController self = reinterpret_cast(thisPtr); DeserializerBase thisDeserializer(thisArray, thisLength); - Ark_RichEditorTextStyle valueValueTemp = RichEditorTextStyle_serializer::read(thisDeserializer);; - GetAccessors()->getRichEditorBaseControllerAccessor()->setTypingParagraphStyle(self, static_cast(&valueValueTemp)); + Ark_RichEditorParagraphStyle valueValueTemp = RichEditorParagraphStyle_serializer::read(thisDeserializer);; + GetAccessors()->getRichEditorBaseControllerAccessor()->setTypingParagraphStyle(self, static_cast(&valueValueTemp)); } KOALA_INTEROP_DIRECT_V3(RichEditorBaseController_setTypingParagraphStyle, Ark_NativePointer, KSerializerBuffer, int32_t) void impl_RichEditorBaseController_setSelection(Ark_NativePointer thisPtr, KInteropNumber selectionStart, KInteropNumber selectionEnd, KSerializerBuffer thisArray, int32_t thisLength) { diff --git a/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h b/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h index 90c520ec12b..2ddde3af543 100644 --- a/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h +++ b/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h @@ -21184,6 +21184,8 @@ typedef struct GENERATED_ArkUIRichEditorModifier { const Opt_Number* value); void (*setMaxLines)(Ark_NativePointer node, const Opt_Number* value); + void (*setEnableAutoSpacing)(Ark_NativePointer node, + const Opt_Boolean* value); void (*setKeyboardAppearance)(Ark_NativePointer node, const Opt_KeyboardAppearance* value); void (*setStopBackPress)(Ark_NativePointer node, @@ -24935,6 +24937,8 @@ typedef struct GENERATED_ArkUIRichEditorBaseControllerAccessor { Ark_RichEditorTextStyle (*getTypingStyle)(Ark_RichEditorBaseController peer); void (*setTypingStyle)(Ark_RichEditorBaseController peer, const Ark_RichEditorTextStyle* value); + void (*setTypingParagraphStyle)(Ark_RichEditorBaseController peer, + const Ark_RichEditorParagraphStyle* value); void (*setSelection)(Ark_RichEditorBaseController peer, const Ark_Number* selectionStart, const Ark_Number* selectionEnd, diff --git a/frameworks/core/interfaces/native/implementation/rich_editor_base_controller_accessor.cpp b/frameworks/core/interfaces/native/implementation/rich_editor_base_controller_accessor.cpp index 3c9d9f6b0a3..ffe2df934d2 100644 --- a/frameworks/core/interfaces/native/implementation/rich_editor_base_controller_accessor.cpp +++ b/frameworks/core/interfaces/native/implementation/rich_editor_base_controller_accessor.cpp @@ -200,13 +200,12 @@ void SetTypingStyleImpl(Ark_RichEditorBaseController peer, peer->SetTypingStyle(typingStyle, textStyle); } void SetTypingParagraphStyleImpl(Ark_RichEditorBaseController peer, - const Ark_RichEditorTextStyle* value) + const Ark_RichEditorParagraphStyle* value) { - CHECK_NULL_VOID(peer); - CHECK_NULL_VOID(value); - auto textStyle = Converter::OptConvert(*value); - auto typingParagraphStyle = Converter::OptConvert(*value); - peer->SetTypingParagraphStyle(typingParagraphStyle); + // CHECK_NULL_VOID(peer); + // CHECK_NULL_VOID(value); + // auto typingParagraphStyle = Converter::OptConvert(*value); + // peer->SetTypingParagraphStyle(typingParagraphStyle); } void SetSelectionImpl(Ark_RichEditorBaseController peer, const Ark_Number* selectionStart, -- Gitee