@tarojs/plugin-platform-harmony-ets 4.0.0-beta.96 → 4.0.0-beta.98

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

@@ -32,16 +32,16 @@ export default struct TaroPageMeta {
     }
 
     // FIXME 在 Harmony 提供 @Watch 文档后，根据 node 实际使用更细粒度的监听
-    eventCenter.on('__taroComponentAttributeUpdate', this.handleAttributeUpdate)
+    eventCenter?.on('__taroComponentAttributeUpdate', this.handleAttributeUpdate)
     this.handleAttributes(this.node._attrs)
   }
 
   aboutToDisappear(): void {
-    eventCenter.off('__taroComponentAttributeUpdate', this.handleAttributeUpdate)
+    eventCenter?.off('__taroComponentAttributeUpdate', this.handleAttributeUpdate)
   }
 
   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)
@@ -79,7 +79,7 @@ export default struct TaroPageMeta {
     // pageFontSize
     // pageOrientation
     if (triggerStyleEvent) {
-      eventCenter.trigger('__taroPageStyle', options)
+      eventCenter?.trigger('__taroPageStyle', options)
     }
     // onResize
     // onScroll

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)
 }
 
@@ -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/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/dist/runtime-ets/current.ts

@@ -1,5 +1,6 @@
 export const context: any = {
-  resolver: null
+  resolver: null,
+  value: null
 }
 
 // @ts-nocheck

package/dist/runtime-ets/dom/node.ts

@@ -21,8 +21,8 @@ export enum NodeType {
 }
 
 let _id = 0
-function genId (): string {
-  return `_n_${_id++}`
+function genId (): number {
+  return ++_id
 }
 
 export class TaroNode extends TaroDataSourceElement {
@@ -30,7 +30,7 @@ export class TaroNode extends TaroDataSourceElement {
   public readonly nodeType: NodeType
   public childNodes: TaroNode[] = []
   public parentNode: TaroNode | null = null
-  public _nid: string = genId()
+  public _nid: number = genId()
   public _doc: TaroDocument | null = null
   public _instance?: TaroAny
 

package/dist/runtime-framework/react/app.ts

@@ -23,7 +23,7 @@ export const ReactMeta: IReactMeta = {
   PageContext: EMPTY_OBJ
 }
 
-const pageKeyId = incrementId()
+const pageKeyId = incrementId(1)
 
 export function connectReactPage (
   R: typeof React,
@@ -85,7 +85,7 @@ export function createReactApp (
   App,
   react,
   dom,
-  _config?: any
+  config?: any
 ) {
   ReactMeta.R = react
   h = react.createElement
@@ -107,7 +107,7 @@ export function createReactApp (
   }
 
   function renderReactRoot () {
-    const appId = 'app'
+    const appId = config?.appId || 'app'
 
     if (ReactMeta.Container === EMPTY_OBJ) {
       const Container = document.createElement('view')
@@ -132,7 +132,7 @@ export function createReactApp (
 
     public mount (pageComponent: any, id: string, getCtx: () => any, cb: () => void) {
       const pageWrapper = connectReactPage(react, id, getCtx)(pageComponent)
-      const key = id + pageKeyId()
+      const key = `${id}_${pageKeyId()}`
       const page = () => h(pageWrapper, { key, tid: id })
       this.pages.push(page)
       this.forceUpdate(cb)

package/dist/runtime-framework/react/native-page.ts

@@ -19,7 +19,7 @@ import { EMPTY_OBJ, incrementId, isClassComponent } from './utils'
 import type { AppInstance } from '@tarojs/taro'
 import type * as React from 'react'
 
-const getNativeCompId = incrementId()
+const getNativeCompId = incrementId(1)
 let h: typeof React.createElement
 let ReactDOM
 let nativeComponentApp: AppInstance

package/dist/runtime-framework/react/page.ts

@@ -8,7 +8,7 @@ import { incrementId } from './utils'
 import type { PageConfig } from '@tarojs/taro'
 
 const instances = new Map<string, any>()
-const pageId = incrementId()
+const pageId = incrementId(1)
 
 export function injectPageInstance (inst: any, id: string) {
   hooks.call('mergePageInstance', instances.get(id), inst)

package/dist/runtime-framework/react/utils/index.ts

@@ -7,9 +7,9 @@ export function capitalize (s: string) {
   return s.charAt(0).toUpperCase() + s.slice(1)
 }
 
-export const incrementId = () => {
-  let n = 0
-  return () => (n++).toString()
+export const incrementId = (init = 0) => {
+  let n = init
+  return () => n++
 }
 
 export function ensureIsArray<T> (item: T | T[]): T[] {

package/dist/runtime-framework/solid/app.ts

@@ -31,7 +31,7 @@ export function createSolidApp(App: SolidComponent, config: AppConfig) {
   }
 
   function renderReactRoot() {
-    const appId = 'app'
+    const appId = config?.appId || 'app'
 
     if (ReactMeta.Container === EMPTY_OBJ) {
       const Container = document.createElement('view')

package/dist/runtime-framework/solid/page.ts

@@ -8,7 +8,7 @@ import { incrementId } from './utils'
 import type { PageConfig } from '@tarojs/taro'
 
 const instances = new Map<string, any>()
-const pageId = incrementId()
+const pageId = incrementId(1)
 
 export function injectPageInstance (inst: any, id: string) {
   hooks.call('mergePageInstance', instances.get(id), inst)

package/dist/runtime-framework/solid/utils/index.ts

@@ -9,9 +9,9 @@ export function capitalize (s: string) {
   return s.charAt(0).toUpperCase() + s.slice(1)
 }
 
-export const incrementId = () => {
-  let n = 0
-  return () => (n++).toString()
+export const incrementId = (init = 0) => {
+  let n = init
+  return () => n++
 }
 
 export const EMPTY_OBJ: any = {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-harmony-ets",
-  "version": "4.0.0-beta.96",
+  "version": "4.0.0-beta.98",
   "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.96",
-    "@tarojs/runner-utils": "4.0.0-beta.96",
-    "@tarojs/service": "4.0.0-beta.96",
-    "@tarojs/runtime": "4.0.0-beta.96",
-    "@tarojs/shared": "4.0.0-beta.96",
-    "@tarojs/taro": "4.0.0-beta.96",
-    "@tarojs/helper": "4.0.0-beta.96"
+    "@tarojs/components": "4.0.0-beta.98",
+    "@tarojs/helper": "4.0.0-beta.98",
+    "@tarojs/runner-utils": "4.0.0-beta.98",
+    "@tarojs/service": "4.0.0-beta.98",
+    "@tarojs/shared": "4.0.0-beta.98",
+    "@tarojs/runtime": "4.0.0-beta.98",
+    "@tarojs/taro": "4.0.0-beta.98"
   },
   "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.96"
+    "rollup-plugin-copy": "4.0.0-beta.98"
   },
   "scripts": {
     "prod": "pnpm run build",