From 1ecd0348f4da87095359f75a488971979ab45ce7 Mon Sep 17 00:00:00 2001 From: houhaoyu Date: Sat, 23 Jul 2022 16:06:02 +0800 Subject: [PATCH 1/2] fixed 928f899 from https://gitee.com/houhaoyu/interface_sdk-js/pulls/2269 fixed 0531eaa from https://gitee.com/houhaoyu/interface_sdk-js/pulls/2264 houhaoyu@huawei.com add featureAbility in ets Signed-off-by: houhaoyu Change-Id: I855157a15a0a44a0b547c627cd535d8a67ce9ec8 --- BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn index 735000f5be..38be6e33d5 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -21,6 +21,7 @@ ohos_copy("ets_internal_api") { "api/@internal/ets/index.d.ts", "api/@internal/ets/lifecycle.d.ts", "api/@internal/global.d.ts", + "api/common/full/featureability.d.ts", ] outputs = [ target_out_dir + "/$target_name/{{source_file_part}}" ] module_source_dir = target_out_dir + "/$target_name" -- Gitee From 35ed96b3e60c82794fe6a8461b4c23fe79d3b645 Mon Sep 17 00:00:00 2001 From: houhaoyu Date: Mon, 25 Jul 2022 09:52:06 +0800 Subject: [PATCH 2/2] fixed 8f230f9 from https://gitee.com/houhaoyu/interface_sdk-js/pulls/2269 fixed 104d1c7 from https://gitee.com/houhaoyu/interface_sdk-js/pulls/2264 houhaoyu@huawei.com deprecate system.router Signed-off-by: houhaoyu Change-Id: I547467b3b44b6b9fb9463ee148f8089f7e94cd0d --- api/@internal/ets/index.d.ts | 1 + api/@system.router.d.ts | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/api/@internal/ets/index.d.ts b/api/@internal/ets/index.d.ts index 4a9e2b6b33..6199f45666 100644 --- a/api/@internal/ets/index.d.ts +++ b/api/@internal/ets/index.d.ts @@ -13,5 +13,6 @@ * limitations under the License. */ +export * from './featureability'; export * from './global'; export * from './lifecycle'; diff --git a/api/@system.router.d.ts b/api/@system.router.d.ts index 27f7c78351..0867df975c 100644 --- a/api/@system.router.d.ts +++ b/api/@system.router.d.ts @@ -16,6 +16,7 @@ /** * Defines the option of router. * @syscap SystemCapability.ArkUI.ArkUI.Lite + * @deprecated since 8, please use @ohos.router instead. * @since 3 */ export interface RouterOptions { @@ -44,6 +45,7 @@ export interface RouterOptions { /** * Defines the option of router back. * @syscap SystemCapability.ArkUI.ArkUI.Full + * @deprecated since 8, please use @ohos.router instead. * @since 7 */ export interface BackRouterOptions { @@ -66,6 +68,7 @@ export interface BackRouterOptions { /** * Defines the state of router. * @syscap SystemCapability.ArkUI.ArkUI.Full + * @deprecated since 8, please use @ohos.router instead. * @since 3 */ export interface RouterState { @@ -95,6 +98,7 @@ export interface RouterState { /** * Defines the option of EnableAlertBeforeBackPage. * @syscap SystemCapability.ArkUI.ArkUI.Full + * @deprecated since 8, please use @ohos.router instead. * @since 6 */ export interface EnableAlertBeforeBackPageOptions { @@ -130,6 +134,7 @@ export interface EnableAlertBeforeBackPageOptions { /** * Defines the option of DisableAlertBeforeBackPage. * @syscap SystemCapability.ArkUI.ArkUI.Full + * @deprecated since 8, please use @ohos.router instead. * @since 6 */ export interface DisableAlertBeforeBackPageOptions { @@ -162,6 +167,7 @@ type ParamsInterface = { /** * Defines the Router interface. * @syscap SystemCapability.ArkUI.ArkUI.Lite + * @deprecated since 8, please use @ohos.router instead. * @since 3 */ export default class Router { -- Gitee