@tarojs/plugin-platform-harmony-ets 4.0.0-beta.1 → 4.0.0-beta.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/components-harmony-ets/button.ets

@@ -34,7 +34,6 @@ function attrs (style: TaroStyleType) {
     minHeight: style.minHeight,
     maxHeight: style.maxHeight
   })
-  .backgroundColor(style.backgroundColor)
   .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
   .backgroundImageSize(style.backgroundSize)
   .backgroundImagePosition(style.backgroundPosition)
@@ -44,26 +43,7 @@ function attrs (style: TaroStyleType) {
     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 })
@@ -106,9 +86,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),
@@ -165,7 +160,7 @@ export default function TaroButton (node: TaroButtonElement) {
   })
   .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

@@ -154,8 +154,73 @@ export struct TaroCheckbox {
   }
 }
 
-@Extend(Flex)
-function checkboxGroupAttrs (style: TaroStyleType) {
+@Extend(Column)
+function checkboxGroupColumnAttrs (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(Row)
+function checkboxGroupRowAttrs (style: TaroStyleType) {
   .id(style.id)
   .key(style.id)
   .flexGrow(style.flexGrow)
@@ -250,12 +315,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)
+        }
+        .checkboxGroupRowAttrs(getNormalAttributes(this.node))
+        .defaultEvent()
+        .visibleChangeEvent()
+        .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
+        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+      } else {
+        Column() {
+          createLazyChildren(this.node)
+        }
+        .checkboxGroupColumnAttrs(getNormalAttributes(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

@@ -7,8 +7,73 @@ import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils
 
 import type { TaroAny, TaroFormElement, TaroStyleType } from '@tarojs/runtime'
 
-@Extend(Flex)
-function attrs (style: TaroStyleType) {
+@Extend(Row)
+function rowAttrs (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(Column)
+function columnAttrs (style: TaroStyleType) {
   .id(style.id)
   .key(style.id)
   .flexGrow(style.flexGrow)
@@ -74,14 +139,31 @@ function attrs (style: TaroStyleType) {
 
 @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)
+    }
+    .rowAttrs(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()))
+    .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)
+    }
+    .columnAttrs(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()))
+    .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/label.ets

@@ -7,8 +7,73 @@ import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils
 
 import type { TaroStyleType, TaroLabelElement, TaroElement, TaroAny, TaroRadioElement, TaroCheckboxElement } from '@tarojs/runtime'
 
-@Extend(Flex)
-function attrs (style: TaroStyleType) {
+@Extend(Column)
+function columnAttrs (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(Row)
+function rowAttrs (style: TaroStyleType) {
   .id(style.id)
   .key(style.id)
   .flexGrow(style.flexGrow)
@@ -100,20 +165,43 @@ function handleTargetChange (id: string) {
 
 @Builder
 export default function TaroLabel (node: TaroLabelElement) {
-  Flex(FlexManager.flexOptions(node)) {
-    createLazyChildren(node)
+  if (FlexManager.isFlexNode(node) && FlexManager.flexOptions(node).direction !== FlexDirection.Column) {
+    Row() {
+      createLazyChildren(node)
+    }
+    .rowAttrs(getNormalAttributes(node))
+    .onClick((e: ClickEvent) => {
+      const firstChild: TaroElement | null = node.childNodes[0] as TaroElement | null
+      const id: string = node._attrs.for || firstChild?._attrs.id || firstChild?._nid || ''
+  
+      handleTargetChange(id)
+      eventHandler(e, 'click', node)
+    })
+    .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)
+    }
+    .columnAttrs(getNormalAttributes(node))
+    .onClick((e: ClickEvent) => {
+      const firstChild: TaroElement | null = node.childNodes[0] as TaroElement | null
+      const id: string = node._attrs.for || firstChild?._attrs.id || firstChild?._nid || ''
+  
+      handleTargetChange(id)
+      eventHandler(e, 'click', node)
+    })
+    .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((e: ClickEvent) => {
-    const firstChild: TaroElement | null = node.childNodes[0] as TaroElement | null
-    const id: string = node._attrs.for || firstChild?._attrs.id || firstChild?._nid || ''
-
-    handleTargetChange(id)
-    eventHandler(e, 'click', node)
-  })
-  .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))
 }

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

@@ -427,11 +427,23 @@ export default struct TaroPicker {
 
   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)
+        }
+        .defaultEvent()
+        .visibleChangeEvent()
+        .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
+        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+      } else {
+        Column() {
+          createLazyChildren(this.node)
+        }
+        .defaultEvent()
+        .visibleChangeEvent()
+        .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
+        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
       }
-      .defaultEvent()
-      .visibleChangeEvent()
     }
   }
 }

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

@@ -156,8 +156,73 @@ export struct TaroRadio {
   }
 }
 
-@Extend(Flex)
-function radioGroupAttrs (style: TaroStyleType) {
+@Extend(Column)
+function radioGroupColumnAttrs (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(Row)
+function radioGroupRowAttrs (style: TaroStyleType) {
   .id(style.id)
   .key(style.id)
   .flexGrow(style.flexGrow)
@@ -253,12 +318,25 @@ export struct TaroRadioGroup {
 
   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)
+        }
+        .radioGroupRowAttrs(getNormalAttributes(this.node))
+        .defaultEvent()
+        .visibleChangeEvent()
+        .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
+        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+      } else {
+        Column() {
+          createLazyChildren(this.node)
+        }
+        .radioGroupColumnAttrs(getNormalAttributes(this.node))
+        .defaultEvent()
+        .visibleChangeEvent()
+        .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
+        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
       }
-      .radioGroupAttrs(getNormalAttributes(this.node))
-      .defaultEvent()
-      .visibleChangeEvent()
     }
   }
 }

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

@@ -168,7 +168,7 @@ function getScrollable (node: TaroScrollViewElement) {
 }
 
 function handleScrollEvent (node: TaroScrollViewElement, eventName = 'scroll', xOffset?: number, yOffset?: number) {
-  const currentOffset: ScrollViewCurrentOffset = node.scroller.currentOffset()
+  const currentOffset = node.scroller.currentOffset() as ScrollViewCurrentOffset
   const currentXOffset = currentOffset.xOffset
   const currentYOffset = currentOffset.yOffset
   const value: ScrollViewEvent = {

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

@@ -119,12 +119,12 @@ export default function TaroText (node: TaroTextElement) {
   } else {
     Text(node.textContent)
     .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
-    }))
     .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/utils/flexManager.ets

@@ -1,20 +1,57 @@
-import type { TaroAny, TaroElement } from '@tarojs/runtime'
+import type { TaroElement } from '@tarojs/runtime'
+
+interface IFlexOptions {
+  direction: FlexDirection,
+  justifyContent: FlexAlign,
+  alignItems: VerticalAlign | HorizontalAlign,
+  // Row 和 Column 不支持下面两个属性
+  // wrap: FlexWrap,
+  // alignContent: FlexAlignContent
+}
 
 class FlexManager {
-  static flexOptions (node: TaroElement): FlexOptions {
+  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.End:
+          return HorizontalAlign.End
+        default:
+          return HorizontalAlign.Center
+      }
+    } else {
+      switch (alignItems) {
+        case ItemAlign.Start:
+          return VerticalAlign.Top
+        case ItemAlign.End:
+          return VerticalAlign.Bottom
+        default:
+          return VerticalAlign.Center
+      }
+    }
+  }
+
+  static flexOptions (node: TaroElement): IFlexOptions {
     const hmStyle = node.hmStyle
+    const isFlex = FlexManager.isFlexNode(node)
+    const justifyContent: FlexAlign = isFlex ? (hmStyle.justifyContent || FlexAlign.Center) : FlexAlign.Start
 
     let flexDirection = hmStyle.flexDirection
     if (!flexDirection && flexDirection !== 0) {
       flexDirection = hmStyle.display === 'flex' ? FlexDirection.Row : FlexDirection.Column
     }
 
+    const alignItems = isFlex ? FlexManager.convertFlexAlignItemsToColumnOrRow(flexDirection, hmStyle.alignItems) : HorizontalAlign.Start
+
     return {
+      alignItems,
+      justifyContent,
       direction: flexDirection,
-      justifyContent: hmStyle.justifyContent,
-      alignItems: hmStyle.alignItems,
-      wrap: hmStyle.flexWrap,
-      alignContent: hmStyle.alignContent,
     }
   }
 }

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

@@ -20,7 +20,7 @@ export const parseStyles = (styles = ''): Record<string, string> => {
   return styleObj
 }
 
-export function shouldBindEvent (cb: Func, node: TaroElement, eventNames: string[], disabled = false) {
+export function shouldBindEvent (cb: Func, node: TaroElement | null, eventNames: string[], disabled = false) {
   if (!node || node._attrs?.disabled || disabled) return null
   if (!node.__listeners) {
     return null