diff --git a/api/@ohos.app.form.formHost.d.ts b/api/@ohos.app.form.formHost.d.ts index 12eb8ddc62f26ade4aa735d4ca31223d546c263a..a2009c3abba9f9336b75c573477d5949cd54e5e4 100644 --- a/api/@ohos.app.form.formHost.d.ts +++ b/api/@ohos.app.form.formHost.d.ts @@ -18,18 +18,22 @@ * @kit FormKit */ -import { AsyncCallback } from './@ohos.base'; import { Callback } from './@ohos.base'; -import Want from './@ohos.app.ability.Want'; import formInfo from './@ohos.app.form.formInfo'; +/*** if arkts 1.1 */ +import { AsyncCallback } from './@ohos.base'; +import Want from './@ohos.app.ability.Want'; +/*** endif */ + /** * Interface of formHost. * * @namespace formHost * @syscap SystemCapability.Ability.Form * @systemapi - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace formHost { /** diff --git a/api/@ohos.app.form.formInfo.d.ts b/api/@ohos.app.form.formInfo.d.ts index a1d033a4df471ee276132b6fa398069705cdbce0..9a778d03cef00a57b192cf3a3f62b40f6dfdc7d0 100644 --- a/api/@ohos.app.form.formInfo.d.ts +++ b/api/@ohos.app.form.formInfo.d.ts @@ -2063,6 +2063,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ interface OverflowInfo { /** @@ -2072,18 +2073,20 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ area: Rect; /** * The overflow animation duration * - * @type { number } + * @type { int } * @syscap SystemCapability.Ability.Form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ - duration: number; + duration: int; /** * Whether use default animation, default is true @@ -2092,6 +2095,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ useDefaultAnimation?: boolean; } @@ -2103,6 +2107,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ interface OverflowRequest { /** @@ -2112,6 +2117,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ formId: string; @@ -2122,6 +2128,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ isOverflow: boolean; @@ -2132,6 +2139,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ overflowInfo?: OverflowInfo; } @@ -2143,6 +2151,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ interface ChangeSceneAnimationStateRequest { /** @@ -2152,18 +2161,20 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ formId: string; /** * The state of scene animation. * - * @type { number } + * @type { int } * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ - state: number; + state: int; } /** @@ -2173,47 +2184,52 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ interface Rect { /** * The left position of rect * - * @type { number } + * @type { double } * @syscap SystemCapability.Ability.Form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ - left: number; + left: double; /** * The top position of rect * - * @type { number } + * @type { double } * @syscap SystemCapability.Ability.Form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ - top: number; + top: double; /** * The width of rect * - * @type { number } + * @type { double } * @syscap SystemCapability.Ability.Form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ - width: number; + width: double; /** * The height of rect * - * @type { number } + * @type { double } * @syscap SystemCapability.Ability.Form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ - height: number; + height: double; } /** @@ -2223,6 +2239,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ interface FunInteractionParams { /** @@ -2232,6 +2249,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ abilityName?: string; @@ -2242,6 +2260,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ targetBundleName: string; @@ -2252,18 +2271,20 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ subBundleName: string; /** * The duration of the fun interaction form will be paused if not operate, default is 10s * - * @type { ?number } + * @type { ?int } * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ - keepStateDuration? :number; + keepStateDuration? :int; } /** @@ -2273,6 +2294,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ interface SceneAnimationParams { /** @@ -2282,6 +2304,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ abilityName: string; @@ -2292,6 +2315,7 @@ declare namespace formInfo { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ disabledDesktopBehaviors?: string; } diff --git a/api/@ohos.app.form.formProvider.d.ts b/api/@ohos.app.form.formProvider.d.ts index 02cf9ea01f3c56d0ee78677ad9452993c014fc1f..4f9421b9f2132367bc8c7de6e3dc4892dfdbabff 100644 --- a/api/@ohos.app.form.formProvider.d.ts +++ b/api/@ohos.app.form.formProvider.d.ts @@ -20,9 +20,7 @@ import { AsyncCallback } from './@ohos.base'; import formBindingData from './@ohos.app.form.formBindingData'; -/*** if arkts 1.1 */ import formInfo from './@ohos.app.form.formInfo'; -/*** endif */ import Want from './@ohos.app.ability.Want'; /**