From 4a4aad1f8c2f5b8a32d260deb0ace1924821e8fa Mon Sep 17 00:00:00 2001 From: zhangzezhong Date: Tue, 10 Jun 2025 20:47:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=83=E8=83=BD=E5=8A=9B=E5=BC=80=E6=94=BE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=88=B01.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzezhong --- api/@ohos.app.ability.AbilityStage.d.ts | 20 +++++++++---- api/@ohos.app.ability.ExtensionAbility.d.ts | 3 +- api/@ohos.app.ability.UIAbility.d.ts | 5 ++-- api/@ohos.app.ability.UIExtensionAbility.d.ts | 5 ++-- ....app.ability.abilityDelegatorRegistry.d.ts | 5 ++-- api/@ohos.app.ability.common.d.ts | 28 +++++++++---------- api/@ohos.app.ability.dialogRequest.d.ts | 5 +++- api/application/AbilityStageContext.d.ts | 10 +++++-- api/application/UIExtensionContext.d.ts | 5 +++- 9 files changed, 53 insertions(+), 33 deletions(-) diff --git a/api/@ohos.app.ability.AbilityStage.d.ts b/api/@ohos.app.ability.AbilityStage.d.ts index a4e2ace68e..f71cf7c0ed 100644 --- a/api/@ohos.app.ability.AbilityStage.d.ts +++ b/api/@ohos.app.ability.AbilityStage.d.ts @@ -47,9 +47,10 @@ import { Configuration } from './@ohos.app.ability.Configuration'; * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ -export default class AbilityStage { +declare class AbilityStage { /** * Indicates configuration information about context. * @@ -76,7 +77,8 @@ export default class AbilityStage { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ context: AbilityStageContext; @@ -106,7 +108,8 @@ export default class AbilityStage { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onCreate(): void; @@ -212,7 +215,8 @@ export default class AbilityStage { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onConfigurationUpdate(newConfig: Configuration): void; @@ -256,7 +260,8 @@ export default class AbilityStage { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onDestroy(): void; @@ -303,3 +308,6 @@ export default class AbilityStage { */ onPrepareTerminationAsync(): Promise; } + + +export default AbilityStage; \ No newline at end of file diff --git a/api/@ohos.app.ability.ExtensionAbility.d.ts b/api/@ohos.app.ability.ExtensionAbility.d.ts index d77b273b91..8540140a31 100644 --- a/api/@ohos.app.ability.ExtensionAbility.d.ts +++ b/api/@ohos.app.ability.ExtensionAbility.d.ts @@ -35,6 +35,7 @@ import Ability from './@ohos.app.ability.Ability'; * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export default class ExtensionAbility extends Ability {} diff --git a/api/@ohos.app.ability.UIAbility.d.ts b/api/@ohos.app.ability.UIAbility.d.ts index 75a6e91524..f7680dd63e 100644 --- a/api/@ohos.app.ability.UIAbility.d.ts +++ b/api/@ohos.app.ability.UIAbility.d.ts @@ -22,8 +22,8 @@ import Ability from './@ohos.app.ability.Ability'; import AbilityConstant from './@ohos.app.ability.AbilityConstant'; import Want from './@ohos.app.ability.Want'; import window from './@ohos.window'; -/*** if arkts 1.1 */ import UIAbilityContext from './application/UIAbilityContext'; +/*** if arkts 1.1 */ import rpc from './@ohos.rpc'; /*** endif */ @@ -316,7 +316,8 @@ declare class UIAbility extends Ability { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ context: UIAbilityContext; diff --git a/api/@ohos.app.ability.UIExtensionAbility.d.ts b/api/@ohos.app.ability.UIExtensionAbility.d.ts index d281447aa5..4b7de8200f 100755 --- a/api/@ohos.app.ability.UIExtensionAbility.d.ts +++ b/api/@ohos.app.ability.UIExtensionAbility.d.ts @@ -18,9 +18,7 @@ * @kit AbilityKit */ -/*** if arkts 1.1 */ import AbilityConstant from './@ohos.app.ability.AbilityConstant'; -/*** endif */ import type Want from './@ohos.app.ability.Want'; import ExtensionAbility from './@ohos.app.ability.ExtensionAbility'; import type UIExtensionContentSession from './@ohos.app.ability.UIExtensionContentSession'; @@ -60,7 +58,8 @@ declare class UIExtensionAbility extends ExtensionAbility { * @param { AbilityConstant.LaunchParam } launchParam - Indicates the LaunchParam information about UIExtensionAbility. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onCreate(launchParam: AbilityConstant.LaunchParam): void; diff --git a/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts b/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts index d7af3c5a67..3fa78db091 100644 --- a/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts +++ b/api/@ohos.app.ability.abilityDelegatorRegistry.d.ts @@ -20,8 +20,8 @@ import { AbilityDelegator as _AbilityDelegator } from './application/AbilityDelegator'; import { AbilityDelegatorArgs as _AbilityDelegatorArgs } from './application/abilityDelegatorArgs'; -/*** if arkts 1.1 */ import { AbilityMonitor as _AbilityMonitor } from './application/AbilityMonitor'; +/*** if arkts 1.1 */ import { AbilityStageMonitor as _AbilityStageMonitor } from './application/AbilityStageMonitor'; import { ShellCmdResult as _ShellCmdResult } from './application/shellCmdResult'; /*** endif */ @@ -323,7 +323,8 @@ declare namespace abilityDelegatorRegistry { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export type AbilityMonitor = _AbilityMonitor; diff --git a/api/@ohos.app.ability.common.d.ts b/api/@ohos.app.ability.common.d.ts index 09fb3add07..2828b3467a 100644 --- a/api/@ohos.app.ability.common.d.ts +++ b/api/@ohos.app.ability.common.d.ts @@ -52,7 +52,6 @@ import _AbilityStageContext from './application/AbilityStageContext'; import _ApplicationContext from './application/ApplicationContext'; import _Context from './application/Context'; import _ExtensionContext from './application/ExtensionContext'; -import _FormExtensionContext from './application/FormExtensionContext'; import _ServiceExtensionContext from './application/ServiceExtensionContext'; /*** endif */ @@ -261,6 +260,20 @@ declare namespace common { */ export type Context = _Context.default; + /** + * The base context of an ability or an application. It allows access to + * application-specific resources. + * + * @typedef { _Context.default } + * @syscap SystemCapability.Ability.AbilityRuntime.Core + * @stagemodelonly + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + export type Context = _Context; + /** * The context of an extension. It allows access to extension-specific resources. * @@ -311,19 +324,6 @@ declare namespace common { */ export type FormExtensionContext = _FormExtensionContext.default; - /** - * The context of form extension. It allows access to - * formExtension-specific resources. - * - * @typedef { _FormExtensionContext } - * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @stagemodelonly - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - export type FormExtensionContext = _FormExtensionContext; - /** * The context of service extension. It allows access to * serviceExtension-specific resources. diff --git a/api/@ohos.app.ability.dialogRequest.d.ts b/api/@ohos.app.ability.dialogRequest.d.ts index 7c7f7f3278..275dc2f417 100644 --- a/api/@ohos.app.ability.dialogRequest.d.ts +++ b/api/@ohos.app.ability.dialogRequest.d.ts @@ -18,14 +18,17 @@ * @kit AbilityKit */ + /*** if arkts 1.1 */ import Want from './@ohos.app.ability.Want'; +/*** endif */ /** * Interface of request dialog. * * @namespace dialogRequest * @syscap SystemCapability.Ability.AbilityRuntime.Core - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace dialogRequest { /** diff --git a/api/application/AbilityStageContext.d.ts b/api/application/AbilityStageContext.d.ts index 062740fe6c..7ba6723754 100644 --- a/api/application/AbilityStageContext.d.ts +++ b/api/application/AbilityStageContext.d.ts @@ -47,9 +47,10 @@ import Context from './Context'; * @StageModelOnly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ -export default class AbilityStageContext extends Context { +declare class AbilityStageContext extends Context { /** * Indicates configuration information about an module. * @@ -106,7 +107,10 @@ export default class AbilityStageContext extends Context { * @StageModelOnly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ config: Configuration; } + +export default AbilityStageContext; \ No newline at end of file diff --git a/api/application/UIExtensionContext.d.ts b/api/application/UIExtensionContext.d.ts index 222aaeff63..b5d89cfd7f 100755 --- a/api/application/UIExtensionContext.d.ts +++ b/api/application/UIExtensionContext.d.ts @@ -18,10 +18,13 @@ * @kit AbilityKit */ -import type { AbilityResult } from '../ability/abilityResult'; +/*** if arkts 1.2 */ +import { AbilityResult } from '../ability/abilityResult'; +/*** endif */ import type { AsyncCallback } from '../@ohos.base'; import ExtensionContext from './ExtensionContext'; /*** if arkts 1.1 */ +import type { AbilityResult } from '../ability/abilityResult'; import type { ConnectOptions } from '../ability/connectOptions'; import type Want from '../@ohos.app.ability.Want'; import type StartOptions from '../@ohos.app.ability.StartOptions'; -- Gitee