From a7a48ded1ad2a22ef842bb0f8f5841149bcba3ff Mon Sep 17 00:00:00 2001 From: wujinhui Date: Mon, 9 Jun 2025 15:29:31 +0800 Subject: [PATCH] =?UTF-8?q?attribute=20modifier=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wujinhui --- api/@internal/component/ets/common.d.ts | 23 ++++-- api/@ohos.arkui.modifier.d.ts | 3 +- api/arkui/AttributeUpdater.d.ets | 104 ------------------------ api/arkui/AttributeUpdater.d.ts | 4 +- api/arkui/CommonModifier.d.ets | 34 -------- api/arkui/CommonModifier.d.ts | 23 ------ 6 files changed, 23 insertions(+), 168 deletions(-) delete mode 100644 api/arkui/AttributeUpdater.d.ets delete mode 100644 api/arkui/CommonModifier.d.ets diff --git a/api/@internal/component/ets/common.d.ts b/api/@internal/component/ets/common.d.ts index 7dd487aba0..4e51a68ca3 100644 --- a/api/@internal/component/ets/common.d.ts +++ b/api/@internal/component/ets/common.d.ts @@ -20061,7 +20061,7 @@ declare interface AttributeModifier { * @since 20 * @arkts 1.2 */ - applyNormalAttribute?:(instance: T) => void; + applyNormalAttribute(instance: T) : void {} /** @@ -20073,7 +20073,7 @@ declare interface AttributeModifier { * @since 20 * @arkts 1.2 */ - applyPressedAttribute?:(instance: T) => void; + applyPressedAttribute(instance: T) : void {} /** * Defines the focused update attribute function. @@ -20084,7 +20084,7 @@ declare interface AttributeModifier { * @since 20 * @arkts 1.2 */ - applyFocusedAttribute?:(instance: T) => void; + applyFocusedAttribute(instance: T) : void {} /** @@ -20096,7 +20096,7 @@ declare interface AttributeModifier { * @since 20 * @arkts 1.2 */ - applyDisabledAttribute?:(instance: T) => void; + applyDisabledAttribute(instance: T) : void {} /** @@ -20108,7 +20108,7 @@ declare interface AttributeModifier { * @since 20 * @arkts 1.2 */ - applySelectedAttribute?:(instance: T) => void; + applySelectedAttribute(instance: T) : void {} } /** * Defines the content modifier. @@ -27531,6 +27531,19 @@ declare class CommonMethod { */ attributeModifier(modifier: AttributeModifier): T; + /** + * Sets the attribute modifier. + * + * @param { AttributeModifier } modifier + * @returns { T } + * @syscap SystemCapability.ArkUI.ArkUI.Full + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ + attributeModifier(modifier: AttributeModifier): this; + /** * Sets the gesture modifier. * diff --git a/api/@ohos.arkui.modifier.d.ts b/api/@ohos.arkui.modifier.d.ts index 859cb2db73..808bc16b68 100644 --- a/api/@ohos.arkui.modifier.d.ts +++ b/api/@ohos.arkui.modifier.d.ts @@ -584,7 +584,8 @@ export { WaterFlowModifier } from './arkui/WaterFlowModifier'; * Export AttributeUpdater, which is used to update attributes to native side. * @syscap SystemCapability.ArkUI.ArkUI.Full * @crossplatform - * @since 12 + * @since arkts {'1.1':'12','1.2':'20'} + * @arkts 1.1&1.2 */ export { AttributeUpdater } from './arkui/AttributeUpdater'; diff --git a/api/arkui/AttributeUpdater.d.ets b/api/arkui/AttributeUpdater.d.ets deleted file mode 100644 index 73d63dec00..0000000000 --- a/api/arkui/AttributeUpdater.d.ets +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @file Defines a modifier which can update attributes to native side. - * @kit ArkUI - */ - -import { AttributeModifier } from './component/common' - -/** - * function that returns a default param of AttributeUpdater. - * - * @typedef { function } Initializer - * @returns { T } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ -export type Initializer = () => T; - -/** - * Defines a modifier which can update attributes to native side. - * - * @implements AttributeModifier - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ -export declare class AttributeUpdater> implements AttributeModifier { - - /** - * Defines the normal update attribute function. - * - * @param { T } instance - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - applyNormalAttribute: undefined | ((instance: T) => void); - applyPressedAttribute: undefined | ((instance: T) => void); - applyFocusedAttribute: undefined | ((instance: T) => void); - applyDisabledAttribute: undefined | ((instance: T) => void); - applySelectedAttribute: undefined | ((instance: T) => void); - - /** - * Defines a function for initialization. - * - * @param { T } instance - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - initializeModifier(instance: T): void; - - /** - * Get attribute of the modifier. - * - * @returns { T | undefined } The attribute of the modifier. - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - get attribute(): T | undefined; - - /** - * Used to update constructor params. - * - * @type { C } - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - updateConstructorParams: C; - - /** - * Defines a function executed when component changed. - * - * @param { T } component - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - onComponentChanged(component: T): void; -} diff --git a/api/arkui/AttributeUpdater.d.ts b/api/arkui/AttributeUpdater.d.ts index 749b995ed2..2af168ed89 100644 --- a/api/arkui/AttributeUpdater.d.ts +++ b/api/arkui/AttributeUpdater.d.ts @@ -17,7 +17,9 @@ * @file Defines a modifier which can update attributes to native side. * @kit ArkUI */ - +/*** if arkts 1.2 */ +import { AttributeModifier } from "./component/common"; +/*** endif */ /** * function that returns a default param of AttributeUpdater. * diff --git a/api/arkui/CommonModifier.d.ets b/api/arkui/CommonModifier.d.ets deleted file mode 100644 index 14994f1d25..0000000000 --- a/api/arkui/CommonModifier.d.ets +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * @file - * @kit ArkUI - */ - - -/** - * Defines Common Modifier - * - * @extends CommonAttribute - * @implements AttributeModifier - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @atomicservice - * @since 12 -*/ -export declare class CommonModifier { - - -} diff --git a/api/arkui/CommonModifier.d.ts b/api/arkui/CommonModifier.d.ts index 061bb41d39..8c256e2f08 100644 --- a/api/arkui/CommonModifier.d.ts +++ b/api/arkui/CommonModifier.d.ts @@ -42,27 +42,4 @@ * @arkts 1.1&1.2 */ export declare class CommonModifier extends CommonAttribute implements AttributeModifier { - - /** - * Defines the normal update attribute function. - * - * @param { CommonAttribute } instance - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 12 - */ - applyNormalAttribute?(instance: CommonAttribute): void; - - /** - * Defines the normal update attribute function. - * - * @param { CommonAttribute } instance - * @syscap SystemCapability.ArkUI.ArkUI.Full - * @crossplatform - * @atomicservice - * @since 20 - * @arkts 1.2 - */ - applyNormalAttribute(instance: CommonAttribute): void; } -- Gitee