From 20c8e8f1c2fe1b3cd0ce8fea02ea2a3ca23f42a2 Mon Sep 17 00:00:00 2001
From: cxy251 <caixinyu9@h-partners.com>
Date: Mon, 23 Jun 2025 19:14:41 +0800
Subject: [PATCH 1/4] sync form component

Signed-off-by: cxy251 <caixinyu9@h-partners.com>
---
 .../component/ets/form_component.d.ts         | 71 +++++++++----------
 1 file changed, 33 insertions(+), 38 deletions(-)

diff --git a/api/@internal/component/ets/form_component.d.ts b/api/@internal/component/ets/form_component.d.ts
index 076170caba..2fc1fa0b7d 100644
--- a/api/@internal/component/ets/form_component.d.ts
+++ b/api/@internal/component/ets/form_component.d.ts
@@ -294,17 +294,6 @@ declare interface FormInfo {
    */
   want?: import('../api/@ohos.app.ability.Want').default;
 
-  /**
-   * The want of the form.
-   *
-   * @type { ?import('../api/@ohos.app.ability.Want').default }
-   * @syscap SystemCapability.ArkUI.ArkUI.Full
-   * @systemapi
-   * @since 20
-   * @arkts 1.2
-   */
-  want?: Want;
-
   /**
    * The renderingMode of the form.
    *
@@ -452,35 +441,38 @@ interface FormSize {
 }
 
 /**
- * Defines the FormCallbackInfo.
+ * Defines error information for card loading.
  *
- * @interface FormError
+ * @typedef ErrorInformation
  * @syscap SystemCapability.ArkUI.ArkUI.Full
  * @systemapi
- * @since 20
- * @arkts 1.2
+ * @since arkts{ '1.1':'18','1.2':'20'}
+ * @arkts 1.1&1.2
  */
-interface FormError {
+interface ErrorInformation {
   /**
-   * The string id of the form.
+   * Error code.
+   * Anonymous Object Rectification
    *
    * @type { number }
    * @syscap SystemCapability.ArkUI.ArkUI.Full
    * @systemapi
-   * @since 20
-   * @arkts 1.2
+   * @since arkts{ '1.1':'18','1.2':'20'}
+   * @arkts 1.1&1.2
    */
-   errcode: number;
+  errcode: number;
+
   /**
-   * The string id of the form.
+   * Error information.
+   * Anonymous Object Rectification
    *
-   * @type { number }
+   * @type { string }
    * @syscap SystemCapability.ArkUI.ArkUI.Full
    * @systemapi
-   * @since 20
-   * @arkts 1.2
+   * @since arkts{ '1.1':'18','1.2':'20'}
+   * @arkts 1.1&1.2
    */
-   msg: string 
+  msg: string;
 }
 
 /**
@@ -500,8 +492,6 @@ declare class FormComponentAttribute extends CommonMethod<FormComponentAttribute
    * @systemapi
    * @since 7
    */
-  size(value: { width: number; height: number }): FormComponentAttribute;
-
   /**
    * Sets the display area size of the card.
    *
@@ -594,19 +584,17 @@ declare class FormComponentAttribute extends CommonMethod<FormComponentAttribute
    * @systemapi
    * @since 7
    */
-  onError(callback: (info: { errcode: number; msg: string }) => void): FormComponentAttribute;
-
   /**
    * Card loading error.
    *
-   * @param { Callback<FormError> } callback
+   * @param { Callback<ErrorInformation> } callback
    * @returns { FormComponentAttribute }
    * @syscap SystemCapability.ArkUI.ArkUI.Full
    * @systemapi
-   * @since 20
-   * @arkts 1.2
+   * @since arkts {'1.1':'18','1.2':'20'}
+   * @arkts 1.1&1.2
    */
-  onError(callback: Callback<FormError>): FormComponentAttribute;
+  onError(callback: Callback<ErrorInformation>): FormComponentAttribute;
 
   /**
    * Card to be redirected.
@@ -617,8 +605,6 @@ declare class FormComponentAttribute extends CommonMethod<FormComponentAttribute
    * @systemapi
    * @since 7
    */
-  onRouter(callback: (info: any) => void): FormComponentAttribute;
-
   /**
    * Card to be redirected.
    *
@@ -626,8 +612,8 @@ declare class FormComponentAttribute extends CommonMethod<FormComponentAttribute
    * @returns { FormComponentAttribute }
    * @syscap SystemCapability.ArkUI.ArkUI.Full
    * @systemapi
-   * @since 20
-   * @arkts 1.2
+   * @since arkts {'1.1':'18','1.2':'20'}
+   * @arkts 1.1&1.2
    */
   onRouter(callback: Callback<Object | undefined | null>): FormComponentAttribute;
 
@@ -659,7 +645,16 @@ declare class FormComponentAttribute extends CommonMethod<FormComponentAttribute
    * @returns { FormComponentAttribute }
    * @syscap SystemCapability.ArkUI.ArkUI.Full
    * @systemapi
-   * @since arkts {'1.1':'10','1.2':'20'}
+   * @since 10
+   */
+  /**
+   * Card to be loaded.
+   *
+   * @param { function } callback
+   * @returns { FormComponentAttribute }
+   * @syscap SystemCapability.ArkUI.ArkUI.Full
+   * @systemapi
+   * @since arkts {'1.1':'18','1.2':'20'}
    * @arkts 1.1&1.2
    */
   onLoad(callback: () => void): FormComponentAttribute;
-- 
Gitee


From 287b99aa9c290fe4dae2d0c616c5442d61284616 Mon Sep 17 00:00:00 2001
From: cxy251 <caixinyu9@h-partners.com>
Date: Mon, 23 Jun 2025 21:53:35 +0800
Subject: [PATCH 2/4] sync form component

Signed-off-by: cxy251 <caixinyu9@h-partners.com>
---
 api/@internal/component/ets/form_component.d.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/api/@internal/component/ets/form_component.d.ts b/api/@internal/component/ets/form_component.d.ts
index 2fc1fa0b7d..94c9be4eda 100644
--- a/api/@internal/component/ets/form_component.d.ts
+++ b/api/@internal/component/ets/form_component.d.ts
@@ -21,6 +21,7 @@
 import { CommonMethod,Callback } from './common';
 import Want from '../../@ohos.app.ability.Want';
 import { Visibility } from './enums'
+import { VoidCallback } from './units';
 /*** endif */
 /**
  * Defines the FormDimension enum.
@@ -495,14 +496,14 @@ declare class FormComponentAttribute extends CommonMethod<FormComponentAttribute
   /**
    * Sets the display area size of the card.
    *
-   * @param { FormSize } value
+   * @param { FormSize } formSize - The size of Form
    * @returns { FormComponentAttribute }
    * @syscap SystemCapability.ArkUI.ArkUI.Full
    * @systemapi
-   * @since 20
-   * @arkts 1.2
+   * @since arkts {'1.1':'18','1.2':'20'}
+   * @arkts 1.1&1.2
    */
-  size(value: FormSize): FormComponentAttribute;
+  size(formSize: FormSize): FormComponentAttribute;
 
   /**
    * Card module name.
@@ -615,7 +616,7 @@ declare class FormComponentAttribute extends CommonMethod<FormComponentAttribute
    * @since arkts {'1.1':'18','1.2':'20'}
    * @arkts 1.1&1.2
    */
-  onRouter(callback: Callback<Object | undefined | null>): FormComponentAttribute;
+  onRouter(callback: Callback<Object>): FormComponentAttribute;
 
   /**
    * Uninstall Card.
@@ -650,14 +651,14 @@ declare class FormComponentAttribute extends CommonMethod<FormComponentAttribute
   /**
    * Card to be loaded.
    *
-   * @param { function } callback
+   * @param { VoidCallback } callback
    * @returns { FormComponentAttribute }
    * @syscap SystemCapability.ArkUI.ArkUI.Full
    * @systemapi
    * @since arkts {'1.1':'18','1.2':'20'}
    * @arkts 1.1&1.2
    */
-  onLoad(callback: () => void): FormComponentAttribute;
+  onLoad(callback: VoidCallback): FormComponentAttribute;
 }
 
 /**
-- 
Gitee


From 06941dc777696467c53a40935b023c77a05a75f4 Mon Sep 17 00:00:00 2001
From: cxy251 <caixinyu9@h-partners.com>
Date: Mon, 23 Jun 2025 22:14:09 +0800
Subject: [PATCH 3/4] sync form component

Signed-off-by: cxy251 <caixinyu9@h-partners.com>
---
 api/@internal/component/ets/form_component.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/@internal/component/ets/form_component.d.ts b/api/@internal/component/ets/form_component.d.ts
index 94c9be4eda..e73f8a4b47 100644
--- a/api/@internal/component/ets/form_component.d.ts
+++ b/api/@internal/component/ets/form_component.d.ts
@@ -608,8 +608,9 @@ declare class FormComponentAttribute extends CommonMethod<FormComponentAttribute
    */
   /**
    * Card to be redirected.
+   * Anonymous Object Rectification
    *
-   * @param { function } callback
+   * @param { Callback<Object> } callback
    * @returns { FormComponentAttribute }
    * @syscap SystemCapability.ArkUI.ArkUI.Full
    * @systemapi
-- 
Gitee


From cee84700ed846631f3dacda7189893140f1579ea Mon Sep 17 00:00:00 2001
From: cxy251 <caixinyu9@h-partners.com>
Date: Tue, 24 Jun 2025 17:02:16 +0800
Subject: [PATCH 4/4] sync form component

Signed-off-by: cxy251 <caixinyu9@h-partners.com>
---
 api/@internal/component/ets/form_component.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/@internal/component/ets/form_component.d.ts b/api/@internal/component/ets/form_component.d.ts
index e73f8a4b47..139b376384 100644
--- a/api/@internal/component/ets/form_component.d.ts
+++ b/api/@internal/component/ets/form_component.d.ts
@@ -610,14 +610,14 @@ declare class FormComponentAttribute extends CommonMethod<FormComponentAttribute
    * Card to be redirected.
    * Anonymous Object Rectification
    *
-   * @param { Callback<Object> } callback
+   * @param { Callback<object> } callback
    * @returns { FormComponentAttribute }
    * @syscap SystemCapability.ArkUI.ArkUI.Full
    * @systemapi
    * @since arkts {'1.1':'18','1.2':'20'}
    * @arkts 1.1&1.2
    */
-  onRouter(callback: Callback<Object>): FormComponentAttribute;
+  onRouter(callback: Callback<object>): FormComponentAttribute;
 
   /**
    * Uninstall Card.
-- 
Gitee