From 4cbad44d0da0d4e5673e919e4cd6819b1e81531b Mon Sep 17 00:00:00 2001 From: yuxiaofei9 Date: Tue, 26 Aug 2025 20:04:11 +0800 Subject: [PATCH] revert 1.1 header for 0728 Signed-off-by: yuxiaofei9 --- ...kui.advanced.GridObjectSortComponent.d.ets | 120 +++++-------- api/@ohos.arkui.advanced.SplitLayout.d.ets | 63 +------ api/@ohos.arkui.advanced.SubHeader.d.ets | 167 +++++++++--------- api/@ohos.arkui.advanced.SwipeRefresher.d.ets | 44 +---- 4 files changed, 137 insertions(+), 257 deletions(-) diff --git a/api/@ohos.arkui.advanced.GridObjectSortComponent.d.ets b/api/@ohos.arkui.advanced.GridObjectSortComponent.d.ets index 61ed933ac2..7b87b79ada 100644 --- a/api/@ohos.arkui.advanced.GridObjectSortComponent.d.ets +++ b/api/@ohos.arkui.advanced.GridObjectSortComponent.d.ets @@ -18,37 +18,30 @@ * @kit ArkUI */ -/*** if arkts 1.2 */ -import { Resource, ResourceStr, ResourceColor, LocalizedMargin } from './arkui/component/units'; -import { Prop } from './arkui/stateManagement/common'; -import { Component } from './arkui/component/customComponent'; -/*** endif */ - /** * Controls the style types of GridObjectSortComponent. * @enum { string } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** +/** * Controls the style types of GridObjectSortComponent. * @enum { string } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice * @since 12 + * @noninterop */ export declare enum GridObjectSortComponentType { /** * The GridObjectSortComponent image text type. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * The GridObjectSortComponent image text type. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform @@ -61,10 +54,9 @@ export declare enum GridObjectSortComponentType { * The GridObjectSortComponent text type. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * The GridObjectSortComponent text type. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform @@ -79,16 +71,16 @@ export declare enum GridObjectSortComponentType { * @interface GridObjectSortComponentIteml * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** +/** * Declaration of the GridObjectSortComponent item. * @interface GridObjectSortComponentIteml * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice * @since 12 + * @noninterop */ export interface GridObjectSortComponentItem { /** @@ -96,10 +88,9 @@ export interface GridObjectSortComponentItem { * @type { number | string } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * id of GridObjectSortComponent item. * @type { number | string } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -114,10 +105,9 @@ export interface GridObjectSortComponentItem { * @type { ResourceStr } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * GridObjectSortComponent item text. * @type { ResourceStr } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -132,10 +122,9 @@ export interface GridObjectSortComponentItem { * @type { boolean } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * selected of GridObjectSortComponent item, true is show area, false is add area. * @type { boolean } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -150,10 +139,9 @@ export interface GridObjectSortComponentItem { * @type { number } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * order of GridObjectSortComponentItem, Used for sorting dataList. * @type { number } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -168,10 +156,9 @@ export interface GridObjectSortComponentItem { * @type { ?ResourceStr } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * image resource path of the GridObjectSortComponent item. * @type { ?ResourceStr } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -196,16 +183,16 @@ export interface GridObjectSortComponentItem { * @interface GridEditOptions * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** +/** * GridObjectSortComponentOptions of GridObjectSortComponent. * @interface GridEditOptions * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice * @since 12 + * @noninterop */ export interface GridObjectSortComponentOptions { /** @@ -214,10 +201,9 @@ export interface GridObjectSortComponentOptions { * @default GridObjectSortComponentType.TEXT * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * Configuration GridObjectSortComponent type. * @type { GridObjectSortComponentType } * @default GridObjectSortComponentType.TEXT @@ -233,10 +219,9 @@ export interface GridObjectSortComponentOptions { * @type { ?number | ?Resource } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * The size of the GridObjectSortComponent image. * @type { ?number | ?Resource } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -251,10 +236,9 @@ export interface GridObjectSortComponentOptions { * @type { ?ResourceStr } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * The title displayed in the unedited state of the GridObjectSortComponent. * @type { ?ResourceStr } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -269,10 +253,9 @@ export interface GridObjectSortComponentOptions { * @type { ?ResourceStr } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * The title displayed in the GridObjectSortComponent edit state. * @type { ?ResourceStr } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -287,10 +270,9 @@ export interface GridObjectSortComponentOptions { * @type { ?ResourceStr } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * Display Area Title, First subtitle of the GridObjectSortComponent. * @type { ?ResourceStr } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -305,10 +287,9 @@ export interface GridObjectSortComponentOptions { * @type { ?ResourceStr } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * Add Zone Title, second subtitle of the GridObjectSortComponent. * @type { ?ResourceStr } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -324,16 +305,16 @@ export interface GridObjectSortComponentOptions { * @struct { GridObjectSortComponent } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** +/** * Declare struct GridObjectSortComponent. * @struct { GridObjectSortComponent } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice * @since 12 + * @noninterop */ @Component export declare struct GridObjectSortComponent { @@ -342,10 +323,9 @@ export declare struct GridObjectSortComponent { * @type { GridObjectSortComponentOptions } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * Component types and parameters of the GridObjectSortComponent. * @type { GridObjectSortComponentOptions } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -361,10 +341,9 @@ export declare struct GridObjectSortComponent { * @type { Array } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * Data list of GridObjectSortComponent. * @type { Array } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -379,10 +358,9 @@ export declare struct GridObjectSortComponent { * @type { (select: Array, unselect: Array) => void } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * Callback when Obtain edited data. * @type { (select: Array, unselect: Array) => void } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -397,10 +375,9 @@ export declare struct GridObjectSortComponent { * @type { () => void } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * Cancel callback for saving data. * @type { () => void } * @syscap SystemCapability.ArkUI.ArkUI.Full @@ -414,10 +391,9 @@ export declare struct GridObjectSortComponent { * Build function of GridObjectSortComponent. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ - /** + /** * Build function of GridObjectSortComponent. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform diff --git a/api/@ohos.arkui.advanced.SplitLayout.d.ets b/api/@ohos.arkui.advanced.SplitLayout.d.ets index 72388ba2d3..8641e9cb6b 100644 --- a/api/@ohos.arkui.advanced.SplitLayout.d.ets +++ b/api/@ohos.arkui.advanced.SplitLayout.d.ets @@ -17,12 +17,10 @@ * @file * @kit ArkUI */ -/*** if arkts 1.2 */ -import { ResourceStr } from './arkui/component/units'; -import { State, PropRef } from './arkui/stateManagement/decorator'; -import { Component } from './arkui/component/customComponent'; -import { BuilderParam, Builder } from './arkui/component/builder'; -/*** endif */ + + + + /** * Declare SplitLayout.The SplitLayout is used for upper and lower graphic layouts. @@ -33,8 +31,7 @@ import { BuilderParam, Builder } from './arkui/component/builder'; * Declare SplitLayout.The SplitLayout is used for upper and lower graphic layouts. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts{ '1.1':'11','1.2':'20' } - * @arkts 1.1&1.2 + * @since 11 */ @Component export declare struct SplitLayout { @@ -49,8 +46,7 @@ export declare struct SplitLayout { * @type { container: () => void }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts{ '1.1':'11','1.2':'20' } - * @arkts 1.1&1.2 + * @since 11 */ @BuilderParam container: () => void; @@ -65,8 +61,7 @@ export declare struct SplitLayout { * @type { ResourceStr }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts{ '1.1':'11','1.2':'20' } - * @arkts 1.1&1.2 + * @since 11 */ @State mainImage: ResourceStr; @@ -82,20 +77,9 @@ export declare struct SplitLayout { * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 11 - * @arkts 1.1 */ @Prop primaryText: ResourceStr; - /** - * Title text in the layout. - * @type { ResourceStr }. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - @PropRef primaryText: ResourceStr; - /** * Description text in the layout. * @type { ?ResourceStr }. @@ -108,20 +92,9 @@ export declare struct SplitLayout { * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 11 - * @arkts 1.1 */ @Prop secondaryText?: ResourceStr; - /** - * Description text in the layout. - * @type { ?ResourceStr }. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - @PropRef secondaryText?: ResourceStr; - /** * Auxiliary text in the layout. * @type { ?ResourceStr }. @@ -134,26 +107,6 @@ export declare struct SplitLayout { * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 11 - * @arkts 1.1 */ @Prop tertiaryText?: ResourceStr; - - /** - * Auxiliary text in the layout. - * @type { ?ResourceStr }. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - @PropRef tertiaryText?: ResourceStr; - - /** - * The method to build component. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - @Builder build(): void; -} +} \ No newline at end of file diff --git a/api/@ohos.arkui.advanced.SubHeader.d.ets b/api/@ohos.arkui.advanced.SubHeader.d.ets index 002dc982dd..17972e466a 100644 --- a/api/@ohos.arkui.advanced.SubHeader.d.ets +++ b/api/@ohos.arkui.advanced.SubHeader.d.ets @@ -20,14 +20,6 @@ import { TextModifier } from './@ohos.arkui.modifier'; -/*** if arkts 1.2 */ -import { Resource, ResourceStr, ResourceColor, LocalizedPadding, LocalizedMargin } from './arkui/component/units'; -import { SymbolEffectStrategy, SymbolRenderingStrategy } from './arkui/component/symbolglyph'; -import { SelectOption } from './arkui/component/select'; -import { Prop, BuilderParam } from './arkui/stateManagement/common'; -import { Component } from './arkui/component/customComponent'; -import { FontWeight } from './arkui/component/enums'; -/*** endif */ /** * Control style of operation element @@ -40,8 +32,7 @@ import { FontWeight } from './arkui/component/enums'; * @enum { OperationStyle } * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Control style of operation element @@ -61,8 +52,7 @@ export declare enum OperationType { * The TextArrow style. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * The TextArrow style. @@ -70,6 +60,7 @@ export declare enum OperationType { * @crossplatform * @atomicservice * @since 18 + */ TEXT_ARROW = 0, @@ -82,8 +73,7 @@ export declare enum OperationType { * The Button style. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * The Button style. @@ -91,6 +81,7 @@ export declare enum OperationType { * @crossplatform * @atomicservice * @since 18 + */ BUTTON = 1, @@ -103,8 +94,7 @@ export declare enum OperationType { * The IconGroup style. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * The IconGroup style. @@ -112,6 +102,7 @@ export declare enum OperationType { * @crossplatform * @atomicservice * @since 18 + */ ICON_GROUP = 2, @@ -124,8 +115,7 @@ export declare enum OperationType { * The LoadingProgress style. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * The LoadingProgress style. @@ -133,6 +123,7 @@ export declare enum OperationType { * @crossplatform * @atomicservice * @since 18 + */ LOADING = 3 } @@ -146,8 +137,7 @@ export declare enum OperationType { * Declare type OperationOption * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Declare type OperationOption @@ -168,8 +158,7 @@ export declare class OperationOption { * @type { ResourceStr }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * The content of text or the address of icon. @@ -183,21 +172,20 @@ export declare class OperationOption { /** * callback function when operate the text or icon. - * @type { () => void }. + * @type { ?function }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 10 */ /** * callback function when operate the text or icon. - * @type { () => void }. + * @type { ?function }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * callback function when operate the text or icon. - * @type { () => void }. + * @type { ?function }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice @@ -206,8 +194,8 @@ export declare class OperationOption { action?: () => void; /** - * The accessibilityText of this text or icon. - * @type { ?ResourceStr }. + * Accessible label name for the icon on the right side of the subheader. + * @type { ?ResourceStr } * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 18 @@ -253,8 +241,7 @@ export declare class OperationOption { * Declare type SelectOption * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Declare type SelectOption @@ -275,8 +262,7 @@ export declare class SelectOptions { * @type { Array }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * SubOption array of the select. @@ -285,6 +271,7 @@ export declare class SelectOptions { * @crossplatform * @atomicservice * @since 18 + */ options: Array; @@ -299,8 +286,7 @@ export declare class SelectOptions { * @type { number }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * The default selected index. @@ -309,6 +295,7 @@ export declare class SelectOptions { * @crossplatform * @atomicservice * @since 18 + */ selected?: number; @@ -323,8 +310,7 @@ export declare class SelectOptions { * @type { string }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * The default text value. @@ -355,8 +341,7 @@ export declare class SelectOptions { * @type { (index: number, value?: string) => void }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Callback when the select is selected. @@ -365,6 +350,7 @@ export declare class SelectOptions { * @crossplatform * @atomicservice * @since 18 + */ onSelect?: (index: number, value?: string) => void; @@ -375,6 +361,7 @@ export declare class SelectOptions { * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 18 + */ defaultFocus?: boolean; } @@ -383,14 +370,14 @@ export declare class SelectOptions { * Declare type SymbolOptions * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since 12 + * @since 12 */ - /** +/** * Declare type SymbolOptions * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice - * @since 18 + * @since 18 */ export declare class SymbolOptions { /** @@ -407,6 +394,7 @@ export declare class SymbolOptions { * @crossplatform * @atomicservice * @since 18 + */ fontSize?: number | string | Resource; @@ -424,6 +412,7 @@ export declare class SymbolOptions { * @crossplatform * @atomicservice * @since 18 + */ fontColor?: Array; @@ -441,6 +430,7 @@ export declare class SymbolOptions { * @crossplatform * @atomicservice * @since 18 + */ fontWeight?: number | FontWeight | string; @@ -458,6 +448,7 @@ export declare class SymbolOptions { * @crossplatform * @atomicservice * @since 18 + */ effectStrategy?: SymbolEffectStrategy; @@ -475,6 +466,7 @@ export declare class SymbolOptions { * @crossplatform * @atomicservice * @since 18 + */ renderingStrategy?: SymbolRenderingStrategy; } @@ -488,8 +480,7 @@ export declare class SymbolOptions { * Declare struct SubHeader * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Declare struct SubHeader @@ -512,12 +503,11 @@ export declare struct SubHeader { * @type { ResourceStr }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Icon resource of content area. - * @type { ResourceStr }. + * @type { ?ResourceStr }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice @@ -527,14 +517,14 @@ export declare struct SubHeader { /** * Attributes of Symbol icon. - * @type { SymbolOptions}. + * @type { ?SymbolOptions }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 12 */ /** * Attributes of Symbol icon. - * @type { SymbolOptions}. + * @type { ?SymbolOptions }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 18 @@ -543,69 +533,68 @@ export declare struct SubHeader { /** * The first line text of content area. - * @type { ResourceStr }. + * @type { ?ResourceStr }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 10 */ /** * The first line text of content area. - * @type { ResourceStr }. + * @type { ?ResourceStr }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * The first line text of content area. - * @type { ResourceStr }. + * @type { ?ResourceStr }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice * @since 18 */ + @Prop primaryTitle?: ResourceStr; /** * The secondary line text of content area. - * @type { ResourceStr }. + * @type { ?ResourceStr }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 10 */ /** * The secondary line text of content area. - * @type { ResourceStr }. + * @type { ?ResourceStr }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * The secondary line text of content area. - * @type { ResourceStr }. + * @type { ?ResourceStr }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice * @since 18 */ + @Prop secondaryTitle?: ResourceStr; /** * Select option of content area. - * @type { SelectOptions }. + * @type { ?SelectOptions }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 10 */ /** * Select option of content area. - * @type { SelectOptions }. + * @type { ?SelectOptions }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Select option of content area. - * @type { SelectOptions }. + * @type { ?SelectOptions }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice @@ -615,45 +604,44 @@ export declare struct SubHeader { /** * Operation style of SubHeader. - * @type { OperationStyle }. + * @type { ?OperationType }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 10 */ /** * Operation style of SubHeader. - * @type { OperationStyle }. + * @type { ?OperationType }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * Operation style of SubHeader. - * @type { OperationStyle }. + * @type { ?OperationType }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice * @since 18 */ + @Prop operationType?: OperationType; /** * operation item. - * @type { Array }. + * @type { ?Array }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @since 10 */ /** * operation item. - * @type { Array }. + * @type { ?Array }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ /** * operation item. - * @type { Array }. + * @type { ?Array }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice @@ -663,14 +651,14 @@ export declare struct SubHeader { /** * Attributes of Symbol icons in operation area. - * @type { Array }. + * @type { ?Array }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 12 */ /** * Attributes of Symbol icons in operation area. - * @type { Array }. + * @type { ?Array }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 18 @@ -679,14 +667,14 @@ export declare struct SubHeader { /** * Text modifier for primary title. - * @type { TextModifier }. + * @type { ?TextModifier }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 12 */ /** * Text modifier for primary title. - * @type { TextModifier }. + * @type { ?TextModifier }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice @@ -696,14 +684,14 @@ export declare struct SubHeader { /** * Text modifier for secondary title. - * @type { TextModifier }. + * @type { ?TextModifier }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 12 */ /** * Text modifier for secondary title. - * @type { TextModifier }. + * @type { ?TextModifier }. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice @@ -713,26 +701,27 @@ export declare struct SubHeader { /** * Set the title content. - * @type { () => void } + * @type { ?function } * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 12 */ /** * Set the title content. - * @type { () => void } + * @type { ?function } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice * @since 18 */ + @BuilderParam titleBuilder?: () => void; /** * Set the content margin. * @type { ?LocalizedMargin } * @default {start: LengthMetrics.resource($r('sys.float.margin_left')), - *
end: LengthMetrics.resource($r('sys.float.margin_right'))} + *
end: LengthMetrics.resource($r('sys.float.margin_right'))} * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 12 @@ -741,20 +730,21 @@ export declare struct SubHeader { * Set the content margin. * @type { ?LocalizedMargin } * @default {start: LengthMetrics.resource($r('sys.float.margin_left')), - *
end: LengthMetrics.resource($r('sys.float.margin_right'))} + *
end: LengthMetrics.resource($r('sys.float.margin_right'))} * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice * @since 18 */ + @Prop contentMargin?: LocalizedMargin; /** * Set the content padding. * @type { ?LocalizedPadding } * @default set different default values according to the width of the subHeader: - *
When the left area is secondaryTitle or the group of secondaryTitle and icon, - *
the default value is {start: LengthMetrics.vp(12), end: LengthMetrics.vp(12)}; + *
When the left area is secondaryTitle or the group of secondaryTitle and icon, + *
the default value is {start: LengthMetrics.vp(12), end: LengthMetrics.vp(12)}; * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 12 @@ -763,12 +753,13 @@ export declare struct SubHeader { * Set the content padding. * @type { ?LocalizedPadding } * @default set different default values according to the width of the subHeader: - *
When the left area is secondaryTitle or the group of secondaryTitle and icon, - *
the default value is {start: LengthMetrics.vp(12), end: LengthMetrics.vp(12)}; + *
When the left area is secondaryTitle or the group of secondaryTitle and icon, + *
the default value is {start: LengthMetrics.vp(12), end: LengthMetrics.vp(12)}; * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform * @atomicservice * @since 18 */ + @Prop contentPadding?: LocalizedPadding; } \ No newline at end of file diff --git a/api/@ohos.arkui.advanced.SwipeRefresher.d.ets b/api/@ohos.arkui.advanced.SwipeRefresher.d.ets index 1c42bba52e..e17f55838b 100644 --- a/api/@ohos.arkui.advanced.SwipeRefresher.d.ets +++ b/api/@ohos.arkui.advanced.SwipeRefresher.d.ets @@ -17,12 +17,6 @@ * @file * @kit ArkUI */ -/*** if arkts 1.2 */ -import { ResourceStr } from './arkui/component/units'; -import { PropRef } from './arkui/stateManagement/decorator'; -import { Component } from './arkui/component/customComponent'; -import { Builder } from './arkui/component/builder'; -/*** endif */ /** * Declare component SwipeRefresher @@ -41,7 +35,6 @@ import { Builder } from './arkui/component/builder'; * @crossplatform * @atomicservice * @since 20 - * @arkts 1.1&1.2 */ @Component export declare struct SwipeRefresher { @@ -53,7 +46,7 @@ export declare struct SwipeRefresher { */ /** * Sets the content when loading. - * @type { ?ResourceStr } + * @type { string } * @syscap SystemCapability.ArkUI.ArkUI.Full * @atomicservice * @since 11 @@ -65,21 +58,9 @@ export declare struct SwipeRefresher { * @crossplatform * @atomicservice * @since 20 - * @arkts 1.1 */ @Prop content?: ResourceStr; - /** - * Sets the content when loading. - * @type { ?ResourceStr } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - @PropRef content?: ResourceStr; - /** * Whether the component is loading. * type { boolean } @@ -100,27 +81,6 @@ export declare struct SwipeRefresher { * @crossplatform * @atomicservice * @since 20 - * @arkts 1.1 */ @Prop isLoading: boolean; - - /** - * Whether the component is loading. - * type { boolean } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - @PropRef isLoading: boolean; - - /** - * The method to build component. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - @Builder build(): void; -} +} \ No newline at end of file -- Gitee