From 0e9c8e33fc8229876bf5134dccaadae4c6ed1cb7 Mon Sep 17 00:00:00 2001 From: liyi0309 Date: Thu, 26 Jun 2025 16:44:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=9F=BA=E6=8E=A5=E5=8F=A3=E9=80=82?= =?UTF-8?q?=E9=85=8D=20Signed-off-by:=20liyi0309?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/@internal/component/ets/action_sheet.d.ts | 14 ++++++++++++-- api/@internal/component/ets/alert_dialog.d.ts | 10 ++++------ api/@internal/component/ets/common.d.ts | 18 ++++++++++++++---- .../ets/custom_dialog_controller.d.ts | 10 ++++------ api/@ohos.promptAction.d.ts | 10 ++++------ 5 files changed, 38 insertions(+), 24 deletions(-) diff --git a/api/@internal/component/ets/action_sheet.d.ts b/api/@internal/component/ets/action_sheet.d.ts index 166a48deb4..97d6736854 100644 --- a/api/@internal/component/ets/action_sheet.d.ts +++ b/api/@internal/component/ets/action_sheet.d.ts @@ -166,10 +166,20 @@ declare interface DismissDialogAction { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ dismiss: Callback; + + /** + * Defines dialog dismiss function. + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + dismiss(): void; /** * Dismiss reason type. diff --git a/api/@internal/component/ets/alert_dialog.d.ts b/api/@internal/component/ets/alert_dialog.d.ts index 047b8a9242..d608e158c1 100644 --- a/api/@internal/component/ets/alert_dialog.d.ts +++ b/api/@internal/component/ets/alert_dialog.d.ts @@ -27,6 +27,7 @@ import { WordBreak, DialogButtonStyle, BorderStyle } from './enums'; import { Rectangle, BlurStyle, Callback, TransitionEffect, ShadowOptions, ShadowStyle, HoverModeAreaType, DismissReason, BackgroundBlurStyleOptions, BackgroundEffectOptions } from './common'; import { LevelOrder, ImmersiveMode, LevelMode } from '../../@ohos.promptAction'; +import { DismissDialogAction } from './actionSheet'; /*** endif */ /** @@ -1307,8 +1308,7 @@ declare interface AlertDialogParamWithConfirm extends AlertDialogParam { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ declare interface DismissDialogAction { /** @@ -1318,8 +1318,7 @@ declare interface DismissDialogAction { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ dismiss: Callback; @@ -1330,8 +1329,7 @@ declare interface DismissDialogAction { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ reason: DismissReason; } diff --git a/api/@internal/component/ets/common.d.ts b/api/@internal/component/ets/common.d.ts index 4de8ecaa77..8bdaf5d84b 100644 --- a/api/@internal/component/ets/common.d.ts +++ b/api/@internal/component/ets/common.d.ts @@ -16697,11 +16697,21 @@ declare interface DismissPopupAction { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ dismiss: Callback; + /** + * Defines popup dismiss function + * + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + dismiss(): void; + /** * Defines popup dismiss reason * @@ -17206,14 +17216,14 @@ declare interface PopupButton { /** * action * - * @type { Callback } + * @type { VoidCallback } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice * @since 20 * @arkts 1.2 */ - action: Callback; + action: VoidCallback; } /** diff --git a/api/@internal/component/ets/custom_dialog_controller.d.ts b/api/@internal/component/ets/custom_dialog_controller.d.ts index 9d3c60c4a4..fcf5cf8b7e 100644 --- a/api/@internal/component/ets/custom_dialog_controller.d.ts +++ b/api/@internal/component/ets/custom_dialog_controller.d.ts @@ -30,6 +30,7 @@ import { BorderStyle } from './enums'; import { LengthMetrics } from '../Graphics'; import { LevelMode, LevelOrder, ImmersiveMode } from '../../@ohos.promptAction'; import { CustomBuilder } from './builder'; +import { DismissDialogAction } from './actionSheet'; /*** endif */ /** @@ -711,8 +712,7 @@ declare interface CustomDialogControllerOptions { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ declare interface DismissDialogAction { /** @@ -722,8 +722,7 @@ declare interface DismissDialogAction { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ dismiss: Callback; @@ -734,8 +733,7 @@ declare interface DismissDialogAction { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ reason: DismissReason; } diff --git a/api/@ohos.promptAction.d.ts b/api/@ohos.promptAction.d.ts index b70ac894f7..21fac37c37 100644 --- a/api/@ohos.promptAction.d.ts +++ b/api/@ohos.promptAction.d.ts @@ -29,6 +29,7 @@ import { BlurStyle, ShadowOptions, ShadowStyle, HoverModeAreaType, Rectangle, Tr BackgroundBlurStyleOptions, BackgroundEffectOptions } from './arkui/component/common'; import { CustomBuilder } from './arkui/component/builder'; import { DialogAlignment } from './arkui/component/alertDialog'; +import { DismissDialogAction } from './arkui/component/actionSheet'; import { BorderStyle,Alignment } from './arkui/component/enums'; import { Resource } from './global/resource'; import { LengthMetrics } from './arkui/Graphics'; @@ -2403,8 +2404,7 @@ declare namespace promptAction { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ export declare interface DismissDialogAction { /** @@ -2414,8 +2414,7 @@ export declare interface DismissDialogAction { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ dismiss: Callback; @@ -2426,8 +2425,7 @@ export declare interface DismissDialogAction { * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since arkts {'1.1':'12','1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ reason: DismissReason; } -- Gitee