From 3a79d73db7cdcc9d86ed261a5d7213126f5001ee Mon Sep 17 00:00:00 2001 From: yanwenhao Date: Wed, 18 May 2022 16:27:34 +0800 Subject: [PATCH 1/7] Add GetFormsInfo API Signed-off-by: yanwenhao Change-Id: I20cbcfc866f39c2295b01b79b2a24112397e6007 --- api/@ohos.application.formProvider.d.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/api/@ohos.application.formProvider.d.ts b/api/@ohos.application.formProvider.d.ts index 22390cf910..78f9a1d3e6 100644 --- a/api/@ohos.application.formProvider.d.ts +++ b/api/@ohos.application.formProvider.d.ts @@ -15,6 +15,7 @@ import { AsyncCallback } from "./basic"; import formBindingData from "./@ohos.application.formBindingData"; +import formInfo from "./@ohos.application.formInfo"; /** * interface of formProvider. @@ -50,5 +51,18 @@ declare namespace formProvider { function updateForm(formId: string, formBindingData: formBindingData.FormBindingData, callback: AsyncCallback): void; function updateForm(formId: string, formBindingData: formBindingData.FormBindingData): Promise; + + /** + * Get infos of all forms belonging to current bundle. + * + * Client to communication with FormManagerService. + * + * @since 8 + * @syscap SystemCapability.Ability.Form + * @param formInfos Indicates where info results will be stored. + * @return - + */ + function GetFormsInfo(formInfos: Array): Promise; + function GetFormsInfo(formInfos: Array, callback: AsyncCallback): void; } export default formProvider; \ No newline at end of file -- Gitee From 699e93575b62fe6cc6c3d48072ddc79199aa4b8a Mon Sep 17 00:00:00 2001 From: yanwenhao Date: Wed, 18 May 2022 16:40:44 +0800 Subject: [PATCH 2/7] Add GetFormsInfo API Signed-off-by: yanwenhao Change-Id: I7ea0ff34cc5c8500faa00b6df2cc003c6be377dc --- api/@ohos.application.formProvider.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/@ohos.application.formProvider.d.ts b/api/@ohos.application.formProvider.d.ts index 78f9a1d3e6..ea1d929ea2 100644 --- a/api/@ohos.application.formProvider.d.ts +++ b/api/@ohos.application.formProvider.d.ts @@ -62,7 +62,7 @@ declare namespace formProvider { * @param formInfos Indicates where info results will be stored. * @return - */ - function GetFormsInfo(formInfos: Array): Promise; - function GetFormsInfo(formInfos: Array, callback: AsyncCallback): void; + function GetFormsInfo(): Promise>; + function GetFormsInfo(callback: AsyncCallback>): void; } export default formProvider; \ No newline at end of file -- Gitee From b65d485daf2f7f6fb2f22629dc29903ee5a6914b Mon Sep 17 00:00:00 2001 From: yanwenhao Date: Thu, 19 May 2022 14:48:56 +0800 Subject: [PATCH 3/7] Add GetFormsInfo API Signed-off-by: yanwenhao Change-Id: I6d543c33730e1886847241350ed8b3a698cf4550 --- api/@ohos.application.formProvider.d.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/api/@ohos.application.formProvider.d.ts b/api/@ohos.application.formProvider.d.ts index ea1d929ea2..23f22dd24d 100644 --- a/api/@ohos.application.formProvider.d.ts +++ b/api/@ohos.application.formProvider.d.ts @@ -59,8 +59,7 @@ declare namespace formProvider { * * @since 8 * @syscap SystemCapability.Ability.Form - * @param formInfos Indicates where info results will be stored. - * @return - + * @return Infos of all forms. */ function GetFormsInfo(): Promise>; function GetFormsInfo(callback: AsyncCallback>): void; -- Gitee From ddfd14a30f889d32bea767c40720e9063a731624 Mon Sep 17 00:00:00 2001 From: yanwenhao Date: Mon, 23 May 2022 15:09:39 +0800 Subject: [PATCH 4/7] Added getFormsInfo API Signed-off-by: yanwenhao Change-Id: I61d3c06abf13725913b9a797e2958e8bf7fca48c --- api/@ohos.application.formProvider.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/@ohos.application.formProvider.d.ts b/api/@ohos.application.formProvider.d.ts index 23f22dd24d..e0e3af2ec6 100644 --- a/api/@ohos.application.formProvider.d.ts +++ b/api/@ohos.application.formProvider.d.ts @@ -61,7 +61,7 @@ declare namespace formProvider { * @syscap SystemCapability.Ability.Form * @return Infos of all forms. */ - function GetFormsInfo(): Promise>; - function GetFormsInfo(callback: AsyncCallback>): void; + function getFormsInfo(): Promise>; + function getFormsInfo(callback: AsyncCallback>): void; } export default formProvider; \ No newline at end of file -- Gitee From cbbe7ca12241ef98b89b31a2ef01a4aa2e3f7a52 Mon Sep 17 00:00:00 2001 From: yanwenhao Date: Thu, 26 May 2022 21:21:23 +0800 Subject: [PATCH 5/7] API changes of getFormsInfo && getAllformsInfo for dynamic forms Signed-off-by: yanwenhao Change-Id: Ice71c75d792287dd85fedbf3e80e13d70f31416c --- api/@ohos.application.formHost.d.ts | 32 ++++++++++++++++++++++++++++- api/@ohos.application.formInfo.d.ts | 13 ++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/api/@ohos.application.formHost.d.ts b/api/@ohos.application.formHost.d.ts index e60df45a3d..7c0acc150d 100644 --- a/api/@ohos.application.formHost.d.ts +++ b/api/@ohos.application.formHost.d.ts @@ -170,7 +170,8 @@ declare namespace formHost { * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED */ function getAllFormsInfo(callback: AsyncCallback>): void; - function getAllFormsInfo(): Promise>; + function getAllFormsInfo(FormInfoType: formInfo.FormInfoType, callback: AsyncCallback>): void; + function getAllFormsInfo(FormInfoType?: formInfo.FormInfoType): Promise>; /** * Obtains the FormInfo objects provided by a specified application on the device. @@ -186,6 +187,35 @@ declare namespace formHost { function getFormsInfo(bundleName: string, moduleName: string, callback: AsyncCallback>): void; function getFormsInfo(bundleName: string, moduleName?: string): Promise>; + // Version #1 + function getFormsInfo(bundleName: string, callback: AsyncCallback>): void; + function getFormsInfo(bundleName: string, formInfoType: formInfo.FormInfoType, callback: AsyncCallback>): void; + function getFormsInfo(bundleName: string, moduleName: string, formInfoType: formInfo.FormInfoType, callback: AsyncCallback>): void; + function getFormsInfo(bundleName: string, moduleName: string, callback: AsyncCallback>): void; + function getFormsInfo(bundleName: string, moduleName?: string, formInfoType?: formInfo.FormInfoType): Promise>; + + // Version #2 + interface Options { + moduleName?: string; + formInfoType?: formInfo.FormInfoType; + } + function getFormsInfo(bundleName: string, callback: AsyncCallback>): void; + function getFormsInfo(bundleName: string, moduleName: string, callback: AsyncCallback>): void; + function getFormsInfo(bundleName: string, moduleName?: string): Promise>; + function getFormsInfo(bundleName: string, callback: AsyncCallback>, opt?:Options): void; + function getFormsInfo(bundleName: string, opt?:Options): void; + + // Version #3 + interface FormInfoRequest { + bundleName: string; + moduleName?: string; + formInfoType?: formInfo.FormInfoType; + callback?: AsyncCallback> + } + function getFormsInfo(bundleName: string, callback: AsyncCallback>): void; + function getFormsInfo(bundleName: string, moduleName: string, callback: AsyncCallback>): void; + function getFormsInfo(bundleName: string, moduleName?: string): Promise>; + function getFormsInfo(request: FormInfoRequest); /** * Deletes invalid forms of the application in the Form Manager Service based on the list of. * diff --git a/api/@ohos.application.formInfo.d.ts b/api/@ohos.application.formInfo.d.ts index b7b33bb4a2..e0acdd6641 100644 --- a/api/@ohos.application.formInfo.d.ts +++ b/api/@ohos.application.formInfo.d.ts @@ -386,5 +386,18 @@ declare namespace formInfo { */ TEMPORARY_KEY = "ohos.extra.param.key.form_temporary" } + + /** + * The type of a form + * + * @name FormInfoType + * @since 8 + * @syscap SystemCapability.Ability.Form + */ + enum FormInfoType { + IS_STATIC = 0, + IS_DYNAMC = 1, + BOTH_STATIC_DYNAMIC = 2 + } } export default formInfo; \ No newline at end of file -- Gitee From 768e90b77e9df0eb5f36bb420db29369f28b1935 Mon Sep 17 00:00:00 2001 From: yanwenhao Date: Sat, 28 May 2022 15:52:30 +0800 Subject: [PATCH 6/7] API changes of getFormsInfo && getAllformsInfo for dynamic forms Signed-off-by: yanwenhao Change-Id: I0b0f0c9cd9a58ed02f20d36b207572c1c77df323 --- api/@ohos.application.formHost.d.ts | 42 ++++++------------- api/@ohos.application.formInfo.d.ts | 55 +++++++++++++++++++++++-- api/@ohos.application.formProvider.d.ts | 5 ++- 3 files changed, 68 insertions(+), 34 deletions(-) diff --git a/api/@ohos.application.formHost.d.ts b/api/@ohos.application.formHost.d.ts index 7c0acc150d..80e3a2d33c 100644 --- a/api/@ohos.application.formHost.d.ts +++ b/api/@ohos.application.formHost.d.ts @@ -186,36 +186,20 @@ declare namespace formHost { function getFormsInfo(bundleName: string, callback: AsyncCallback>): void; function getFormsInfo(bundleName: string, moduleName: string, callback: AsyncCallback>): void; function getFormsInfo(bundleName: string, moduleName?: string): Promise>; + /** + * Obtains the FormInfo objects provided by a specified application on the device. + * + * @since 9 + * @syscap SystemCapability.Ability.Form + * @param bundleName Indicates the bundle name of the application. + * @param moduleName Indicates the module name of the application. + * @param formIntoType Indicates whether fetching static forms, dynamic forms for both. + * @return Returns the {@link FormInfo} + * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED + */ + function getFormsInfo(bundleName: string, opt: formInfo.FormInfoFilter, callback: AsyncCallback>): void; + function getFormsInfo(bundleName: string, opt: formInfo.FormInfoFilter): void; - // Version #1 - function getFormsInfo(bundleName: string, callback: AsyncCallback>): void; - function getFormsInfo(bundleName: string, formInfoType: formInfo.FormInfoType, callback: AsyncCallback>): void; - function getFormsInfo(bundleName: string, moduleName: string, formInfoType: formInfo.FormInfoType, callback: AsyncCallback>): void; - function getFormsInfo(bundleName: string, moduleName: string, callback: AsyncCallback>): void; - function getFormsInfo(bundleName: string, moduleName?: string, formInfoType?: formInfo.FormInfoType): Promise>; - - // Version #2 - interface Options { - moduleName?: string; - formInfoType?: formInfo.FormInfoType; - } - function getFormsInfo(bundleName: string, callback: AsyncCallback>): void; - function getFormsInfo(bundleName: string, moduleName: string, callback: AsyncCallback>): void; - function getFormsInfo(bundleName: string, moduleName?: string): Promise>; - function getFormsInfo(bundleName: string, callback: AsyncCallback>, opt?:Options): void; - function getFormsInfo(bundleName: string, opt?:Options): void; - - // Version #3 - interface FormInfoRequest { - bundleName: string; - moduleName?: string; - formInfoType?: formInfo.FormInfoType; - callback?: AsyncCallback> - } - function getFormsInfo(bundleName: string, callback: AsyncCallback>): void; - function getFormsInfo(bundleName: string, moduleName: string, callback: AsyncCallback>): void; - function getFormsInfo(bundleName: string, moduleName?: string): Promise>; - function getFormsInfo(request: FormInfoRequest); /** * Deletes invalid forms of the application in the Form Manager Service based on the list of. * diff --git a/api/@ohos.application.formInfo.d.ts b/api/@ohos.application.formInfo.d.ts index e0acdd6641..a8714abf65 100644 --- a/api/@ohos.application.formInfo.d.ts +++ b/api/@ohos.application.formInfo.d.ts @@ -388,16 +388,63 @@ declare namespace formInfo { } /** - * The type of a form + * The type of Form the info belongs to. * * @name FormInfoType * @since 8 * @syscap SystemCapability.Ability.Form */ enum FormInfoType { - IS_STATIC = 0, - IS_DYNAMC = 1, - BOTH_STATIC_DYNAMIC = 2 + /** + * form infos from static forms. + * + * @since 8 + * @syscap SystemCapability.Ability.Form + */ + STATIC = 0, + /** + * form infos from dynamic forms. + * + * @since 8 + * @syscap SystemCapability.Ability.Form + */ + DYNAMIC, + /** + * form infos from static and dynamic forms. + * + * @since 8 + * @syscap SystemCapability.Ability.Form + */ + ALL + } + + /** + * The optional options used as filters to ask + * getFormsInfo to return formInfos from only forms that match the options. + * + * @name FormInfoFilter + * + * @since 8 + * @syscap SystemCapability.Ability.Form + */ + //TODO: + interface FormInfoFilter { + /** + * optional moduleName that used to ask getFormsInfo to return + * form infos with the same moduleName. + * + * @since 8 + * @syscap SystemCapability.Ability.Form + */ + moduleName?: string; + /** + * optional formInfoType that used to ask getFormsInfo to return + * form infos belong to the same form type. + * + * @since 8 + * @syscap SystemCapability.Ability.Form + */ + formInfoType?: formInfo.FormInfoType; } } export default formInfo; \ No newline at end of file diff --git a/api/@ohos.application.formProvider.d.ts b/api/@ohos.application.formProvider.d.ts index e0e3af2ec6..a3aff13c6a 100644 --- a/api/@ohos.application.formProvider.d.ts +++ b/api/@ohos.application.formProvider.d.ts @@ -61,7 +61,10 @@ declare namespace formProvider { * @syscap SystemCapability.Ability.Form * @return Infos of all forms. */ - function getFormsInfo(): Promise>; + + function getFormsInfo(opt: formInfo.FormInfoFilter, callback: AsyncCallback>): void; function getFormsInfo(callback: AsyncCallback>): void; + function getFormsInfo(opt?: formInfo.FormInfoFilter): Promise>; + } export default formProvider; \ No newline at end of file -- Gitee From 40343e3801e686fa99553e7ec0631dde368f79fc Mon Sep 17 00:00:00 2001 From: yanwenhao Date: Sat, 28 May 2022 16:07:58 +0800 Subject: [PATCH 7/7] API changes of getFormsInfo && getAllformsInfo for dynamic forms Signed-off-by: yanwenhao Change-Id: I761c426532222482ec270485c3b7040b418ce025 --- api/@ohos.application.formHost.d.ts | 4 ++-- api/@ohos.application.formProvider.d.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/@ohos.application.formHost.d.ts b/api/@ohos.application.formHost.d.ts index 80e3a2d33c..a82185caad 100644 --- a/api/@ohos.application.formHost.d.ts +++ b/api/@ohos.application.formHost.d.ts @@ -197,8 +197,8 @@ declare namespace formHost { * @return Returns the {@link FormInfo} * @permission ohos.permission.GET_BUNDLE_INFO_PRIVILEGED */ - function getFormsInfo(bundleName: string, opt: formInfo.FormInfoFilter, callback: AsyncCallback>): void; - function getFormsInfo(bundleName: string, opt: formInfo.FormInfoFilter): void; + function getFormsInfo(bundleName: string, filter: formInfo.FormInfoFilter, callback: AsyncCallback>): void; + function getFormsInfo(bundleName: string, filter: formInfo.FormInfoFilter): void; /** * Deletes invalid forms of the application in the Form Manager Service based on the list of. diff --git a/api/@ohos.application.formProvider.d.ts b/api/@ohos.application.formProvider.d.ts index a3aff13c6a..a2416c0f2d 100644 --- a/api/@ohos.application.formProvider.d.ts +++ b/api/@ohos.application.formProvider.d.ts @@ -62,9 +62,9 @@ declare namespace formProvider { * @return Infos of all forms. */ - function getFormsInfo(opt: formInfo.FormInfoFilter, callback: AsyncCallback>): void; + function getFormsInfo(filter: formInfo.FormInfoFilter, callback: AsyncCallback>): void; function getFormsInfo(callback: AsyncCallback>): void; - function getFormsInfo(opt?: formInfo.FormInfoFilter): Promise>; + function getFormsInfo(filter?: formInfo.FormInfoFilter): Promise>; } export default formProvider; \ No newline at end of file -- Gitee