diff --git a/api/@ohos.app.form.formAgent.d.ts b/api/@ohos.app.form.formAgent.d.ts index 688c65ee427d4e108abdce20f07f0bb76c6bfb51..884163f31fd24689ad9937abe69566fbfc722f7b 100644 --- a/api/@ohos.app.form.formAgent.d.ts +++ b/api/@ohos.app.form.formAgent.d.ts @@ -27,7 +27,8 @@ import type Want from './@ohos.app.ability.Want'; * @namespace formAgent * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace formAgent { @@ -62,7 +63,8 @@ declare namespace formAgent { * @throws { BusinessError } 16501008 - Waiting for the form addition to the desktop timed out. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function requestPublishForm(want: Want, callback: AsyncCallback): void; @@ -97,7 +99,8 @@ declare namespace formAgent { * @throws { BusinessError } 16501008 - Waiting for the form addition to the desktop timed out. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function requestPublishForm(want: Want): Promise; } diff --git a/api/@ohos.app.form.formHost.d.ts b/api/@ohos.app.form.formHost.d.ts index 12eb8ddc62f26ade4aa735d4ca31223d546c263a..aae35ddde18ab5ac922bd60f9c9686f45e0963df 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 { /** @@ -734,6 +738,7 @@ declare namespace formHost { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ function on(type: 'formOverflow', callback: Callback): void; @@ -747,6 +752,7 @@ declare namespace formHost { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ function off(type: 'formOverflow', callback?: Callback): void; @@ -761,6 +767,7 @@ declare namespace formHost { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ function on(type: 'changeSceneAnimationState', callback: Callback): void; @@ -776,6 +783,7 @@ declare namespace formHost { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ function off(type: 'changeSceneAnimationState', callback?: Callback): void; 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.formObserver.d.ts b/api/@ohos.app.form.formObserver.d.ts index c2b937519b6be500d5944d70af38dac127440e1c..f388bf8860296c5e31821d96c877d98cc1e577ef 100644 --- a/api/@ohos.app.form.formObserver.d.ts +++ b/api/@ohos.app.form.formObserver.d.ts @@ -28,7 +28,8 @@ import formInfo from './@ohos.app.form.formInfo'; * @namespace formObserver * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace formObserver { /** @@ -44,7 +45,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'formAdd', observerCallback: Callback): void; @@ -62,7 +64,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'formAdd', hostBundleName: string, observerCallback: Callback): void; @@ -80,7 +83,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'formAdd', hostBundleName?: string, observerCallback?: Callback): void; @@ -97,7 +101,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'formRemove', observerCallback: Callback): void; @@ -115,7 +120,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'formRemove', hostBundleName: string, observerCallback: Callback): void; @@ -133,7 +139,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'formRemove', hostBundleName?: string, observerCallback?: Callback): void; @@ -150,7 +157,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'notifyVisible', observerCallback: Callback>): void; @@ -168,7 +176,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function on( type: 'notifyVisible', @@ -189,7 +198,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'notifyInvisible', observerCallback: Callback>): void; @@ -207,7 +217,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function on( type: 'notifyInvisible', @@ -229,7 +240,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function off( type: 'notifyVisible', @@ -251,7 +263,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function off( type: 'notifyInvisible', @@ -274,7 +287,8 @@ declare namespace formObserver { * @throws { BusinessError } 16500060 - Service connection error. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningFormInfos(callback: AsyncCallback>, hostBundleName?: string): void; @@ -294,7 +308,8 @@ declare namespace formObserver { * @throws { BusinessError } 16500060 - Service connection error. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningFormInfos( callback: AsyncCallback>, @@ -316,7 +331,8 @@ declare namespace formObserver { * @throws { BusinessError } 16500060 - Service connection error. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningFormInfos(hostBundleName?: string): Promise>; @@ -335,7 +351,8 @@ declare namespace formObserver { * @throws { BusinessError } 16500060 - Service connection error. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningFormInfos( isUnusedIncluded: boolean, @@ -358,7 +375,8 @@ declare namespace formObserver { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningFormInfosByFilter( formProviderFilter: formInfo.FormProviderFilter @@ -380,7 +398,8 @@ declare namespace formObserver { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningFormInfosByFilter( formProviderFilter: formInfo.FormProviderFilter, @@ -403,7 +422,8 @@ declare namespace formObserver { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningFormInfoById(formId: string): Promise; @@ -424,7 +444,8 @@ declare namespace formObserver { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningFormInfoById(formId: string, isUnusedIncluded: boolean): Promise; @@ -444,7 +465,8 @@ declare namespace formObserver { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningFormInfoById(formId: string, callback: AsyncCallback): void; @@ -465,7 +487,8 @@ declare namespace formObserver { * @syscap SystemCapability.Ability.Form * @systemapi * @stagemodelonly - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function getRunningFormInfoById( formId: string, @@ -486,7 +509,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'router', observerCallback: Callback): void; @@ -504,7 +528,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'router', hostBundleName: string, observerCallback: Callback): void; @@ -521,7 +546,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'router', hostBundleName?: string, observerCallback?: Callback): void; @@ -538,7 +564,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'message', observerCallback: Callback): void; @@ -556,7 +583,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'message', hostBundleName: string, observerCallback: Callback): void; @@ -573,7 +601,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'message', hostBundleName?: string, observerCallback?: Callback): void; @@ -590,7 +619,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'call', observerCallback: Callback): void; @@ -608,7 +638,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function on(type: 'call', hostBundleName: string, observerCallback: Callback): void; @@ -625,7 +656,8 @@ declare namespace formObserver { * 1.Mandatory parameters are left unspecified; 2.Incorrect parameter types; 3.Parameter verification failed. * @syscap SystemCapability.Ability.Form * @systemapi - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function off(type: 'call', hostBundleName?: string, observerCallback?: Callback): void; } diff --git a/api/@ohos.app.form.formProvider.d.ts b/api/@ohos.app.form.formProvider.d.ts index be6a67cd3058c3a67c66c1290c1fb5d14afc6fbe..c0525d3947365c05e4aed0e0b5f18cc08955c2c6 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'; /** @@ -483,6 +481,7 @@ declare namespace formProvider { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ function openFormManagerCrossBundle(want: Want): void @@ -522,6 +521,7 @@ declare namespace formProvider { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ function activateSceneAnimation(formId: string): Promise; @@ -543,6 +543,7 @@ declare namespace formProvider { * @syscap SystemCapability.Ability.Form * @systemapi * @since 20 + * @arkts 1.1&1.2 */ function deactivateSceneAnimation(formId: string): Promise; @@ -564,6 +565,7 @@ declare namespace formProvider { * @syscap SystemCapability.Ability.Form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ function requestOverflow(formId: string, overflowInfo: formInfo.OverflowInfo): Promise; @@ -584,6 +586,7 @@ declare namespace formProvider { * @syscap SystemCapability.Ability.Form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ function cancelOverflow(formId: string): Promise; @@ -604,6 +607,7 @@ declare namespace formProvider { * @syscap SystemCapability.Ability.Form * @atomicservice * @since 20 + * @arkts 1.1&1.2 */ function getFormRect(formId: string): Promise; }