@tarojs/plugin-platform-harmony-ets 4.0.0-beta.97 → 4.0.0-beta.99

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

@@ -72,7 +72,7 @@ export default struct TaroInput {
 
   build () {
     TextInput({ text: this.value, placeholder: this.node._attrs?.placeholder || '', controller: this.node.controller })
-    .key(this.node._nid)
+    .key(this.node._nid.toString())
     .type(getInputType(this.node))
     .maxLength(Number(this.node._attrs?.maxlength) || null)
     .placeholderColor(getPlaceholderColor(this.node))

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

@@ -56,7 +56,7 @@ export default struct TaroLabel {
       .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .onClick((e: ClickEvent) => {
         const firstChild: TaroElement | null = this.node.childNodes[0] as TaroElement | null
-        const id: string = this.node._attrs.for || firstChild?._attrs.id || firstChild?._nid || ''
+        const id: string = this.node._attrs.for || firstChild?._attrs.id || firstChild?._nid.toString() || ''
 
         handleTargetChange(id)
         eventHandler(e, 'click', this.node)
@@ -73,7 +73,7 @@ export default struct TaroLabel {
       .attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .onClick((e: ClickEvent) => {
         const firstChild: TaroElement | null = this.node.childNodes[0] as TaroElement | null
-        const id: string = this.node._attrs.for || firstChild?._attrs.id || firstChild?._nid || ''
+        const id: string = this.node._attrs.for || firstChild?._attrs.id || firstChild?._nid.toString() || ''
 
         handleTargetChange(id)
         eventHandler(e, 'click', this.node)
@@ -90,7 +90,7 @@ export default struct TaroLabel {
       .attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .onClick((e: ClickEvent) => {
         const firstChild: TaroElement | null = this.node.childNodes[0] as TaroElement | null
-        const id: string = this.node._attrs.for || firstChild?._attrs.id || firstChild?._nid || ''
+        const id: string = this.node._attrs.for || firstChild?._attrs.id || firstChild?._nid.toString() || ''
 
         handleTargetChange(id)
         eventHandler(e, 'click', this.node)

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

@@ -29,7 +29,7 @@ export default struct TaroNavigationBar {
   }
 
   handleAttributeUpdate = (opt: IComponentAttributeUpdateEvents) => {
-    if (opt.id === this.node._nid && opt.tagName === 'NAVIGATION-BAR') {
+    if (opt.id === this.node._nid.toString() && opt.tagName === 'NAVIGATION-BAR') {
       const attrs: Record<string, TaroAny> = {}
       attrs[opt.attribute] = opt.value
       this.handleAttributes(attrs)

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

@@ -41,7 +41,7 @@ export default struct TaroPageMeta {
   }
 
   handleAttributeUpdate = (opt: IComponentAttributeUpdateEvents) => {
-    if (opt.id === this.node._nid && opt.tagName === 'PAGE-META') {
+    if (opt.id === this.node._nid.toString() && opt.tagName === 'PAGE-META') {
       const attrs: Record<string, TaroAny> = {}
       attrs[opt.attribute] = opt.value
       this.handleAttributes(attrs)

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

@@ -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)
@@ -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())

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'
@@ -74,42 +74,23 @@ export default struct TaroText {
   }
 }
 
+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
+  }
+}
+
 @Builder
 function createTextChildNode (item: TaroElement) {
   if (item.tagName === 'IMAGE') {
     ImageSpan(item.getAttribute('src'))
-      // .attributeModifier(commonStyleModify.setNode(item))
+      .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
-      })
+      .verticalAlign(getImageSpanAlignment(item?.hmStyle?.verticalAlign))
       .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', item) }, item, ['click']))
   } else if (item.nodeType === NodeType.TEXT_NODE) {
     Span(item.textContent)

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

@@ -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))

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-harmony-ets",
-  "version": "4.0.0-beta.97",
+  "version": "4.0.0-beta.99",
   "description": "OpenHarmony & 鸿蒙系统插件",
   "author": "O2Team",
   "homepage": "https://gitee.com/openharmony-sig/taro",
@@ -27,13 +27,13 @@
     "webpack-sources": "^3.2.3",
     "@babel/preset-react": "^7.24.1",
     "webpack": "5.91.0",
-    "@tarojs/components": "4.0.0-beta.97",
-    "@tarojs/helper": "4.0.0-beta.97",
-    "@tarojs/runner-utils": "4.0.0-beta.97",
-    "@tarojs/service": "4.0.0-beta.97",
-    "@tarojs/runtime": "4.0.0-beta.97",
-    "@tarojs/taro": "4.0.0-beta.97",
-    "@tarojs/shared": "4.0.0-beta.97"
+    "@tarojs/components": "4.0.0-beta.99",
+    "@tarojs/helper": "4.0.0-beta.99",
+    "@tarojs/runner-utils": "4.0.0-beta.99",
+    "@tarojs/runtime": "4.0.0-beta.99",
+    "@tarojs/service": "4.0.0-beta.99",
+    "@tarojs/shared": "4.0.0-beta.99",
+    "@tarojs/taro": "4.0.0-beta.99"
   },
   "devDependencies": {
     "fast-glob": "^3.3.1",
@@ -42,7 +42,7 @@
     "rollup-plugin-ts": "^3.0.2",
     "solid-js": "^1.8.16",
     "tslib": "^2.4.0",
-    "rollup-plugin-copy": "4.0.0-beta.97"
+    "rollup-plugin-copy": "4.0.0-beta.99"
   },
   "scripts": {
     "prod": "pnpm run build",