@tarojs/plugin-platform-harmony-ets 4.0.0-beta.3 → 4.0.0-beta.31

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,39 @@ 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
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  build () {
+    if (this.node.hmStyle?.display !== 'none') {
+      Swiper(this.node.controller) {
+        this.createLazyChildren(this.node)
+      }
+        .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+        .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,29 +28,33 @@ 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
+  @State overwriteStyle: Record<string, TaroAny> = {}
 
   aboutToAppear () {
     if (this.node && !this.node._isInit) {
       this.node._isInit = true
+      this.node._instance = this
       this.node._reset = this.node.checked || false
     }
   }
 
   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).setAnimationStyle(this.overwriteStyle))
         .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,13 @@
+import { isString } from '@tarojs/shared'
 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, getNormalAttributes } 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 +18,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 +27,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 +40,59 @@ 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))
+function getTextInViewWidth (node: TaroElement | null): TaroAny {
+  if (node) {
+    const hmStyle = node.hmStyle || {}
+    const isFlexView = hmStyle.display === 'flex'
+    const width: TaroAny = getStyleAttr(node, 'width')
+    const isPercentWidth = isString(width) && width.includes('%')
+
+    return isFlexView || isPercentWidth ? null : getStyleAttr(node, 'width')
+  }
+}
+
+@Component
+export default struct TaroText {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroTextElement) => void = this.customBuilder
+  @ObjectLink node: TaroTextElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  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(getNormalAttributes(this.node.parentElement!, {
+              fontSize: getButtonFontSize(this.node.parentNode as TaroButtonElement),
+              color: getButtonColor(this.node.parentNode as TaroButtonElement, BUTTON_THEME_COLOR.get((this.node.parentNode as TaroButtonElement)._attrs.type || '').text)
+            }))
+            .textSpecialFontStyle(getFontAttributes(this.node.parentElement as TaroElement))
+        } else {
+          Text(this.node.textContent)
+            .textNormalFontStyle(getNormalAttributes(this.node.parentElement!))
+            .textSpecialFontStyle(getFontAttributes(this.node.parentElement as TaroElement))
+            .width(getTextInViewWidth(this.node.parentElement))
+        }
+      }
     } 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).setAnimationStyle(this.overwriteStyle))
+        .textNormalFontStyle(getNormalAttributes(this.node))
+        .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]
-    }))
   }
 }

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

@@ -1,72 +1,12 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { getNodeThresholds, getNormalAttributes, getFontAttributes, shouldBindEvent, parseStyles } from './utils/helper'
+import commonStyleModify from './style'
+import { getNodeThresholds, getFontAttributes, shouldBindEvent, parseStyles } from './utils/helper'
 
 import type { TaroAny, TaroStyleType, TaroTextStyleType, TaroTextAreaElement, TaroEvent } from '@tarojs/runtime'
 
 @Extend(TextArea)
 function textStyle (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)
   .fontColor(style.color)
   .fontSize(style.fontSize)
   .fontWeight(style.fontWeight)
@@ -90,7 +30,10 @@ function getPlaceholderColor (node: TaroTextAreaElement): string {
 export default struct TaroTextArea {
   @State value: string = ''
 
-  node: TaroTextAreaElement | null = null
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroTextAreaElement) => void = this.customBuilder
+  @ObjectLink node: TaroTextAreaElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
 
   aboutToAppear () {
     if (this.node) {
@@ -105,16 +48,17 @@ export default struct TaroTextArea {
   }
 
   build () {
-    if (this.node) {
+    if (this.node && this.node.hmStyle?.display !== 'none') {
       TextArea({ text: this.value, placeholder: this.node._attrs?.placeholder || '', controller: this.node.controller })
         .key(this.node._nid)
         .maxLength(Number(this.node._attrs?.maxlength) || null)
         .placeholderColor(getPlaceholderColor(this.node))
-        .textStyle(getNormalAttributes(this.node))
+        .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+        .textStyle(this.node?.hmStyle)
         .textAttr(getFontAttributes(this.node))
         .onChange((value: string) => {
           const event: TaroEvent = createTaroEvent('input', { detail: { value } }, this.node)
-          
+
           this.value = value
           this.node?.updateFormWidgetValue(value)
           eventHandler(event, 'input', this.node)
@@ -126,7 +70,7 @@ export default struct TaroTextArea {
         })
         .onFocus(() => {
           const event: TaroEvent = createTaroEvent('focus', { detail: { value: this.value, height: this.node?._height } }, this.node)
-    
+
           eventHandler(event, 'focus', this.node)
         })
         .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {

package/dist/components-harmony-ets/utils/AttributeManager.ets

@@ -60,7 +60,7 @@ class AttributeManager {
     const dataValue: string = AttributeManager.getNodeStyle(style, 'animation')
 
     if (dataValue) {
-      let values: string[] = dataValue.trim().split(new RegExp("/\s+/"))
+      let values: string[] = dataValue.toString().trim().split(new RegExp("/\s+/"))
       switch (values.length) {
         case 4:
           res = { duration: values[0], curve: values[1], delay: values[2] }

package/dist/components-harmony-ets/utils/DynamicCenter.ts

@@ -36,4 +36,4 @@ export class DynamicCenter {
       this.bindComponentToNodeWithDFS(node.childNodes[i] as TaroElement, component)
     }
   }
-}
+}

package/dist/components-harmony-ets/utils/flexManager.ets

@@ -1,4 +1,6 @@
 import type { TaroElement } from '@tarojs/runtime'
+import { isUndefined } from '@tarojs/shared'
+import { getNormalAttributes } from './styles.ets'
 
 interface IFlexOptions {
   direction: FlexDirection,
@@ -13,33 +15,33 @@ class FlexManager {
   static isFlexNode (node: TaroElement): boolean {
     return !!node.hmStyle?.display?.includes('flex')
   }
-  
+
   static convertFlexAlignItemsToColumnOrRow (direction: FlexDirection, alignItems: ItemAlign | undefined): 	VerticalAlign | HorizontalAlign {
     if (direction === FlexDirection.Column) {
       switch (alignItems) {
-        case ItemAlign.Start:
-          return HorizontalAlign.Start
+        case ItemAlign.Center:
+          return HorizontalAlign.Center
         case ItemAlign.End:
           return HorizontalAlign.End
         default:
-          return HorizontalAlign.Center
+          return HorizontalAlign.Start
       }
     } else {
       switch (alignItems) {
-        case ItemAlign.Start:
-          return VerticalAlign.Top
+        case ItemAlign.Center:
+          return VerticalAlign.Center
         case ItemAlign.End:
           return VerticalAlign.Bottom
         default:
-          return VerticalAlign.Center
+          return VerticalAlign.Top
       }
     }
   }
 
   static flexOptions (node: TaroElement): IFlexOptions {
-    const hmStyle = node.hmStyle
+    const hmStyle = getNormalAttributes(node) || {}
     const isFlex = FlexManager.isFlexNode(node)
-    const justifyContent: FlexAlign = isFlex ? (hmStyle.justifyContent || FlexAlign.Center) : FlexAlign.Start
+    const justifyContent: FlexAlign = isFlex ? (isUndefined(hmStyle.justifyContent) ? FlexAlign.Start : hmStyle.justifyContent) : FlexAlign.Start
 
     let flexDirection = hmStyle.flexDirection
     if (!flexDirection && flexDirection !== 0) {

package/dist/components-harmony-ets/utils/helper.ets

@@ -1,4 +1,4 @@
-import { getNormalAttributes, getFontAttributes } from './styles'
+import { getNormalAttributes, getFontAttributes, getStyleAttr } from './styles'
 
 import type { TFunc } from '@tarojs/runtime/dist/runtime.esm'
 import type { TaroElement } from '@tarojs/runtime'
@@ -31,9 +31,8 @@ export function shouldBindEvent (cb: TFunc, node: TaroElement | null, eventNames
 }
 
 export function getNodeThresholds (node: TaroElement): number[] | null {
-  if (!node) return null
-
-  return node?._nodeInfo.thresholds || null
+  return node?._nodeInfo?.thresholds || null
 }
 
-export { getNormalAttributes, getFontAttributes }
+
+export { getNormalAttributes, getFontAttributes, getStyleAttr }

package/dist/components-harmony-ets/utils/htmlParser/HarmonyHTMLParser.ts

@@ -99,5 +99,4 @@ function parseTag(htmlString, startIndex) {
   return tag
 }
 
-
-export default parseHTML
+export default parseHTML

package/dist/components-harmony-ets/utils/htmlParser/index.ts

@@ -15,7 +15,7 @@ function buildDomTree(dom: TTreeNode) {
     case 'span': tagName = 'text'; break
   }
   if (!tagName) return null
-  
+
   const ele = document.createElement(tagName)
   attributes && Object.keys(attributes).forEach(key => {
     if (key === 'style') {