From 596726c0c6b3a14c8faf1447bbe59cdeba9a7c3e Mon Sep 17 00:00:00 2001 From: fangzhiyuan Date: Wed, 28 May 2025 10:42:27 +0800 Subject: [PATCH] =?UTF-8?q?arkts1.2=20$r/$rawfile=20=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=B0resources.d.ets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fangzhiyuan --- api/@internal/component/ets/common.d.ts | 18 +-------------- api/arkui/component/resources.d.ets | 29 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/api/@internal/component/ets/common.d.ts b/api/@internal/component/ets/common.d.ts index fa1352b582..340c0affe7 100644 --- a/api/@internal/component/ets/common.d.ts +++ b/api/@internal/component/ets/common.d.ts @@ -2010,21 +2010,6 @@ declare interface ExpectedFrameRateRange { */ declare function $r(value: string, ...params: any[]): Resource; -/** - * global $r function - * - * @param { string } value - * @param { any[] } params - * @returns { Resource } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @form - * @atomicservice - * @since 20 - * @arkts 1.2 - */ -declare function $r(value: string, ...params: Object[]): Resource; - /** * global $rawfile function * @@ -2061,8 +2046,7 @@ declare function $r(value: string, ...params: Object[]): Resource; * @crossplatform * @form * @atomicservice - * @since arkts {'1.1':'11','1.2':'20'} - * @arkts 1.1&1.2 + * @since 11 */ declare function $rawfile(value: string): Resource; /** diff --git a/api/arkui/component/resources.d.ets b/api/arkui/component/resources.d.ets index 2a749e6b54..9caa45467f 100755 --- a/api/arkui/component/resources.d.ets +++ b/api/arkui/component/resources.d.ets @@ -48,3 +48,32 @@ export declare function _r(bundleName: string, moduleName: string, name: string, * @arkts 1.2 */ export declare function _rawfile(bundleName: string, moduleName: string, name: string): Resource; + +/** + * global $r function + * + * @param { string } value + * @param { Object[] } params + * @returns { Resource } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export declare function $r(value: string, ...params: Object[]): Resource; + +/** + * global $rawfile function + * + * @param { string } value + * @returns { Resource } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @form + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +export declare function $rawfile(value: string): Resource; -- Gitee