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

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

@@ -1,13 +1,11 @@
-import { bindInstanceToNode, eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, initComponentNodeInfo, TaroAny, TaroEvent } from '@tarojs/runtime'
+import { createTaroEvent, eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
 
-import TaroComponentWrapper from './base'
-import { createNode } from './render'
-import { createTaroEvent } from './utils/events'
+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 { TaroCheckboxElement, TaroCheckboxGroupElement, TaroElement } from './element'
-import type { TaroStyleType } from '@tarojs/runtime'
+import type { TaroAny, TaroEvent, TaroCheckboxElement, TaroCheckboxGroupElement } from '@tarojs/runtime'
 
 interface CheckboxOptions {
   name?: string
@@ -17,36 +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)
-  .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)
@@ -60,160 +28,118 @@ function getAttributes (node: TaroCheckboxElement): CheckboxAttrs {
 }
 
 function getOptions (node: TaroCheckboxElement): CheckboxOptions {
-  const value: string = node._attrs.value
   return {
-    name: value || node.textContent
+    name: node.value as string || node.textContent
   }
 }
 
-
 @Component
 export struct TaroCheckbox {
-  nodeInfoMap: TaroAny = {}
-
-  @ObjectLink node: TaroCheckboxElement
-
-  @State checked: boolean = false
-
-  @Styles visibleChangeEvent () {
-    .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-  }
+  node: TaroCheckboxElement | null = null
 
   aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
-
-    this.checked = !!this.node._attrs.checked
-  }
-
-  @Styles defaultEvent () {
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-    .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, res => {
-      const eventResult: TaroAny = res.eventResult
-      this.nodeInfoMap[this.node._nid].areaInfo = eventResult[1]
-    }))
+    if (this.node && !this.node._isInit) {
+      this.node._isInit = true
+      this.node._reset = this.node.checked || false
+    }
   }
 
-  build() {
-    TaroComponentWrapper({ node: this.node }) {
+  build () {
+    if (this.node) {
       Stack() {
         Row() {
           Checkbox(getOptions(this.node))
-            .defaultEvent()
-            .checkboxStyle(getNormalAttributes(this.node))
+            .attributeModifier(commonStyleModify.setNode(this.node))
             .checkboxAttr(getAttributes(this.node))
             .opacity(!!this.node._attrs.disabled ? 0.4 : 1)
-            .select(this.checked)
+            .select(this.node.checked)
             .onChange((value: boolean) => {
-              if (!!this.node._attrs.disabled) {
-                // FIXME 找下文档是否有强制刷新方法
-                this.checked = !this.checked
-                this.checked = !this.checked
-              } else {
-                this.checked = value
-                if (this.checked) {
-                  const event: TaroEvent = createTaroEvent('change', { detail: { value: this.node._attrs.value } }, this.node)
-                  eventHandler(event, 'change', this.node)
+              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)
+                  }
                 }
               }
             })
-            .visibleChangeEvent()
+            .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(() => {
-          this.checked = !this.checked
+          if (this.node) {
+            if (!this.node?._attrs.disabled) {
+              this.node.checked = !this.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)
-  .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
 export struct TaroCheckboxGroup {
-  nodeInfoMap: TaroAny = {}
-
-  @ObjectLink node: TaroCheckboxGroupElement
+  node: TaroCheckboxGroupElement | null = null
 
   @Styles visibleChangeEvent () {
     .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
   }
 
   aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
-
-    // 阻止事件冒泡传递上去
-    this.node.addEventListener('change', (e: TaroEvent<ChangeEventDetail>) => {
-      e.stopPropagation()
-      e.detail.value = this.getValues()
-    })
-  }
-
-  // Element使用的获取值方法
-  getValues () {
-    const childList = this.node.getElementsByTagName<TaroCheckboxElement>('CHECKBOX')
-    const result: string[] = []
-    childList.forEach(element => {
-      if (element._instance.checked) {
-        result.push(element._attrs.value)
-      }
-    })
-    return result
+    if (this.node) {
+      // 阻止事件冒泡传递上去
+      this.node.addEventListener('change', (e: TaroEvent<ChangeEventDetail>) => {
+        e.stopPropagation()
+        e.detail.value = (this.node as TaroCheckboxGroupElement).value
+      })
+    }
   }
 
   @Styles defaultEvent () {
     .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-    .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, res => {
-      const eventResult: TaroAny = res.eventResult
-      this.nodeInfoMap[this.node._nid].areaInfo = eventResult[1]
+    .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+      if (this.node) {
+        this.node._nodeInfo.areaInfo = res[1]
+      }
     }))
   }
 
   build() {
-    TaroComponentWrapper({ node: this.node }) {
-      Flex(FlexManager.flexOptions(this.node)) {
-        ForEach(this.node.childNodes, (item: TaroElement) => {
-          createNode(item)
-        }, (item: TaroElement) => item._nid)
+    if (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,149 +1,40 @@
-import { bindInstanceToNode, AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME, initComponentNodeInfo, findChildNodeWithDFS,
-  TaroEvent,
-  TaroAny,
-  TaroFormWidgetElement
-} from '@tarojs/runtime'
+import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
 
-import { createNode } from './render'
-import TaroComponentWrapper from './base'
+import commonStyleModify from './style'
+import { createLazyChildren } from './render'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
 import { FlexManager } from './utils/FlexManager'
-import { createTaroEvent } from './utils/events'
-import { getNormalAttributes, shouldBindEvent, getNodeThresholds, bindAnimation } from './utils/helper'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroFormElement, TaroElement, TaroCheckboxElement, TaroRadioElement, TaroInputElement,
-  TaroSliderElement,
-  TaroSwitchElement,
-  TaroPickerElement
-} from './element'
-import type { TaroStyleType } from '@tarojs/runtime'
+import type { TaroAny, TaroFormElement } 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)
-  .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)
-}
-
-@Component
-export default struct TaroForm {
-  nodeInfoMap: TaroAny = {}
-
-  @Styles visibleChangeEvent () {
-    .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-  }
-
-  @ObjectLink node: TaroFormElement
-
-  aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
-    // 绑定动画
-    bindAnimation(this.node)
-
-    // 监听submit冒泡
-    this.node.addEventListener('submit-btn', (e: TaroEvent) => {
-      e.stopPropagation()
-      const formResult: Record<string, string> = {}
-      findChildNodeWithDFS(this.node, (item: TaroFormWidgetElement) => {
-        switch (item.nodeName) {
-          case 'INPUT':
-          case 'SLIDER':
-          case 'SWITCH':
-          case 'RADIO-GROUP':
-          case 'CHECKBOX-GROUP':
-          case 'PICKER': {
-            formResult[item.name] = item.value
-            break
-          }
-        }
-        return false
-      }, true)
-      const event: TaroEvent = createTaroEvent('submit', { detail: { value: formResult } }, this.node)
-      eventHandler(event, 'submit', this.node)
-    })
-    // 监听reset冒泡
-    this.node.addEventListener('reset-btn', (e: TaroEvent) => {
-      findChildNodeWithDFS(this.node, (item: TaroFormWidgetElement) => {
-        e.stopPropagation()
-        switch (item.nodeName) {
-          case 'INPUT': {
-            item.value = (item as TaroInputElement)._attrs.value
-            break
-          }
-          case 'SLIDER': {
-            item.value = (item as TaroSliderElement)._attrs.value
-            break
-          }
-          case 'SWITCH': {
-            item.value = (item as TaroSwitchElement)._attrs.checked
-            break
-          }
-          case 'RADIO-GROUP': {
-            item.getElementsByTagName<TaroRadioElement>('RADIO').forEach(element => {
-              element._instance.checked = element._attrs.checked || false
-            })
-            break
-          }
-          case 'CHECKBOX-GROUP': {
-            item.getElementsByTagName<TaroCheckboxElement>('CHECKBOX').forEach(element => {
-              element._instance.checked = element._attrs.checked || false
-            })
-            break
-          }
-          case 'PICKER': {
-            item.value = (item as TaroPickerElement)._attrs.value
-            break
-          }
-        }
-        return false
-      }, true)
-    })
-  }
-
-  @Styles defaultEvent () {
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-    .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
-    .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, res => {
-      const eventResult: TaroAny = res.eventResult
-      this.nodeInfoMap[this.node._nid].areaInfo = eventResult[1]
+@Builder
+export default function TaroForm (node: TaroFormElement) {
+  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]
     }))
-  }
-
-  build() {
-    TaroComponentWrapper({ node: this.node }) {
-      Flex(FlexManager.flexOptions(this.node)) {
-        ForEach(this.node.childNodes, (item: TaroElement) => {
-          createNode(item)
-        }, (item: TaroElement) => item._nid)
-      }
-      .attrs(getNormalAttributes(this.node))
-      .defaultEvent()
-      .visibleChangeEvent()
+    .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)
   }
 }

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

@@ -1,84 +1,69 @@
-import { bindInstanceToNode, eventHandler, convertNumber2VP, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, initComponentNodeInfo, TaroAny } from '@tarojs/runtime'
+import { eventHandler, convertNumber2VP, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, convertNumber2PX } from '@tarojs/runtime'
 
-import TaroComponentWrapper from './base'
-import { ICON_SVG_MAP } from './utils/constant/icon'
-import { getNormalAttributes, shouldBindEvent, getNodeThresholds, bindAnimation } from './utils/helper'
+import commonStyleModify from './style'
+import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroIconElement } from './element'
-import type { TaroStyleType } from '@tarojs/runtime'
+import type { TaroIconElement, TaroAny } 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)
-  .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)
+const ICON_COLOR_MAP: TaroAny = {
+  success: Color.Green,
+  success_no_circle: Color.Green,
+  info: Color.Blue,
+  warn: Color.Red,
+  waiting: Color.Blue,
+  cancel: Color.Red,
+  download: Color.Gray,
+  search: Color.Gray,
+  clear: Color.Gray,
+  info_circle: Color.Blue,
+  circle: Color.Gray
 }
 
-@Component
-export default struct TaroIcon {
-  nodeInfoMap: TaroAny = {}
-
-  @Styles visibleChangeEvent () {
-    .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-  }
-
-  @ObjectLink node: TaroIconElement
-
-  aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
-    // 绑定动画
-    bindAnimation(this.node)
+function getIconData (node: TaroIconElement): Resource | null {
+  switch (node._attrs.type) {
+    case 'success':
+      return $r('app.media.success')
+    case 'success_no_circle':
+      return $r('app.media.success_no_circle')
+    case 'info':
+      return $r('app.media.info')
+    case 'warn':
+      return $r('app.media.warn')
+    case 'waiting':
+      return $r('app.media.waiting')
+    case 'cancel':
+      return $r('app.media.cancel')
+    case 'download':
+      return $r('app.media.download')
+    case 'search':
+      return $r('app.media.search')
+    case 'clear':
+      return $r('app.media.clear')
+    case 'info_circle':
+      return $r('app.media.info_circle')
+    case 'circle':
+      return $r('app.media.circle')
+    default:
+      return null
   }
+}
 
-  @Styles defaultEvent () {
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-    .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, res => {
-      const eventResult: TaroAny = res.eventResult
-      this.nodeInfoMap[this.node._nid].areaInfo = eventResult[1]
+@Builder
+export default function TaroIcon (node: TaroIconElement) {
+  Image(getIconData(node))
+    .objectFit(ImageFit.Contain)
+    .fillColor(node._attrs.color || ICON_COLOR_MAP[node._attrs.type] || Color.Black)
+    .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))
+    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+      node._nodeInfo.areaInfo = res[1]
     }))
-  }
-
-  getIconData () {
-    if (!this.node || !this.node._attrs) return null
-    const type: string = this.node._attrs.type
-    // TODO：等待鸿蒙支持 base64 格式的 svg 图片，或者工程化支持图片资源的迁移
-    return ICON_SVG_MAP.get(type) || null
-  }
-
-  build() {
-    TaroComponentWrapper({ node: this.node }) {
-      Image(this.getIconData())
-        .defaultEvent()
-        .objectFit(ImageFit.Contain)
-        .fillColor(this.node._attrs.color)
-        .onComplete(e => eventHandler(e, 'complete', this.node))
-        .attrs(getNormalAttributes(this.node))
-        .visibleChangeEvent()
-    }
-  }
 }