@tarojs/plugin-platform-harmony-ets 4.0.0-alpha.22 → 4.0.0-alpha.24

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

@@ -17,7 +17,7 @@ interface RadioAttrs {
 @Extend(Radio)
 function radioAttr (attr: RadioAttrs) {
   .radioStyle(attr.radioStyle)
-  .themeStyles(attr.themeStyles)
+  .themeStyles(attr.themeStyles || false)
   .enabled(!attr.disabled)
 }
 
@@ -39,7 +39,7 @@ function themeStyles(isDisabled: boolean) {
 @Component
 export struct TaroRadio {
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node: TaroRadioElement) => void = this.customBuilder
+  @BuilderParam createLazyChildren: (node: TaroRadioElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroRadioElement
   @State overwriteStyle: Record<string, TaroAny> = {}
 
@@ -55,7 +55,7 @@ export struct TaroRadio {
     Stack() {
       Row() {
         Radio({
-          group: this.node.group || this.node.parentNode?._nid || '',
+          group: this.node.group || this.node.parentNode?._nid.toString() || '',
           value: this.node.value || '',
         })
           .checked(this.node.checked)
@@ -75,7 +75,7 @@ export struct TaroRadio {
               }
             }
           })
-          .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+          .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]
@@ -101,7 +101,7 @@ export struct TaroRadio {
 @Component
 export struct TaroRadioGroup {
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node: TaroRadioGroupElement) => void = this.customBuilder
+  @BuilderParam createLazyChildren: (node: TaroRadioGroupElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroRadioGroupElement
   @State overwriteStyle: Record<string, TaroAny> = {}
 
@@ -114,7 +114,7 @@ export struct TaroRadioGroup {
       this.node._instance = this
       const childList = this.node.getElementsByTagName<TaroRadioElement>('RADIO')
       childList.forEach(element => {
-        element.group = this.node?._attrs.name || this.node?._nid
+        element.group = this.node?._attrs.name || this.node?._nid.toString()
       })
       // 阻止事件冒泡传递上去
       this.node.addEventListener('change', (e: TaroEvent) => e.stopPropagation())
@@ -122,8 +122,8 @@ export struct TaroRadioGroup {
   }
 
   @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()))
+    .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: TaroAny) => {
       if (this.node) {
         this.node._nodeInfo.areaInfo = res[1]
@@ -134,21 +134,21 @@ export struct TaroRadioGroup {
   build() {
     if (FlexManager.useFlexLayout(this.node)) {
       Flex(FlexManager.flexOptions(this.node)) {
-        this.createLazyChildren(this.node)
+        this.createLazyChildren(this.node, 0)
       }
       .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .defaultEvent()
       .visibleChangeEvent()
     } else if (FlexManager.isFlexNode(this.node) && FlexManager.direction(this.node) !== FlexDirection.Column) {
       Row() {
-        this.createLazyChildren(this.node)
+        this.createLazyChildren(this.node, 0)
       }
       .attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .defaultEvent()
       .visibleChangeEvent()
     } else {
       Column() {
-        this.createLazyChildren(this.node)
+        this.createLazyChildren(this.node, 0)
       }
       .attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .defaultEvent()

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

@@ -9,13 +9,13 @@ import type { TaroAny, TaroRichTextElement } from '@tarojs/runtime'
 @Component
 export default struct TaroRichText {
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node: TaroRichTextElement) => void = this.customBuilder
+  @BuilderParam createLazyChildren: (node: TaroRichTextElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroRichTextElement
 
   build () {
     RichText(generateText(this.node))
       .attributeModifier(commonStyleModify.setNode(this.node))
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .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]
       }))

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

@@ -52,7 +52,7 @@ function handleScrollEvent (node: TaroScrollViewElement, eventName = 'scroll', s
 @Component
 export default struct TaroScrollList {
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node: TaroScrollViewElement) => void = this.customBuilder
+  @BuilderParam createLazyChildren: (node: TaroScrollViewElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroScrollViewElement
   @State overwriteStyle: Record<string, TaroAny> = {}
 
@@ -70,7 +70,7 @@ export default struct TaroScrollList {
     List({
       scroller: this.node.scroller
     }) {
-      this.createLazyChildren(this.node)
+      this.createLazyChildren(this.node, 0)
     }
     .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
     .sticky(StickyStyle.Header)
@@ -78,8 +78,17 @@ export default struct TaroScrollList {
     .align(Alignment.TopStart)
     .clip(true)
     .scrollBar(getAttributes(this.node).scrollBar)
-    .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()))
+    .onScrollIndex((first: number, last: number) => {
+      const scrollindexfns = (this.node?.__listeners?.['scrollindex'] || []) as Function[]
+      scrollindexfns.forEach(fn => {
+        fn({
+          first,
+          last
+        })
+      })
+    })
+    .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: TaroAny) => {
       this.node._nodeInfo.areaInfo = res[1]
     }))

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

@@ -60,7 +60,7 @@ function handleScrollEvent (node: TaroScrollViewElement, eventName = 'scroll', x
 @Component
 export default struct TaroScrollView {
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node: TaroScrollViewElement) => void = this.customBuilder
+  @BuilderParam createLazyChildren: (node: TaroScrollViewElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroScrollViewElement
   @State overwriteStyle: Record<string, TaroAny> = {}
 
@@ -81,7 +81,7 @@ export default struct TaroScrollView {
           if (this.node._pseudo_before || this.node._pseudo_after) {
             PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
           } else {
-            this.createLazyChildren(this.node)
+            this.createLazyChildren(this.node, 0)
           }
         }
         .alignItems(FlexManager.alignItems<VerticalAlign>(this.node))
@@ -97,7 +97,7 @@ export default struct TaroScrollView {
           if (this.node._pseudo_before || this.node._pseudo_after) {
             PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
           } else {
-            this.createLazyChildren(this.node)
+            this.createLazyChildren(this.node, 0)
           }
         }
         .alignItems(FlexManager.alignItems<HorizontalAlign>(this.node))
@@ -117,8 +117,8 @@ export default struct TaroScrollView {
     .clip(true)
     .scrollable(getScrollable(this.node))
     .scrollBar(getAttributes(this.node).scrollBar)
-    .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()))
+    .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: TaroAny) => {
       this.node._nodeInfo.areaInfo = res[1]
     }))

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

@@ -41,7 +41,7 @@ function themeStyles(isDisabled: boolean) {
 @Component
 export default struct TaroSlider {
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node: TaroSliderElement) => void = this.customBuilder
+  @BuilderParam createLazyChildren: (node: TaroSliderElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroSliderElement
 
   @State value: number = 0
@@ -90,7 +90,7 @@ export default struct TaroSlider {
           }
         }
       })
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .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]

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

@@ -5,7 +5,7 @@ import type { TaroViewElement, TaroElement, TaroAny } from '@tarojs/runtime'
 @Component
 export default struct TaroStickySection {
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node: TaroViewElement) => void = this.customBuilder
+  @BuilderParam createLazyChildren: (node: TaroViewElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroViewElement
   @State overwriteStyle: Record<string, TaroAny> = {}
 
@@ -20,7 +20,7 @@ export default struct TaroStickySection {
     Stack() {
       LazyForEach(header, (item: TaroElement) => {
         if (item.tagName === 'STICKY-HEADER') {
-          this.createLazyChildren(item as TaroViewElement)
+          this.createLazyChildren(item as TaroViewElement, 0)
         }
       }, (item: TaroElement) => `${item._nid}-${item._nodeInfo?.layer || 0}`)
     }
@@ -32,7 +32,7 @@ export default struct TaroStickySection {
     }) {
       ForEach(this.node.children, (item: TaroElement) => {
         if (item.tagName === 'LIST-VIEW') {
-          this.createLazyChildren(item as TaroViewElement)
+          this.createLazyChildren(item as TaroViewElement, 0)
         }
       }, (item: TaroElement) => `${item._nid}-${item._nodeInfo?.layer || 0}`)
 

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

@@ -48,7 +48,7 @@ function getSwiperAttributes (node: TaroSwiperElement): SwiperAttrs {
 @Component
 export default struct TaroSwiper {
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node: TaroSwiperElement) => void = this.customBuilder
+  @BuilderParam createLazyChildren: (node: TaroSwiperElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroSwiperElement
   @State overwriteStyle: Record<string, TaroAny> = {}
 
@@ -60,7 +60,7 @@ export default struct TaroSwiper {
 
   build () {
     Swiper(this.node.controller) {
-      this.createLazyChildren(this.node)
+      this.createLazyChildren(this.node, 0)
     }
       .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .swiperAttr(getSwiperAttributes(this.node))
@@ -72,7 +72,7 @@ export default struct TaroSwiper {
         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']))
+      .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]
       }))

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

@@ -31,7 +31,7 @@ function themeStyles(isDisabled: boolean) {
 @Component
 export default struct TaroSwitch {
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node: TaroSwitchElement) => void = this.customBuilder
+  @BuilderParam createLazyChildren: (node: TaroSwitchElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroSwitchElement
   @State overwriteStyle: Record<string, TaroAny> = {}
 
@@ -63,7 +63,7 @@ export default struct TaroSwitch {
           }
         }
       })
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .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]

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

@@ -1,7 +1,7 @@
 import { isString } from '@tarojs/shared'
 import { eventHandler, convertNumber2VP, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, NodeType } from '@tarojs/runtime'
 
-import { textModify, setNormalTextAttributeIntoInstance } from './style'
+import commonStyleModify, { textModify, setNormalTextAttributeIntoInstance } from './style'
 import { getButtonColor } from './button'
 import { getImageMode } from './image'
 import { BUTTON_THEME_COLOR } from './utils/constant/style'
@@ -30,7 +30,7 @@ function getTextInViewWidth (node: TaroElement | null): TaroAny {
 @Component
 export default struct TaroText {
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node: TaroTextElement) => void = this.customBuilder
+  @BuilderParam createLazyChildren: (node: TaroTextElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroTextElement
   @State overwriteStyle: Record<string, TaroAny> = {}
 
@@ -60,11 +60,33 @@ export default struct TaroText {
         // text 下还有标签
         if (this.node.childNodes.length > 1 || ((this.node.childNodes[0] && this.node.childNodes[0] as TaroElement)?.nodeType === NodeType.ELEMENT_NODE)) {
           ForEach(this.node.childNodes, (item: TaroElement) => {
-            createTextChildNode(item)
+            if (item.tagName === 'IMAGE') {
+              ImageSpan(item.getAttribute('src'))
+                .attributeModifier(commonStyleModify.setNode(item))
+                .objectFit(getImageMode(item.getAttribute('mode')))
+                .verticalAlign(getImageSpanAlignment(this.node?.hmStyle?.verticalAlign))
+                .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', item) }, item, ['click']))
+            } else if (item.nodeType === NodeType.TEXT_NODE) {
+              Span(item.textContent)
+            } else if (item.tagName === 'TEXT') {
+              Span(item.textContent)
+                .attributeModifier(spanModify.setNode(item))
+                .letterSpacing(item._st.hmStyle.letterSpacing)
+                .textBackgroundStyle({
+                  color: item._st.hmStyle.backgroundColor,
+                  radius: {
+                    topLeft: item._st.hmStyle.borderTopLeftRadius,
+                    topRight: item._st.hmStyle.borderTopRightRadius,
+                    bottomLeft: item._st.hmStyle.borderBottomLeftRadius,
+                    bottomRight: item._st.hmStyle.borderBottomRightRadius,
+                  }
+                })
+                .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', item) }, item, ['click']))
+            }
           }, (item: TaroElement) => `${item._nid}${this.node._updateTrigger}`)
         }
       }
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', this.node) }, this.node, ['click']))
       .attributeModifier(textModify.setNode(this.node).withNormalStyle().setAnimationStyle(this.overwriteStyle))
       .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) => {
@@ -74,59 +96,13 @@ export default struct TaroText {
   }
 }
 
-@Builder
-function createTextChildNode (item: TaroElement) {
-  if (item.tagName === 'IMAGE') {
-    ImageSpan(item.getAttribute('src'))
-      // .attributeModifier(commonStyleModify.setNode(item))
-      .objectFit(getImageMode(item.getAttribute('mode')))
-      // .verticalAlign(align)
-      .width(item._st.hmStyle.width)
-      .height(item._st.hmStyle.height)
-      .margin({
-        top: item._st.hmStyle.marginTop,
-        left: item._st.hmStyle.marginLeft,
-        right: item._st.hmStyle.marginRight,
-        bottom: item._st.hmStyle.marginBottom,
-      })
-      .padding({
-        top: item._st.hmStyle.paddingTop,
-        left: item._st.hmStyle.paddingLeft,
-        right: item._st.hmStyle.paddingRight,
-        bottom: item._st.hmStyle.paddingBottom,
-      })
-      .textBackgroundStyle({
-        color: item._st.hmStyle.backgroundColor,
-        radius: {
-          topLeft: item._st.hmStyle.borderTopLeftRadius,
-          topRight: item._st.hmStyle.borderTopRightRadius,
-          bottomLeft: item._st.hmStyle.borderBottomLeftRadius,
-          bottomRight: item._st.hmStyle.borderBottomRightRadius,
-        }
-      })
-      .borderRadius({
-        topLeft: item._st.hmStyle.borderTopLeftRadius,
-        topRight: item._st.hmStyle.borderTopRightRadius,
-        bottomLeft: item._st.hmStyle.borderBottomLeftRadius,
-        bottomRight: item._st.hmStyle.borderBottomRightRadius
-      })
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', item), item, ['click']))
-  } else if (item.nodeType === NodeType.TEXT_NODE) {
-    Span(item.textContent)
-  } else if (item.tagName === 'TEXT') {
-    Span(item.textContent)
-      .attributeModifier(spanModify.setNode(item))
-      .letterSpacing(item._st.hmStyle.letterSpacing)
-      .textBackgroundStyle({
-        color: item._st.hmStyle.backgroundColor,
-        radius: {
-          topLeft: item._st.hmStyle.borderTopLeftRadius,
-          topRight: item._st.hmStyle.borderTopRightRadius,
-          bottomLeft: item._st.hmStyle.borderBottomLeftRadius,
-          bottomRight: item._st.hmStyle.borderBottomRightRadius,
-        }
-      })
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', item), item, ['click']))
+function getImageSpanAlignment (align: TaroAny): TaroAny {
+  if (align === Alignment.Top) {
+    return ImageSpanAlignment.TOP
+  } else if (align === Alignment.Bottom) {
+    return ImageSpanAlignment.BOTTOM
+  } else if (align === Alignment.Center) {
+    return ImageSpanAlignment.CENTER
   }
 }
 

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

@@ -45,7 +45,7 @@ export default struct TaroTextArea {
   @State value: string = ''
 
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node: TaroTextAreaElement) => void = this.customBuilder
+  @BuilderParam createLazyChildren: (node: TaroTextAreaElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroTextAreaElement
   @State overwriteStyle: Record<string, TaroAny> = {}
 
@@ -63,7 +63,7 @@ export default struct TaroTextArea {
 
   build () {
     TextArea({ text: this.value, placeholder: this.node._attrs?.placeholder || '', controller: this.node.controller })
-      .key(this.node._nid)
+      .key(this.node._nid.toString())
       .maxLength(Number(this.node._attrs?.maxlength) || null)
       .placeholderColor(getPlaceholderColor(this.node))
       .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
@@ -76,7 +76,7 @@ export default struct TaroTextArea {
         this.node?.updateFormWidgetValue(value)
         eventHandler(event, 'input', this.node)
       })
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', this.node) }, this.node, ['click']))
       .onBlur(() => {
         const event: TaroEvent = createTaroEvent('blur', { detail: { value: this.value } }, this.node)
         eventHandler(event, 'blur', this.node)

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

@@ -140,7 +140,7 @@ class AttributeManager {
     }
     let resultTransform: matrix4.Matrix4Transit
 
-    const matches = transform.match(new RegExp("/(\w+)\(([^)]+)\)/g")) || [];
+    const matches: string[] = transform.match(new RegExp("/(\w+)\(([^)]+)\)/g")) || [];
 
     // 处理matrix
 

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

@@ -2,8 +2,7 @@ import { VIEW } from '@tarojs/runtime/dist/runtime.esm'
 
 import { getNormalAttributes, getFontAttributes, getStyleAttr } from './styles'
 
-import type { TFunc } from '@tarojs/runtime/dist/runtime.esm'
-import type { TaroElement, TaroNode } from '@tarojs/runtime'
+import type { TaroElement, TaroNode, TaroAny } from '@tarojs/runtime'
 
 export const parseStyles = (styles = ''): Record<string, string> => {
   const styleObj: Record<string, string> = {}
@@ -11,7 +10,7 @@ export const parseStyles = (styles = ''): Record<string, string> => {
     .split(';')
     .filter((style) => style.split(':').length === 2)
     .map((style) => [
-    style.split(':')[0].trim().replace(new RegExp("/-./g"), c => c.substring(1).toUpperCase()),
+    style.split(':')[0].trim().replace(new RegExp("-([a-z])", "g"), (_, letter: string): string => letter.toUpperCase()),
     style.split(':')[1].trim()
     ])
     .forEach((style) => {
@@ -22,7 +21,7 @@ export const parseStyles = (styles = ''): Record<string, string> => {
   return styleObj
 }
 
-export function shouldBindEvent (cb: TFunc, node: TaroElement | null, eventNames: string[], disabled = false) {
+export function shouldBindEvent (cb: TaroAny, node: TaroElement | null, eventNames: string[], disabled = false): TaroAny {
   if (!node || node._attrs?.disabled || disabled) return null
   if (!node.__listeners) {
     return null

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

@@ -99,7 +99,7 @@ export function getNormalAttributes (node: TaroElement, initStyle?: HarmonyStyle
   let normalAttributes = hmStyle
 
   // 覆盖属性
-  normalAttributes.id =  _attrs.id || _nid
+  normalAttributes.id = _attrs.id || _nid.toString()
 
   let pseudoStylesheet = getPseudoClass(node)
   if (pseudoStylesheet) {

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

@@ -81,7 +81,7 @@ function handleUpdate (node: TaroVideoElement, e: VideoUpdateEvent) {
 @Component
 export default struct TaroVideo {
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node: TaroVideoElement) => void = this.customBuilder
+  @BuilderParam createLazyChildren: (node: TaroVideoElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroVideoElement
   @State overwriteStyle: Record<string, TaroAny> = {}
 
@@ -105,7 +105,7 @@ export default struct TaroVideo {
     .onSeeked(shouldBindEvent(() => { emitEvent(this.node, 'seeked') }, this.node, ['seeked']))
     .onFullscreenChange(shouldBindEvent((e: TaroAny) => { emitEvent(this.node, 'fullScreenChange', { fullScreen: e.fullscreen}) }, this.node, ['fullscreenchange']))
     .onClick((e: ClickEvent) => { eventHandler(e, 'click', this.node) })
-    .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
+    .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: TaroAny) => {
       this.node._nodeInfo.areaInfo = res[1]
     }))

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

@@ -12,7 +12,7 @@ import { isUndefined } from '@tarojs/shared'
 @Component
 export default struct TaroView {
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node: TaroViewElement) => void = this.customBuilder
+  @BuilderParam createLazyChildren: (node: TaroViewElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroViewElement
   @State overwriteStyle: Record<string, TaroAny> = {}
 
@@ -28,12 +28,12 @@ export default struct TaroView {
         if (this.node._pseudo_before || this.node._pseudo_after) {
           PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
         } else {
-          this.createLazyChildren(this.node)
+          this.createLazyChildren(this.node, 0)
         }
       }
       .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
-      .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()))
+      .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: TaroAny) => {
         this.node._nodeInfo.areaInfo = res[1]
       }))
@@ -43,12 +43,12 @@ export default struct TaroView {
         if (this.node._pseudo_before || this.node._pseudo_after) {
           PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
         } else {
-          this.createLazyChildren(this.node)
+          this.createLazyChildren(this.node, 0)
         }
       }
       .attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
-      .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()))
+      .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: TaroAny) => {
         this.node._nodeInfo.areaInfo = res[1]
       }))
@@ -58,12 +58,12 @@ export default struct TaroView {
         if (this.node._pseudo_before || this.node._pseudo_after) {
           PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
         } else {
-          this.createLazyChildren(this.node)
+          this.createLazyChildren(this.node, 0)
         }
       }
       .attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
-      .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()))
+      .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: TaroAny) => {
         this.node._nodeInfo.areaInfo = res[1]
       }))

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

@@ -17,7 +17,7 @@ interface IError {
 @Component
 export default struct TaroWebView {
   @Builder customBuilder() {}
-  @BuilderParam createLazyChildren: (node: TaroWebViewElement) => void = this.customBuilder
+  @BuilderParam createLazyChildren: (node: TaroWebViewElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroWebViewElement
 
   build () {
@@ -47,7 +47,7 @@ export default struct TaroWebView {
 
         eventHandler(event, 'error', this.node)
       }, this.node, ['error']))
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .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]
       }))

package/dist/index.js

@@ -487,7 +487,9 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
             }
             if (this.extensions.includes(path__namespace.extname(lib))) {
                 // Note: 查询 externals 内的依赖，并将它们添加到 externalDeps 中
-                code = code.replace(/(?:import\s|from\s|require\()['"]([^\\/.][^'"\s]+)['"]\)?/g, (src, p1) => {
+                code = code.replace(/(?:import\s|from\s|require\()['"]([^\\/.][^'"\s]+)['"]\)?/g, (src, p1 = '') => {
+                    if (p1.startsWith('node:') || p1.endsWith('.so'))
+                        return src;
                     const { outputRoot } = this.ctx.runOpts.config;
                     const targetPath = path__namespace.join(outputRoot, helper.NODE_MODULES, p1);
                     const relativePath = parseRelativePath(path__namespace.dirname(target), targetPath);
@@ -595,7 +597,7 @@ declare global {
         const chorePkgRgx = new RegExp(`^${(chorePackagePrefix || '').replace(/[\\/]+/g, '[\\\\/]+').replace(/[-^$*?.|]/g, '\\$&')}`);
         const externals = Object.keys(ohPackage.dependencies || []).concat(Object.keys(ohPackage.devDependencies || []));
         function modifyResolveId({ source = '', name = 'modifyResolveId' }) {
-            if (externals.includes(source) || chorePkgRgx.test(source)) {
+            if (externals.includes(source) || (chorePackagePrefix && chorePkgRgx.test(source))) {
                 return {
                     external: true,
                     id: source,