diff --git a/api/@internal/component/ets/rich_text.d.ts b/api/@internal/component/ets/rich_text.d.ts index e11c5718fd7ceb4f87694e9e94fa8302579228d6..0b0b823309bbb1c63a05ed9e32392ab4040f7966 100644 --- a/api/@internal/component/ets/rich_text.d.ts +++ b/api/@internal/component/ets/rich_text.d.ts @@ -20,6 +20,7 @@ /*** if arkts 1.2 */ import { CommonMethod} from './common'; +import { Resource } from '../../global/resource'; /*** endif */ /** @@ -82,21 +83,10 @@ interface RichTextInterface { * @returns { RichTextAttribute } * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since 20 + * @since arkts {'1.1':'20','1.2':'20'} + * @arkts 1.1&1.2 */ (content: string | Resource): RichTextAttribute; - - /** - * Set value. - * - * @param { string } content - * @returns { RichTextAttribute } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @since 20 - * @arkts 1.2 - */ - (content: string): RichTextAttribute; } /** diff --git a/api/@internal/component/ets/web.d.ts b/api/@internal/component/ets/web.d.ts index 1c3cd6b384ab5ed477638d69fbac2091fd35c45a..854265d8d0fcaa5e6555fe82c658d44fcbd91f2f 100644 --- a/api/@internal/component/ets/web.d.ts +++ b/api/@internal/component/ets/web.d.ts @@ -2080,7 +2080,8 @@ declare class HttpAuthHandler { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isHttpAuthInfoSaved(): boolean; } @@ -2241,7 +2242,8 @@ declare class ClientAuthenticationHandler { * * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ cancel(): void; @@ -6579,7 +6581,8 @@ declare interface OnScaleChangeEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnHttpAuthRequestEvent { /** @@ -6589,7 +6592,8 @@ declare interface OnHttpAuthRequestEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ handler: HttpAuthHandler; @@ -6600,7 +6604,8 @@ declare interface OnHttpAuthRequestEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ host: string; @@ -6611,7 +6616,8 @@ declare interface OnHttpAuthRequestEvent { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ realm: string; } @@ -6844,7 +6850,8 @@ declare interface OnSslErrorEventReceiveEvent { * @typedef OnClientAuthenticationEvent * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare interface OnClientAuthenticationEvent { /** @@ -6853,7 +6860,8 @@ declare interface OnClientAuthenticationEvent { * @type { ClientAuthenticationHandler } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ handler : ClientAuthenticationHandler; @@ -6863,7 +6871,8 @@ declare interface OnClientAuthenticationEvent { * @type { string } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ host : string; @@ -6873,7 +6882,8 @@ declare interface OnClientAuthenticationEvent { * @type { number } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ port : number; @@ -6883,7 +6893,8 @@ declare interface OnClientAuthenticationEvent { * @type { Array } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ keyTypes : Array; @@ -6893,7 +6904,8 @@ declare interface OnClientAuthenticationEvent { * @type { Array } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ issuers : Array; } @@ -9033,7 +9045,8 @@ declare class WebAttribute extends CommonMethod { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ onHttpAuthRequest(callback: Callback): WebAttribute; diff --git a/api/@ohos.web.webview.d.ts b/api/@ohos.web.webview.d.ts index 37725a2b327a7423e457fb67d05fb952e595a4bb..10bc1980adb3b6fb605959943f8d91f101b06412 100644 --- a/api/@ohos.web.webview.d.ts +++ b/api/@ohos.web.webview.d.ts @@ -2805,7 +2805,8 @@ declare namespace webview { * @type { ?boolean } * @syscap SystemCapability.Web.Webview.Core * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ isExtentionType?: boolean; @@ -4598,7 +4599,8 @@ declare namespace webview { * @syscap SystemCapability.Web.Webview.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ createWebMessagePorts(isExtentionType?: boolean): Array; @@ -6614,11 +6616,22 @@ declare namespace webview { * * @param { BackForwardCacheSupportedFeatures } features - The features that supports BackForwardCache. * @syscap SystemCapability.Web.Webview.Core - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ static enableBackForwardCache(features: BackForwardCacheSupportedFeatures): void; + /** + * Enable the BackForwardCache and indicate features that are allowed to enter BackForwardCache. + * Default is disabled. + * + * @param { BackForwardCacheSupportedFeatures } [features] - The features that supports BackForwardCache. + * @static + * @syscap SystemCapability.Web.Webview.Core + * @since 20 + * @arkts 1.2 + */ + static enableBackForwardCache(features?: BackForwardCacheSupportedFeatures): void; + /** * Configure the BackForwardCache. * @@ -6626,11 +6639,22 @@ declare namespace webview { * @throws { BusinessError } 17100001 - Init error. * The WebviewController must be associated with a Web component. * @syscap SystemCapability.Web.Webview.Core - * @since arkts {'1.1':'12', '1.2':'20'} - * @arkts 1.1&1.2 + * @since 12 */ setBackForwardCacheOptions(options: BackForwardCacheOptions): void; + /** + * Configure the BackForwardCache. + * + * @param { BackForwardCacheOptions } [options] - The configuration of BackForwardCache. + * @throws { BusinessError } 17100001 - Init error. + * The WebviewController must be associated with a Web component. + * @syscap SystemCapability.Web.Webview.Core + * @since 20 + * @arkts 1.2 + */ + setBackForwardCacheOptions(options?: BackForwardCacheOptions): void; + /** * Get the scroll offset of the webpage in view port, the coordinates of the top left corner of the view port are X: 0, Y: 0. * And the unit is virtual pixel. diff --git a/kits/@kit.ArkWeb.d.ts b/kits/@kit.ArkWeb.d.ts index 9ebc9732d760a5da771a006ed2049164035ffb6b..219e3b278d29c378065683fa34c7e1abca58d115 100644 --- a/kits/@kit.ArkWeb.d.ts +++ b/kits/@kit.ArkWeb.d.ts @@ -18,7 +18,11 @@ * @kit ArkWeb */ -import webview from '@ohos.web.webview'; import { WebNetErrorList } from '@ohos.web.netErrorList'; +export { WebNetErrorList }; + +/*** if arkts 1.1&1.2 */ +import webview from '@ohos.web.webview'; -export { webview, WebNetErrorList }; +export { webview }; +/*** endif */