@tarojs/plugin-platform-harmony-ets 4.0.0-beta.2 → 4.0.0-beta.21

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

@@ -0,0 +1,244 @@
+import type { HarmonyStyle, TaroElement, TaroStyleType } from '@tarojs/runtime'
+import { isUndefined } from '../shared'
+import { computeBackgroundPosition } from './utils'
+import { getNormalAttributes } from './utils/helper'
+import { isMaxWidthView } from './utils/styles'
+
+class CommonStyleModify implements AttributeModifier<CommonAttribute> {
+  node: TaroElement | null = null
+  style: TaroStyleType | null = null
+  initStyle?: TaroStyleType
+
+  setNode (node: TaroElement, initStyle?: TaroStyleType) {
+    this.node = node
+    this.style = getNormalAttributes(this.node)
+    this.initStyle = initStyle
+    // 覆盖初始化样式
+    if (initStyle) {
+      Object.keys(initStyle).forEach(key => {
+        if (this.style && !this.style[key]) {
+          this.style[key] = initStyle[key]
+        }
+      })
+    }
+    return this
+  }
+
+  applyNormalAttribute(instance: CommonAttribute): void {
+    if (this.node && this.style) {
+      setNormalAttributeIntoInstance(instance, this.style, this.node)
+    }
+  }
+}
+
+class PseudoStyleModify implements AttributeModifier<CommonAttribute> {
+  style: TaroStyleType | null = null
+
+  setStyle (style: HarmonyStyle) {
+    this.style = style
+    return this
+  }
+
+  applyNormalAttribute(instance: CommonAttribute): void {
+    if (this.style) {
+      setNormalAttributeIntoInstance(instance, this.style)
+    }
+  }
+}
+
+
+class RowStyleModify extends CommonStyleModify {
+
+  applyNormalAttribute(instance: CommonAttribute): void {
+    if (this.style) {
+      setNormalAttributeIntoInstance(instance, this.style, this.node)
+      instance.constraintSize({
+        minWidth: this.style.minWidth || this.style.width,
+        maxWidth: this.style.maxWidth,
+        minHeight: this.style.minHeight,
+        maxHeight: this.style.maxHeight
+      })
+    }
+  }
+}
+
+class ColumnStyleModify extends CommonStyleModify {
+  applyNormalAttribute(instance: CommonAttribute): void {
+    if (this.style) {
+      setNormalAttributeIntoInstance(instance, this.style, this.node)
+      instance.constraintSize({
+        minWidth: this.style.minWidth,
+        maxWidth: this.style.maxWidth,
+        minHeight: this.style.minHeight || this.style.height,
+        maxHeight: this.style.maxHeight
+      })
+    }
+  }
+}
+
+
+function setNormalAttributeIntoInstance(instance: CommonAttribute, style: TaroStyleType, node?: TaroElement | null) {
+  if (!isUndefined(style.id)) {
+    instance.id(style.id)
+    instance.key(style.id)
+  }
+  if (!isUndefined(style.flexGrow)) {
+    instance.flexGrow(style.flexGrow)
+  }
+  if (!isUndefined(style.flexShrink)) {
+    instance.flexShrink(style.flexShrink)
+  }
+  if (!isUndefined(style.flexBasis)) {
+    instance.flexBasis(style.flexBasis)
+  }
+  if (!isUndefined(style.alignSelf)) {
+    instance.alignSelf(style.alignSelf)
+  }
+  if (!isUndefined(style.paddingTop) || !isUndefined(style.paddingRight) || !isUndefined(style.paddingBottom) || !isUndefined(style.paddingLeft)) {
+    instance.padding({
+      top: style.paddingTop,
+      right: style.paddingRight,
+      bottom: style.paddingBottom,
+      left: style.paddingLeft
+    })
+  }
+  if (!isUndefined(style.marginTop) || !isUndefined(style.marginRight) || !isUndefined(style.marginBottom) || !isUndefined(style.marginLeft)) {
+    instance.margin({
+      top: style.marginTop,
+      right: style.marginRight,
+      bottom: style.marginBottom,
+      left: style.marginLeft
+    })
+  }
+  if (node) {
+    instance.width(isMaxWidthView(node as TaroElement) && isUndefined(style.width) ? '100%' : style.width)
+  } else {
+    instance.width(style.width)
+  }
+  if (!isUndefined(style.height)) {
+    instance.height(style.height)
+  }
+  if (!isUndefined(style.minWidth) || !isUndefined(style.maxWidth) || !isUndefined(style.minHeight) || !isUndefined(style.maxHeight)) {
+    instance.constraintSize({
+      minWidth: style.minWidth,
+      maxWidth: style.maxWidth,
+      minHeight: style.minHeight,
+      maxHeight: style.maxHeight
+    })
+  }
+  if (!isUndefined(style.backgroundColor)) {
+    instance.backgroundColor(style.backgroundColor)
+  }
+  if (!isUndefined(style.backgroundImage)) {
+    if (style.backgroundImage.colors) {
+      instance.linearGradient(style.backgroundImage)
+    } else {
+      instance.backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
+    }
+  }
+  if (!isUndefined(style.backgroundSize)) {
+    instance.backgroundImageSize(style.backgroundSize)
+  }
+  if (!isUndefined(style.backgroundPosition)) {
+    if (typeof style.backgroundPosition !== 'number') {
+      let pos = computeBackgroundPosition(style)
+      instance.backgroundImagePosition({
+        x: pos.offsetX,
+        y: pos.offsetY,
+      })
+    } else {
+      instance.backgroundImagePosition(style.backgroundPosition)
+    }
+  }
+  if (!isUndefined(style.borderTopStyle) || !isUndefined(style.borderRightStyle) || !isUndefined(style.borderBottomStyle) || !isUndefined(style.borderLeftStyle)) {
+    instance.borderStyle({
+      top: style.borderTopStyle,
+      right: style.borderRightStyle,
+      bottom: style.borderBottomStyle,
+      left: style.borderLeftStyle
+    })
+  }
+  if (!isUndefined(style.borderTopWidth) || !isUndefined(style.borderRightWidth) || !isUndefined(style.borderBottomWidth) || !isUndefined(style.borderLeftWidth)) {
+    instance.borderWidth({
+      top: style.borderTopWidth,
+      right: style.borderRightWidth,
+      bottom: style.borderBottomWidth,
+      left: style.borderLeftWidth
+    })
+  }
+  if (!isUndefined(style.borderTopColor) || !isUndefined(style.borderRightColor) || !isUndefined(style.borderBottomColor) || !isUndefined(style.borderLeftColor)) {
+    instance.borderColor({
+      top: style.borderTopColor,
+      right: style.borderRightColor,
+      bottom: style.borderBottomColor,
+      left: style.borderLeftColor
+    })
+  }
+  if (!isUndefined(style.borderTopLeftRadius) || !isUndefined(style.borderTopRightRadius) || !isUndefined(style.borderBottomLeftRadius) || !isUndefined(style.borderBottomRightRadius)) {
+    instance.borderRadius({
+      topLeft: style.borderTopLeftRadius,
+      topRight: style.borderTopRightRadius,
+      bottomLeft: style.borderBottomLeftRadius,
+      bottomRight: style.borderBottomRightRadius
+    })
+  }
+  if (!isUndefined(style.zIndex)) {
+    instance.zIndex(style.zIndex)
+  }
+  if (!isUndefined(style.opacity)) {
+    instance.opacity(style.opacity)
+  }
+  if (!isUndefined(style.overflow)) {
+    instance.clip(style.overflow === 'hidden')
+  }
+  // if (!isUndefined(style.transformOrigin)) {
+  //   instance.rotate({ centerX: style.transformOrigin.x, centerY: style.transformOrigin.y, angle: 0 })
+  //   instance.scale({ centerX: style.transformOrigin.x, centerY: style.transformOrigin.y })
+  // }
+  if (!isUndefined(style.transform)) {
+    if (style.transform.Translate) {
+      instance.translate({
+        x: style.transform.Translate.x || 0,
+        y: style.transform.Translate.y || 0,
+        z: style.transform.Translate.z || 0,
+      })
+    }
+    if (style.transform.Scale) {
+      instance.scale({
+        x: style.transform.Scale.x || 0,
+        y: style.transform.Scale.y || 0,
+        z: style.transform.Scale.z || 0,
+        centerX: style.transformOrigin?.x || 0,
+        centerY: style.transformOrigin?.y || 0,
+      })
+    }
+    if (style.transform.Rotate) {
+      instance.rotate({
+        x: style.transform.Rotate.x || 0,
+        y: style.transform.Rotate.y || 0,
+        z: style.transform.Rotate.z || 0,
+        centerX: style.transformOrigin?.x || 0,
+        centerY: style.transformOrigin?.y || 0,
+        angle: 0
+      })
+    }
+  }
+  if (style.position === 'absolute' || style.position === 'fixed') {
+    instance.position({
+      x: style.left || 0,
+      y: style.top || 0,
+    })
+  }
+  if (style.position === 'relative') {
+    instance.offset({
+      x: style.left || 0,
+      y: style.top || 0,
+    })
+  }
+}
+
+export const pseudoModify = new PseudoStyleModify()
+export const rowModify = new RowStyleModify()
+export const columnModify = new ColumnStyleModify()
+
+export default new CommonStyleModify()

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

@@ -1,9 +1,9 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { createLazyChildren } from './render'
-import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
+import commonStyleModify from './style'
+import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroStyleType, TaroSwiperElement, TaroEvent, TaroAny } from '@tarojs/runtime'
+import type { TaroSwiperElement, TaroEvent, TaroAny } from '@tarojs/runtime'
 
 interface SwiperAttrs {
   index?: number
@@ -15,71 +15,6 @@ interface SwiperAttrs {
   indicator?: boolean
 }
 
-@Extend(Swiper)
-function swiperStyle (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .padding({
-    top: style.paddingTop,
-    right: style.paddingRight,
-    bottom: style.paddingBottom,
-    left: style.paddingLeft
-  })
-  .margin({
-    top: style.marginTop,
-    right: style.marginRight,
-    bottom: style.marginBottom,
-    left: style.marginLeft
-  })
-  .width(style.width)
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundSize)
-  .backgroundImagePosition(style.backgroundPosition)
-  .borderStyle({
-    top: style.borderTopStyle,
-    right: style.borderRightStyle,
-    bottom: style.borderBottomStyle,
-    left: style.borderLeftStyle
-  })
-  .borderWidth({
-    top: style.borderTopWidth,
-    right: style.borderRightWidth,
-    bottom: style.borderBottomWidth,
-    left: style.borderLeftWidth
-  })
-  .borderColor({
-    top: style.borderTopColor,
-    right: style.borderRightColor,
-    bottom: style.borderBottomColor,
-    left: style.borderLeftColor
-  })
-  .borderRadius({
-    topLeft: style.borderTopLeftRadius,
-    topRight: style.borderTopRightRadius,
-    bottomLeft: style.borderBottomLeftRadius,
-    bottomRight: style.borderBottomRightRadius
-  })
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .linearGradient(style.linearGradient)
-  .clip(style.overflow)
-  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
-  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
-  .transform(style.transform)
-}
-
 @Extend(Swiper)
 function swiperAttr (attr: SwiperAttrs) {
   .index(attr.index)
@@ -104,24 +39,32 @@ function getSwiperAttributes (node: TaroSwiperElement): SwiperAttrs {
   return swiperAttrs
 }
 
-@Builder
-export default function TaroSwiper (node: TaroSwiperElement) {
-  Swiper(node.controller) {
-    createLazyChildren(node)
+@Component
+export default struct TaroSwiper {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroSwiperElement) => void = this.customBuilder
+  @ObjectLink node: TaroSwiperElement
+
+  build () {
+    if (this.node.hmStyle?.display !== 'none') {
+      Swiper(this.node.controller) {
+        this.createLazyChildren(this.node)
+      }
+        .attributeModifier(commonStyleModify.setNode(this.node))
+        .swiperAttr(getSwiperAttributes(this.node))
+        .indicatorStyle({
+          color: this.node.getAttribute('indicatorColor'),
+          selectedColor:  this.node.getAttribute('indicatorActiveColor')
+        })
+        .onChange((index: number) => {
+          const event: TaroEvent = createTaroEvent('change', { detail: { current: index } }, 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) => {
+          this.node._nodeInfo.areaInfo = res[1]
+        }))
+        .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+    }
   }
-  .swiperStyle(getNormalAttributes(node))
-  .swiperAttr(getSwiperAttributes(node))
-  .indicatorStyle({
-    color: node.getAttribute('indicatorColor'),
-    selectedColor:  node.getAttribute('indicatorActiveColor')
-  })
-  .onChange((index: number) => {
-    const event: TaroEvent = createTaroEvent('change', { detail: { current: index } }, node)
-    eventHandler(event, 'change', node)
-  })
-  .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))
 }

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

@@ -1,78 +1,14 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { getNodeThresholds, shouldBindEvent, getNormalAttributes } from './utils/helper'
+import commonStyleModify from './style'
+import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroAny, TaroStyleType, TaroSwitchElement, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroSwitchElement, TaroEvent } from '@tarojs/runtime'
 
 interface SwitchAttrs {
   selectedColor?: ResourceColor
 }
 
-@Extend(Toggle)
-function styles (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .padding({
-    top: style.paddingTop,
-    right: style.paddingRight,
-    bottom: style.paddingBottom,
-    left: style.paddingLeft
-  })
-  .margin({
-    top: style.marginTop,
-    right: style.marginRight,
-    bottom: style.marginBottom,
-    left: style.marginLeft
-  })
-  .width(style.width)
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundSize)
-  .backgroundImagePosition(style.backgroundPosition)
-  .borderStyle({
-    top: style.borderTopStyle,
-    right: style.borderRightStyle,
-    bottom: style.borderBottomStyle,
-    left: style.borderLeftStyle
-  })
-  .borderWidth({
-    top: style.borderTopWidth,
-    right: style.borderRightWidth,
-    bottom: style.borderBottomWidth,
-    left: style.borderLeftWidth
-  })
-  .borderColor({
-    top: style.borderTopColor,
-    right: style.borderRightColor,
-    bottom: style.borderBottomColor,
-    left: style.borderLeftColor
-  })
-  .borderRadius({
-    topLeft: style.borderTopLeftRadius,
-    topRight: style.borderTopRightRadius,
-    bottomLeft: style.borderBottomLeftRadius,
-    bottomRight: style.borderBottomRightRadius
-  })
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .linearGradient(style.linearGradient)
-  .clip(style.overflow)
-  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
-  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
-  .transform(style.transform)
-}
-
 @Extend(Toggle)
 function attrs(attr: SwitchAttrs) {
   .selectedColor(attr.selectedColor)
@@ -92,7 +28,9 @@ function themeStyles(isDisabled: boolean) {
 
 @Component
 export default struct TaroSwitch {
-  node: TaroSwitchElement | null = null
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroSwitchElement) => void = this.customBuilder
+  @ObjectLink node: TaroSwitchElement
 
   aboutToAppear () {
     if (this.node && !this.node._isInit) {
@@ -102,19 +40,19 @@ export default struct TaroSwitch {
   }
 
   build () {
-    if (this.node) {
+    if (this.node && this.node.hmStyle?.display !== 'none') {
       Toggle({
         type: this.node._attrs.type !== 'checkbox' ? ToggleType.Switch : ToggleType.Checkbox,
         isOn: this.node.checked,
       })
-        .styles(getNormalAttributes(this.node))
+        .attributeModifier(commonStyleModify.setNode(this.node))
         .attrs(getAttributes(this.node))
         .themeStyles(!!this.node._attrs.disabled)
         .onChange((isOn: boolean) => {
           if (this.node) {
             if (!this.node?._attrs.disabled) {
               const event: TaroEvent = createTaroEvent('change', { detail: { value: isOn } }, this.node)
-      
+
               this.node.updateCheckedValue(isOn)
               eventHandler(event, 'change', this.node)
             } else {

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

@@ -1,76 +1,12 @@
 import { eventHandler, convertNumber2VP, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, NodeType } from '@tarojs/runtime'
 
+import commonStyleModify from './style'
 import { getButtonColor } from './button'
 import { BUTTON_THEME_COLOR } from './utils/constant/style'
-import { getNodeThresholds, getNormalAttributes, getFontAttributes, shouldBindEvent } from './utils/helper'
+import { getNodeThresholds, getStyleAttr, getFontAttributes, shouldBindEvent } from './utils/helper'
 
 import type { TaroButtonElement, TaroElement, TaroTextElement, TaroAny, TaroTextStyleType, TaroStyleType } from '@tarojs/runtime'
 
-@Extend(Text)
-function textNormalStyle (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .padding({
-    top: style.paddingTop,
-    right: style.paddingRight,
-    bottom: style.paddingBottom,
-    left: style.paddingLeft
-  })
-  .margin({
-    top: style.marginTop,
-    right: style.marginRight,
-    bottom: style.marginBottom,
-    left: style.marginLeft
-  })
-  .width(style.width)
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundSize)
-  .backgroundImagePosition(style.backgroundPosition)
-  .borderStyle({
-    top: style.borderTopStyle,
-    right: style.borderRightStyle,
-    bottom: style.borderBottomStyle,
-    left: style.borderLeftStyle
-  })
-  .borderWidth({
-    top: style.borderTopWidth,
-    right: style.borderRightWidth,
-    bottom: style.borderBottomWidth,
-    left: style.borderLeftWidth
-  })
-  .borderColor({
-    top: style.borderTopColor,
-    right: style.borderRightColor,
-    bottom: style.borderBottomColor,
-    left: style.borderLeftColor
-  })
-  .borderRadius({
-    topLeft: style.borderTopLeftRadius,
-    topRight: style.borderTopRightRadius,
-    bottomLeft: style.borderBottomLeftRadius,
-    bottomRight: style.borderBottomRightRadius
-  })
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .linearGradient(style.linearGradient)
-  .clip(style.overflow)
-  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
-  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
-  .transform(style.transform)
-}
-
 @Extend(Text)
 function textNormalFontStyle (style: TaroStyleType) {
   .id(style.id)
@@ -81,7 +17,6 @@ function textNormalFontStyle (style: TaroStyleType) {
   .fontWeight(style.fontWeight)
   .fontStyle(style.fontStyle)
   .fontFamily(style.fontFamily)
-  .lineHeight(style.lineHeight)
   .decoration({
     type: style.textDecoration,
     color: style.color
@@ -91,9 +26,11 @@ function textNormalFontStyle (style: TaroStyleType) {
 @Extend(Text)
 function textSpecialFontStyle(attr: TaroTextStyleType) {
   .textAlign(attr.textAlign)
+  .align(attr.verticalAlign)
   .textOverflow(attr.textOverflow)
   .maxLines(attr.WebkitLineClamp)
   .letterSpacing(attr.letterSpacing)
+  .lineHeight(attr.lineHeight)
 }
 
 function getButtonFontSize (node: TaroButtonElement) {
@@ -102,29 +39,41 @@ function getButtonFontSize (node: TaroButtonElement) {
   return isMini ? convertNumber2VP(26) : convertNumber2VP(36)
 }
 
-@Builder
-export default function TaroText (node: TaroTextElement) {
-  if (node.nodeType === NodeType.TEXT_NODE && node.parentNode) {
-    if ((node.parentNode as TaroElement).tagName === 'BUTTON') {
-      Text(node.textContent)
-        .textNormalFontStyle(getNormalAttributes(node.parentNode as TaroElement))
-        .textSpecialFontStyle(getFontAttributes(node.parentNode as TaroElement))
-        .fontSize((node.parentNode as TaroButtonElement).hmStyle.fontSize || getButtonFontSize((node.parentNode as TaroButtonElement)))
-        .fontColor((node.parentNode as TaroButtonElement).hmStyle.color || getButtonColor(node.parentNode as TaroButtonElement, BUTTON_THEME_COLOR.get((node.parentNode as TaroButtonElement)._attrs.type).text))
+@Component
+export default struct TaroText {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroTextElement) => void = this.customBuilder
+  @ObjectLink node: TaroTextElement
+
+  build () {
+    if (this.node.nodeType === NodeType.TEXT_NODE) {
+      if (this.node.parentNode) {
+        if ((this.node.parentNode as TaroElement).tagName === 'BUTTON') {
+          Text(this.node.textContent)
+            .textNormalFontStyle(this.node.parentElement?.hmStyle || {})
+            .textSpecialFontStyle(getFontAttributes(this.node.parentElement as TaroElement))
+            .fontSize((this.node.parentNode as TaroButtonElement).hmStyle.fontSize || getButtonFontSize(this.node.parentNode as TaroButtonElement))
+            .fontColor((this.node.parentNode as TaroButtonElement).hmStyle.color || getButtonColor(this.node.parentNode as TaroButtonElement, BUTTON_THEME_COLOR.get((this.node.parentNode as TaroButtonElement)._attrs.type).text))
+        } else {
+          Text(this.node.textContent)
+            .textNormalFontStyle(this.node.parentElement?.hmStyle || {})
+            .textSpecialFontStyle(getFontAttributes(this.node.parentElement as TaroElement))
+            .width(getStyleAttr(this.node.parentElement, 'width'))
+            .height(getStyleAttr(this.node.parentElement, 'height'))
+        }
+      }
     } else {
-      Text(node.textContent)
-        .textNormalFontStyle(getNormalAttributes(node.parentNode as TaroElement))
-        .textSpecialFontStyle(getFontAttributes(node.parentNode as TaroElement))
+      if (this.node.hmStyle?.display !== 'none') {
+        Text(this.node.textContent)
+        .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+        .attributeModifier(commonStyleModify.setNode(this.node))
+        .textNormalFontStyle(this.node?.hmStyle)
+        .textSpecialFontStyle(getFontAttributes(this.node))
+        .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+        .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+          this.node._nodeInfo.areaInfo = res[1]
+        }))
+      }
     }
-  } else {
-    Text(node.textContent)
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .textNormalStyle(getNormalAttributes(node))
-    .textNormalFontStyle(getNormalAttributes(node))
-    .textSpecialFontStyle(getFontAttributes(node))
-    .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]
-    }))
   }
 }