@tarojs/plugin-platform-harmony-ets 4.0.0-alpha.0 → 4.0.0-alpha.2

package/dist/apis/device/memory.ts

@@ -1,4 +1,11 @@
-import { temporarilyNotSupport } from '../utils'
+import { hooks } from '@tarojs/runtime'
 
-export const onMemoryWarning = temporarilyNotSupport('onMemoryWarning')
-export const offMemoryWarning = temporarilyNotSupport('offMemoryWarning')
+export const onMemoryWarning = (listener) => {
+  hooks.tap('getMemoryLevel', (res) => {
+    listener(res)
+  })
+}
+
+export const offMemoryWarning = (listener) => {
+  hooks.off('getMemoryLevel', listener)
+}

package/dist/apis/index.ts

@@ -120,5 +120,7 @@ export function getAppInfo () {
   }
 }
 
+initNativeApi(taro)
+
 export * from './apis'
 export default taro

package/dist/apis/media/video/VideoContext.ts

@@ -1,19 +1,68 @@
+// @ts-nocheck
+import { document } from '@tarojs/runtime'
+
 import { temporarilyNotSupport } from '../../utils'
 
+import type { TaroVideoElement } from '@tarojs/runtime'
 import type Taro from '@tarojs/taro/types'
 
 export class VideoContext implements Taro.VideoContext {
+  id: string
+
+  video: TaroVideoElement
+
+  controller: VideoController
+
+  constructor (id: string) {
+    this.id = id
+    this.video = document.getElementById(id)
+
+    if (this.video) {
+      this.controller = this.video.controller
+    }
+  }
+
+  play () {
+    if (!this.controller) return
+
+    this.controller.play()
+  }
+
+  pause () {
+    if (!this.controller) return
+
+    this.controller.pause()
+  }
+
+  stop () {
+    if (!this.controller) return
+
+    this.controller.stop()
+  }
+
+  seek (position: number) {
+    if (!this.controller) return
+
+    this.controller.setCurrentTime(position)
+  }
+
+  requestFullScreen () {
+    if (!this.controller) return
+
+    this.controller.requestFullscreen(true)
+  }
+
+  exitFullScreen () {
+    if (!this.controller) return
+
+    this.controller.exitFullscreen()
+  }
+
+  requestBackgroundPlayback = temporarilyNotSupport('VideoContext.requestBackgroundPlayback')
   exitBackgroundPlayback = temporarilyNotSupport('VideoContext.exitBackgroundPlayback')
-  exitFullScreen = temporarilyNotSupport('VideoContext.exitFullScreen')
   exitPictureInPicture = temporarilyNotSupport('VideoContext.exitPictureInPicture')
   hideStatusBar = temporarilyNotSupport('VideoContext.hideStatusBar')
-  pause = temporarilyNotSupport('VideoContext.pause')
-  play = temporarilyNotSupport('VideoContext.play')
   playbackRate = temporarilyNotSupport('VideoContext.playbackRate')
-  requestBackgroundPlayback = temporarilyNotSupport('VideoContext.requestBackgroundPlayback')
-  requestFullScreen = temporarilyNotSupport('VideoContext.requestFullScreen')
-  seek = temporarilyNotSupport('VideoContext.seek')
   sendDanmu = temporarilyNotSupport('VideoContext.sendDanmu')
   showStatusBar = temporarilyNotSupport('VideoContext.showStatusBar')
-  stop = temporarilyNotSupport('VideoContext.stop')
 }

package/dist/apis/media/video/index.ts

@@ -26,6 +26,7 @@ import mediaLibrary from '@ohos.multimedia.mediaLibrary'
 import { callAsyncFail, callAsyncSuccess, temporarilyNotSupport, validateParams } from '../../utils'
 import { VideoContext } from './VideoContext'
 
+import type { TaroAny } from '@tarojs/runtime'
 import type Taro from '@tarojs/taro/types'
 
 interface IChooseVideoOptionOHOS {
@@ -43,8 +44,8 @@ const saveVideoToPhotosAlbumSchema = {
   filePath: 'String'
 }
 
-export const createVideoContext: typeof Taro.createVideoContext = () => {
-  return new VideoContext()
+export const createVideoContext: typeof Taro.createVideoContext = (id: string, _: TaroAny) => {
+  return new VideoContext(id)
 }
 
 // TODO: 1.返回属性补全

package/dist/apis/network/request.ts

@@ -6,7 +6,7 @@
 // ✅ RequestTask.onHeadersReceived
 
 import http from '@ohos.net.http'
-import { isString, isUndefined } from '@tarojs/shared'
+import { isString } from '@tarojs/shared'
 
 import { callAsyncFail, callAsyncSuccess, validateParams } from '../utils'
 
@@ -59,10 +59,10 @@ export const request: typeof Taro.request = function (options) {
     }
 
     // 检查 Header 是否有 Referer
-    if (isUndefined(header.Referer)) {
-      const error = { errMsg: 'request fail parameter error: the header doesn‘t support Referer property' }
-      callAsyncFail(reject, error, options)
-    }
+    // if (isUndefined(header.Referer)) {
+    //   const error = { errMsg: 'request fail parameter error: the header doesn‘t support Referer property' }
+    //   callAsyncFail(reject, error, options)
+    // }
 
     // 检查 method 是否正确
     if (method) {

package/dist/apis/route/index.ts

@@ -16,6 +16,21 @@ function parseURL (raw = ''): [string, Record<string, unknown>] {
   const [urlStr, queryStr = ''] = raw.split('?')
   const query: Record<string, unknown> = queryToJson(queryStr)
   let url = urlStr.replace(/^\//, '')
+
+  // 处理相对路径
+  if (url.indexOf('.') === 0) {
+    const page = router.getState()
+    const parts = page.path.split('/')
+    parts.pop()
+    url.split('/').forEach((item) => {
+      if (item === '.') {
+        return
+      }
+      item === '..' ? parts.pop() : parts.push(item)
+    })
+    url = parts.join('/')
+  }
+
   if (isTabPage(url)) {
     query.$page = url
     url = TARO_TABBAR_PAGE_PATH

package/dist/apis/wxml/index.ts

@@ -13,3 +13,5 @@ export const createIntersectionObserver: typeof Taro.createIntersectionObserver
 }
 
 export const createMediaQueryObserver = /* @__PURE__ */ temporarilyNotSupport('createMediaQueryObserver')
+
+export { IntersectionObserver }

package/dist/components-harmony-ets/button.ets

@@ -1,41 +1,12 @@
 import { eventHandler, createTaroEvent, convertNumber2VP, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
 import { createLazyChildren } from './render'
+import commonStyleModify from './style'
 import { BUTTON_THEME_COLOR } from './utils/constant/style'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
 import type { TaroAny, TaroEvent, TaroButtonElement, TaroStyleType } from '@tarojs/runtime'
 
-@Extend(Button)
-function attrs (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .width(style.width)
-  .height(style.height)
-  .padding({
-    top: style.padding?.top,
-    left: style.padding?.left || 10,
-    right: style.padding?.right || 10,
-    bottom: style.padding?.bottom,
-  })
-  .margin(style.margin)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .backgroundImage(style.backgroundImage, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundImageSize)
-  .backgroundImagePosition(style.backgroundImagePosition)
-  .rotate(style.rotate)
-  .scale(style.scale)
-  .translate(style.translate)
-  .transform(style.transform)
-  .borderStyle(style.borderStyle)
-  .linearGradient(style.linearGradient)
-  .zIndex(style.zIndex)
-  .clip(style.clip)
-}
-
 @Extend(Button)
 function themeStyles(style: TaroStyleType) {
   .fontColor(style.color)
@@ -71,9 +42,24 @@ function getThemeAttributes (node: TaroButtonElement): TaroStyleType {
   const type: string = _attrs.type || 'default'
 
   return {
-    borderColor: hmStyle.borderColor || getButtonColor(node, BUTTON_THEME_COLOR.get(type).background),
-    borderWidth: hmStyle.borderWidth || 1,
-    borderRadius: hmStyle.borderRadius || convertNumber2VP(10),
+    borderColor: {
+      top: hmStyle.borderTopColor || getButtonColor(node, BUTTON_THEME_COLOR.get(type).background),
+      right: hmStyle.borderRightColor || getButtonColor(node, BUTTON_THEME_COLOR.get(type).background),
+      bottom: hmStyle.borderBottomColor || getButtonColor(node, BUTTON_THEME_COLOR.get(type).background),
+      left: hmStyle.borderLeftColor || getButtonColor(node, BUTTON_THEME_COLOR.get(type).background)
+    },
+    borderWidth: {
+      top: hmStyle.borderTopWidth || 1,
+      right: hmStyle.borderRightWidth || 1,
+      bottom: hmStyle.borderBottomWidth || 1,
+      left: hmStyle.borderLeftWidth || 1
+    },
+    borderRadius: {
+      topLeft: hmStyle.borderTopLeftRadius || convertNumber2VP(10),
+      topRight: hmStyle.borderTopRightRadius || convertNumber2VP(10),
+      bottomLeft: hmStyle.borderBottomLeftRadius || convertNumber2VP(10),
+      bottomRight: hmStyle.borderBottomRightRadius || convertNumber2VP(10)
+    },
     opacity: isDisabled ? 0.4 : hmStyle.opacity,
     backgroundColor: isPlain ? Color.Transparent : (hmStyle.backgroundColor || BUTTON_THEME_COLOR.get(type).background),
     color: hmStyle.color || getButtonColor(node, BUTTON_THEME_COLOR.get(type).text),
@@ -121,16 +107,16 @@ export default function TaroButton (node: TaroButtonElement) {
     }
   }
   .themeStyles(getThemeAttributes(node))
-  .attrs(getNormalAttributes(node))
+  .attributeModifier(commonStyleModify.setNode(node))
   .constraintSize({
-    minWidth: node.hmStyle?.constraintSize?.minWidth || getButtonMinWidth(node),
-    minHeight: node.hmStyle?.constraintSize?.minHeight || getButtonMinHeight(node),
-    maxWidth: node.hmStyle?.constraintSize?.maxWidth,
-    maxHeight: node.hmStyle?.constraintSize?.maxHeight,
+    minWidth: node.hmStyle?.minWidth || getButtonMinWidth(node),
+    minHeight: node.hmStyle?.minHeight || getButtonMinHeight(node),
+    maxWidth: node.hmStyle?.maxWidth,
+    maxHeight: node.hmStyle?.maxHeight,
   })
   .type(ButtonType.Normal)
   .onClick((e: ClickEvent) => {
-    if (['submit', 'reset'].includes(node._attrs.formType)) {
+    if (node._attrs.formType && ['submit', 'reset'].includes(node._attrs.formType)) {
       const eventName = node._attrs.formType + '-btn'
       const event: TaroEvent = createTaroEvent(eventName, {}, node)
       eventHandler(event, eventName, node)

package/dist/components-harmony-ets/checkbox.ets

@@ -1,10 +1,11 @@
 import { createTaroEvent, eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
 
+import commonStyleModify from './style'
 import { createLazyChildren } from './render'
 import { FlexManager } from './utils/FlexManager'
-import { shouldBindEvent, getNormalAttributes, getNodeThresholds } from './utils/helper'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroStyleType, TaroAny, TaroEvent, TaroCheckboxElement, TaroCheckboxGroupElement } from '@tarojs/runtime'
+import type { TaroAny, TaroEvent, TaroCheckboxElement, TaroCheckboxGroupElement } from '@tarojs/runtime'
 
 interface CheckboxOptions {
   name?: string
@@ -14,37 +15,6 @@ interface CheckboxAttrs {
   selectedColor?: ResourceColor
 }
 
-@Extend(Checkbox)
-function checkboxStyle (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .padding(style.padding)
-  .margin(style.margin)
-  .width(style.width)
-  .height(style.height)
-  .constraintSize(style.constraintSize)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundImageSize)
-  .backgroundImagePosition(style.backgroundImagePosition)
-  .rotate(style.rotate)
-  .scale(style.scale)
-  .translate(style.translate)
-  .transform(style.transform)
-  .borderStyle(style.borderStyle)
-  .borderWidth(style.borderWidth)
-  .borderColor(style.borderColor)
-  .borderRadius(style.borderRadius)
-  .linearGradient(style.linearGradient)
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .clip(style.clip)
-}
-
 @Extend(Checkbox)
 function checkboxAttr(attr: CheckboxAttrs) {
   .selectedColor(attr.selectedColor)
@@ -63,75 +33,63 @@ function getOptions (node: TaroCheckboxElement): CheckboxOptions {
   }
 }
 
-@Builder
-export function TaroCheckbox(node: TaroCheckboxElement) {
-  Stack() {
-    Row() {
-      Checkbox(getOptions(node))
-        .checkboxStyle(getNormalAttributes(node))
-        .checkboxAttr(getAttributes(node))
-        .opacity(!!node._attrs.disabled ? 0.4 : 1)
-        .select(node.checked)
-        .onChange((value: boolean) => {
-          if (!!node?._attrs.disabled) {
-            node.updateComponent()
-          } else {
-            node.updateCheckedValue(value)
+@Component
+export struct TaroCheckbox {
+  node: TaroCheckboxElement | null = null
 
-            if (value) {
-              const event: TaroEvent = createTaroEvent('change', { detail: { value: node?._attrs.value } }, node)
-              eventHandler(event, 'change', node)
+  aboutToAppear () {
+    if (this.node && !this.node._isInit) {
+      this.node._isInit = true
+      this.node._reset = this.node.checked || false
+    }
+  }
+
+  build () {
+    if (this.node) {
+      Stack() {
+        Row() {
+          Checkbox(getOptions(this.node))
+            .attributeModifier(commonStyleModify.setNode(this.node))
+            .checkboxAttr(getAttributes(this.node))
+            .opacity(!!this.node._attrs.disabled ? 0.4 : 1)
+            .select(this.node.checked)
+            .onChange((value: boolean) => {
+              if (this.node) {
+                if (!!this.node?._attrs.disabled) {
+                  this.node.updateComponent()
+                } else {
+                  this.node.updateCheckedValue(value)
+      
+                  if (value) {
+                    const event: TaroEvent = createTaroEvent('change', { detail: { value: this.node?._attrs.value } }, this.node)
+                    eventHandler(event, 'change', this.node)
+                  }
+                }
+              }
+            })
+            .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+            .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+              if (this.node) {
+                this.node._nodeInfo.areaInfo = res[1]
+              }
+            }))
+            .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+          Text(this.node.textContent)
+            .textAlign(TextAlign.Center)
+            .opacity(!!this.node._attrs.disabled ? 0.4 : 1)
+        }
+        .onClick(() => {
+          if (this.node) {
+            if (!this.node?._attrs.disabled) {
+              this.node.checked = !this.node.checked
             }
           }
         })
-        .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-        .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-          node._nodeInfo.areaInfo = res[1]
-        }))
-        .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
-      Text(node.textContent)
-        .textAlign(TextAlign.Center)
-        .opacity(!!node._attrs.disabled ? 0.4 : 1)
-    }
-    .onClick(() => {
-      if (!node?._attrs.disabled) {
-        node.checked = !node.checked
       }
-    })
+    }
   }
 }
 
-@Extend(Flex)
-function checkboxGroupAttrs (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .padding(style.padding)
-  .margin(style.margin)
-  .width(style.width)
-  .height(style.height)
-  .constraintSize(style.constraintSize)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundImageSize)
-  .backgroundImagePosition(style.backgroundImagePosition)
-  .rotate(style.rotate)
-  .scale(style.scale)
-  .translate(style.translate)
-  .transform(style.transform)
-  .borderStyle(style.borderStyle)
-  .borderWidth(style.borderWidth)
-  .borderColor(style.borderColor)
-  .borderRadius(style.borderRadius)
-  .linearGradient(style.linearGradient)
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .clip(style.clip)
-}
-
 interface ChangeEventDetail { value: string[] }
 
 @Component
@@ -163,12 +121,25 @@ export struct TaroCheckboxGroup {
 
   build() {
     if (this.node) {
-      Flex(FlexManager.flexOptions(this.node)) {
-        createLazyChildren(this.node)
+      if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node).direction !== FlexDirection.Column) {
+        Row() {
+          createLazyChildren(this.node)
+        }
+        .attributeModifier(commonStyleModify.setNode(this.node))
+        .defaultEvent()
+        .visibleChangeEvent()
+        .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
+        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+      } else {
+        Column() {
+          createLazyChildren(this.node)
+        }
+        .attributeModifier(commonStyleModify.setNode(this.node))
+        .defaultEvent()
+        .visibleChangeEvent()
+        .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
+        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
       }
-      .checkboxGroupAttrs(getNormalAttributes(this.node))
-      .defaultEvent()
-      .visibleChangeEvent()
     }
   }
 }

package/dist/components-harmony-ets/form.ets

@@ -1,53 +1,40 @@
 import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
 
+import commonStyleModify from './style'
 import { createLazyChildren } from './render'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
 import { FlexManager } from './utils/FlexManager'
-import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroAny, TaroFormElement, TaroStyleType } from '@tarojs/runtime'
-
-@Extend(Flex)
-function attrs (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .padding(style.padding)
-  .margin(style.margin)
-  .width(style.width)
-  .height(style.height)
-  .constraintSize(style.constraintSize)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundImageSize)
-  .backgroundImagePosition(style.backgroundImagePosition)
-  .rotate(style.rotate)
-  .scale(style.scale)
-  .translate(style.translate)
-  .transform(style.transform)
-  .borderStyle(style.borderStyle)
-  .borderWidth(style.borderWidth)
-  .borderColor(style.borderColor)
-  .borderRadius(style.borderRadius)
-  .linearGradient(style.linearGradient)
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .clip(style.clip)
-}
+import type { TaroAny, TaroFormElement } from '@tarojs/runtime'
 
 @Builder
 export default function TaroForm (node: TaroFormElement) {
-  Flex(FlexManager.flexOptions(node)) {
-    createLazyChildren(node)
+  if (FlexManager.isFlexNode(node) && FlexManager.flexOptions(node).direction !== FlexDirection.Column) {
+    Row() {
+      createLazyChildren(node)
+    }
+    .attributeModifier(commonStyleModify.setNode(node))
+    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
+    .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
+    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+      node._nodeInfo.areaInfo = res[1]
+    }))
+    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+    .alignItems(FlexManager.flexOptions(node).alignItems as VerticalAlign)
+    .justifyContent(FlexManager.flexOptions(node).justifyContent)
+  } else {
+    Column() {
+      createLazyChildren(node)
+    }
+    .attributeModifier(commonStyleModify.setNode(node))
+    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
+    .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
+    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+      node._nodeInfo.areaInfo = res[1]
+    }))
+    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+    .alignItems(FlexManager.flexOptions(node).alignItems as HorizontalAlign)
+    .justifyContent(FlexManager.flexOptions(node).justifyContent)
   }
-  .attrs(getNormalAttributes(node))
-  .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-  .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
-  .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
-  .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-    node._nodeInfo.areaInfo = res[1]
-  }))
 }

package/dist/components-harmony-ets/icon.ets

@@ -1,39 +1,9 @@
-import { eventHandler, convertNumber2VP, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
+import { eventHandler, convertNumber2VP, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, convertNumber2PX } from '@tarojs/runtime'
 
+import commonStyleModify from './style'
 import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroIconElement, TaroAny, TaroStyleType } from '@tarojs/runtime'
-
-@Extend(Image)
-function attrs (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .padding(style.padding)
-  .margin(style.margin)
-  .width(style.width || convertNumber2VP(23))
-  .height(style.height || convertNumber2VP(23))
-  .constraintSize(style.constraintSize)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundImageSize)
-  .backgroundImagePosition(style.backgroundImagePosition)
-  .rotate(style.rotate)
-  .scale(style.scale)
-  .translate(style.translate)
-  .transform(style.transform)
-  .borderStyle(style.borderStyle)
-  .borderWidth(style.borderWidth)
-  .borderColor(style.borderColor)
-  .borderRadius(style.borderRadius)
-  .linearGradient(style.linearGradient)
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .clip(style.clip)
-}
+import type { TaroIconElement, TaroAny } from '@tarojs/runtime'
 
 const ICON_COLOR_MAP: TaroAny = {
   success: Color.Green,
@@ -83,11 +53,13 @@ export default function TaroIcon (node: TaroIconElement) {
   Image(getIconData(node))
     .objectFit(ImageFit.Contain)
     .fillColor(node._attrs.color || ICON_COLOR_MAP[node._attrs.type] || Color.Black)
-    .attrs(getNormalAttributes(node))
+    .attributeModifier(commonStyleModify.setNode(node))
     .size({
       width: convertNumber2VP(Number(node._attrs.size) || 23),
       height: convertNumber2VP(Number(node._attrs.size) || 23),
     })
+    .width(getNormalAttributes(node).width || convertNumber2PX(23))
+    .height(getNormalAttributes(node).height || convertNumber2PX(23))
     .onComplete(e => eventHandler(e, 'complete', node))
     .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
     .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))

package/dist/components-harmony-ets/image.ets

@@ -1,40 +1,10 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
 
+import commonStyleModify from './style'
 import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
 
 import type { TaroImageElement, TaroAny, TaroStyleType } from '@tarojs/runtime'
 
-@Extend(Image)
-function attrs (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .padding(style.padding)
-  .margin(style.margin)
-  .width(style.width)
-  .height(style.height)
-  .backgroundColor(style.backgroundColor)
-  .constraintSize(style.constraintSize)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .backgroundImage(style.backgroundImage, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundImageSize)
-  .backgroundImagePosition(style.backgroundImagePosition)
-  .rotate(style.rotate)
-  .scale(style.scale)
-  .translate(style.translate)
-  .transform(style.transform)
-  .borderStyle(style.borderStyle)
-  .borderWidth(style.borderWidth)
-  .borderColor(style.borderColor)
-  .borderRadius(style.borderRadius)
-  .linearGradient(style.linearGradient)
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .clip(style.clip)
-}
-
 function getImageMode (mode: string): ImageFit {
   switch (mode) {
     case 'aspectFit': return ImageFit.Contain
@@ -54,7 +24,7 @@ export default function TaroImage (node: TaroImageElement) {
       node._nodeInfo.areaInfo = res[1]
     }))
     .objectFit(getImageMode(node.getAttribute('mode')))
-    .attrs(getNormalAttributes(node))
+    .attributeModifier(commonStyleModify.setNode(node))
     .onComplete(e => eventHandler(e, 'complete', node))
     .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
 }