@tarojs/plugin-platform-harmony-ets 4.0.0-beta.44 → 4.0.0-beta.46

package/dist/apis/storage/index.ts

@@ -14,6 +14,7 @@ import type Taro from '@tarojs/taro/types'
 let context
 let kvManager: distributedKVStore.KVManager
 let kvStore: distributedKVStore.SingleKVStore
+let kvStorePromise: Promise<void>
 
 (Current as any).contextPromise.then((ctx) => {
   context = ctx
@@ -38,13 +39,16 @@ let kvStore: distributedKVStore.SingleKVStore
     }
 
     const data = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION)
-    kvManager.getKVStore<distributedKVStore.SingleKVStore>(`${data.appInfo.uid}Store`, options, (err, store: distributedKVStore.SingleKVStore) => {
-      if (err) {
-        console.error(`Failed to get KVStore: Code:${err.code},message:${err.message}`)
-        return
-      }
-      kvStore = store
-      // 请确保获取到键值数据库实例后，再进行相关数据操作
+    kvStorePromise = new Promise(resolve => {
+      kvManager.getKVStore<distributedKVStore.SingleKVStore>(`${data.appInfo.uid}Store`, options, (err, store: distributedKVStore.SingleKVStore) => {
+        if (err) {
+          console.error(`Failed to get KVStore: Code:${err.code},message:${err.message}`)
+          return
+        }
+        kvStore = store
+        // 请确保获取到键值数据库实例后，再进行相关数据操作
+        resolve()
+      })
     })
   } catch (e) {
     console.error(`Failed to create KVManager. Code:${e.code},message:${e.message}`)
@@ -58,7 +62,7 @@ const storageSchema = {
 }
 
 function checkContextExist (api: string, isAsync = false) {
-  if (!context || !kvStore) {
+  if (!context) {
     const message = `${api} 调用失败，Taro 不支持过早地调用 ${api}，请确保页面已经渲染完成再调用此 API`
     if (isAsync) {
       return {
@@ -91,21 +95,23 @@ export function getStorage<T = any> (options: Taro.getStorage.Option<T>) {
   const handle = new MethodHandler<{data: any}>({ name, success, fail, complete })
 
   return new Promise((resolve, reject) => {
-    try {
-      validateParams(name, options, storageSchema)
-    } catch (error) {
-      const res = { errMsg: error.message }
-      return handle.fail(res, { resolve, reject })
-    }
-
-    kvStore = kvStore as distributedKVStore.SingleKVStore
-    kvStore.get(key, (err, data) => {
-      if (err) {
-        handle.fail({ errMsg: `Failed to get data. Code:${err.code},message:${err.message}` }, { resolve, reject })
-        return
+    kvStorePromise.then(() => {
+      try {
+        validateParams(name, options, storageSchema)
+      } catch (error) {
+        const res = { errMsg: error.message }
+        return handle.fail(res, { resolve, reject })
       }
-
-      handle.success({ data }, { resolve, reject })
+  
+      kvStore = kvStore as distributedKVStore.SingleKVStore
+      kvStore.get(key, (err, data) => {
+        if (err) {
+          handle.fail({ errMsg: `Failed to get data. Code:${err.code},message:${err.message}` }, { resolve, reject })
+          return
+        }
+  
+        handle.success({ data }, { resolve, reject })
+      })
     })
   })
 }
@@ -122,21 +128,23 @@ export function setStorage (options: Taro.setStorage.Option) {
   const handle = new MethodHandler({ name, success, fail, complete })
 
   return new Promise((resolve, reject) => {
-    try {
-      validateParams(name, options, storageSchema)
-    } catch (error) {
-      const res = { errMsg: error.message }
-      return handle.fail(res, { resolve, reject })
-    }
-
-    kvStore = kvStore as distributedKVStore.SingleKVStore
-    kvStore.put(key, data, (err) => {
-      if (err) {
-        handle.fail({ errMsg: `Failed to put data. Code:${err.code},message:${err.message}` }, { resolve, reject })
-        return
+    kvStorePromise.then(() => {
+      try {
+        validateParams(name, options, storageSchema)
+      } catch (error) {
+        const res = { errMsg: error.message }
+        return handle.fail(res, { resolve, reject })
       }
-
-      handle.success({}, { resolve, reject })
+  
+      kvStore = kvStore as distributedKVStore.SingleKVStore
+      kvStore.put(key, data, (err) => {
+        if (err) {
+          handle.fail({ errMsg: `Failed to put data. Code:${err.code},message:${err.message}` }, { resolve, reject })
+          return
+        }
+  
+        handle.success({}, { resolve, reject })
+      })
     })
   })
 }
@@ -153,21 +161,23 @@ export function removeStorage (options: Taro.removeStorage.Option) {
   const handle = new MethodHandler({ name, success, fail, complete })
 
   return new Promise((resolve, reject) => {
-    try {
-      validateParams(name, options, storageSchema)
-    } catch (error) {
-      const res = { errMsg: error.message }
-      return handle.fail(res, { resolve, reject })
-    }
-
-    kvStore = kvStore as distributedKVStore.SingleKVStore
-    kvStore.delete(key, (err) => {
-      if (err) {
-        handle.fail({ errMsg: `Failed to delete data. Code:${err.code},message:${err.message}` }, { resolve, reject })
-        return
+    kvStorePromise.then(() => {
+      try {
+        validateParams(name, options, storageSchema)
+      } catch (error) {
+        const res = { errMsg: error.message }
+        return handle.fail(res, { resolve, reject })
       }
-
-      handle.success({}, { resolve, reject })
+  
+      kvStore = kvStore as distributedKVStore.SingleKVStore
+      kvStore.delete(key, (err) => {
+        if (err) {
+          handle.fail({ errMsg: `Failed to delete data. Code:${err.code},message:${err.message}` }, { resolve, reject })
+          return
+        }
+  
+        handle.success({}, { resolve, reject })
+      })
     })
   })
 }

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

@@ -127,7 +127,7 @@ export struct TaroCheckboxGroup {
   }
 
   build() {
-    if (!isUndefined(this.node._st.hmStyle.flexWrap)) {
+    if (FlexManager.useFlexLayout(this.node)) {
       Flex(FlexManager.flexOptions(this.node)) {
         this.createLazyChildren(this.node)
       }

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

@@ -24,7 +24,7 @@ export default struct TaroForm {
   }
 
   build() {
-    if (!isUndefined(this.node._st.hmStyle.flexWrap)) {
+    if (FlexManager.useFlexLayout(this.node)) {
       Flex(FlexManager.flexOptions(this.node)) {
         this.createLazyChildren(this.node)
       }

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

@@ -51,7 +51,7 @@ export default struct TaroLabel {
 
   build() {
 
-    if (!isUndefined(this.node._st.hmStyle.flexWrap)) {
+    if (FlexManager.useFlexLayout(this.node)) {
       Flex(FlexManager.flexOptions(this.node)) {
         this.createLazyChildren(this.node)
       }

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

@@ -19,7 +19,7 @@ export default struct TaroMovableArea {
   }
 
   build() {
-    if (!isUndefined(this.node._st.hmStyle.flexWrap)) {
+    if (FlexManager.useFlexLayout(this.node)) {
       Flex(FlexManager.flexOptions(this.node)) {
         this.createLazyChildren(this.node)
       }

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

@@ -20,7 +20,7 @@ export default struct TaroMovableView {
 
   build() {
     Stack() {
-      if (!isUndefined(this.node._st.hmStyle.flexWrap)) {
+      if (FlexManager.useFlexLayout(this.node)) {
         Flex(FlexManager.flexOptions(this.node)) {
           this.createLazyChildren(this.node)
         }

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

@@ -129,7 +129,7 @@ export struct TaroRadioGroup {
   }
 
   build() {
-    if (!isUndefined(this.node._st.hmStyle.flexWrap)) {
+    if (FlexManager.useFlexLayout(this.node)) {
       Flex(FlexManager.flexOptions(this.node)) {
         this.createLazyChildren(this.node)
       }

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

@@ -36,6 +36,11 @@ class TextStyleModify implements AttributeModifier<TextAttribute> {
 
   setAnimationStyle (overwriteStyle: Record<string, TaroAny>) {
     this.overwriteStyle = overwriteStyle
+    if (this.style && this.overwriteStyle) {
+      Object.keys(this.overwriteStyle).forEach(key => {
+        this.style![key] = this.overwriteStyle[key]
+      })
+    }
     return this
   }
 
@@ -43,12 +48,12 @@ class TextStyleModify implements AttributeModifier<TextAttribute> {
     if (this.node && this.style) {
       if (this.withNormal) {
         setNormalAttributeIntoInstance(instance, this.style, this.node)
+        setTransformAttributeIntoInstance(instance, this.style || {})
       }
       setNormalTextAttributeIntoInstance(instance, this.style, this.node)
       setSpecialTextAttributeIntoInstance(instance, this.style, this.node)
     }
 
-    setAnimationAttributeIntoInstance(instance, this.overwriteStyle, this.style || {})
   }
 }
 
@@ -87,9 +92,8 @@ class CommonStyleModify implements AttributeModifier<CommonAttribute> {
   applyNormalAttribute(instance: CommonAttribute): void {
     if (this.node && this.style) {
       setNormalAttributeIntoInstance(instance, this.style, this.node)
+      setTransformAttributeIntoInstance(instance, this.style || {})
     }
-
-    setAnimationAttributeIntoInstance(instance, this.overwriteStyle, this.style || {})
   }
 }
 
@@ -123,9 +127,9 @@ class RowStyleModify extends CommonStyleModify {
         instance.alignItems(FlexManager.alignItems<VerticalAlign>(this.node))
         instance.justifyContent(FlexManager.justifyContent(this.node))
       }
+      setTransformAttributeIntoInstance(instance, this.style || {})
     }
 
-    setAnimationAttributeIntoInstance(instance, this.overwriteStyle, this.style || {})
   }
 }
 
@@ -143,34 +147,34 @@ class ColumnStyleModify extends CommonStyleModify {
         instance.alignItems(FlexManager.alignItems<HorizontalAlign>(this.node))
         instance.justifyContent(FlexManager.justifyContent(this.node))
       }
+      setTransformAttributeIntoInstance(instance, this.style || {})
     }
 
-    setAnimationAttributeIntoInstance(instance, this.overwriteStyle, this.style || {})
   }
 }
 
-export function setAnimationAttributeIntoInstance(instance: CommonAttribute, overwriteStyle: Record<string, TaroAny>, style: TaroStyleType) {
+export function setTransformAttributeIntoInstance(instance: CommonAttribute, style: TaroStyleType) {
   // Animation 需要提前和 @State 变量绑定才能产生动画效果，因此不能做 if else 判断
-  // instance.translate({
-  //   x: overwriteStyle.translate?.x || style.transform?.Translate?.x,
-  //   y: overwriteStyle.translate?.y || style.transform?.Translate?.y,
-  //   z: overwriteStyle.translate?.z || style.transform?.Translate?.z,
-  // })
-  // instance.scale({
-  //   x: overwriteStyle.scale?.x || style.transform?.Scale?.x,
-  //   y: overwriteStyle.scale?.y || style.transform?.Scale?.y,
-  //   z: overwriteStyle.scale?.z || style.transform?.Scale?.z,
-  //   centerX: overwriteStyle.transformOrigin?.x || style.transformOrigin?.x || 0,
-  //   centerY: overwriteStyle.transformOrigin?.y || style.transformOrigin?.y || 0,
-  // })
-  // instance.rotate({
-  //   x: overwriteStyle.rotate?.x || style.transform?.Rotate?.x,
-  //   y: overwriteStyle.rotate?.y || style.transform?.Rotate?.y,
-  //   z: overwriteStyle.rotate?.z || style.transform?.Rotate?.z,
-  //   centerX: overwriteStyle.transformOrigin?.x || style.transformOrigin?.x || 0,
-  //   centerY: overwriteStyle.transformOrigin?.y || style.transformOrigin?.y || 0,
-  //   angle: overwriteStyle.rotate?.angle || style.transform?.Rotate?.angle || 0,
-  // })
+  instance.translate({
+    x: style.transform?.Translate?.x,
+    y: style.transform?.Translate?.y,
+    z: style.transform?.Translate?.z,
+  })
+  instance.scale({
+    x: style.transform?.Scale?.x,
+    y: style.transform?.Scale?.y,
+    z: style.transform?.Scale?.z,
+    centerX: style.transformOrigin?.x || 0,
+    centerY: style.transformOrigin?.y || 0,
+  })
+  instance.rotate({
+    x: style.transform?.Rotate?.x,
+    y: style.transform?.Rotate?.y,
+    z: style.transform?.Rotate?.z,
+    centerX: style.transformOrigin?.x || 0,
+    centerY: style.transformOrigin?.y || 0,
+    angle: style.transform?.Rotate?.angle || 0,
+  })
 }
 
 export function setNormalTextAttributeIntoInstance(instance: TextAttribute | SpanAttribute, style: HarmonyStyle, node?: TaroTextElement | null) {
@@ -366,34 +370,34 @@ export function setNormalAttributeIntoInstance(instance: CommonAttribute, style:
     // 为了适应position不设置z-index也能高于同层级组件，估且让设置了z-index的会更高一级
     instance.zIndex(style.zIndex + 1)
   }
-  if (!isUndefined(style.transform)) {
-    if (style.transform.Translate) {
-      instance.translate({
-        x: style.transform.Translate.x || 0,
-        y: style.transform.Translate.y || 0,
-        z: style.transform.Translate.z || 0,
-      })
-    }
-    if (style.transform.Scale) {
-      instance.scale({
-        x: style.transform.Scale.x || 0,
-        y: style.transform.Scale.y || 0,
-        z: style.transform.Scale.z || 0,
-        centerX: style.transformOrigin?.x || 0,
-        centerY: style.transformOrigin?.y || 0,
-      })
-    }
-    if (style.transform.Rotate) {
-      instance.rotate({
-        x: style.transform.Rotate.x || 0,
-        y: style.transform.Rotate.y || 0,
-        z: style.transform.Rotate.z || 0,
-        centerX: style.transformOrigin?.x || 0,
-        centerY: style.transformOrigin?.y || 0,
-        angle: style.transform.Rotate.angle
-      })
-    }
-  }
+  // if (!isUndefined(style.transform)) {
+  //   if (style.transform.Translate) {
+  //     instance.translate({
+  //       x: style.transform.Translate.x || 0,
+  //       y: style.transform.Translate.y || 0,
+  //       z: style.transform.Translate.z || 0,
+  //     })
+  //   }
+  //   if (style.transform.Scale) {
+  //     instance.scale({
+  //       x: style.transform.Scale.x || 0,
+  //       y: style.transform.Scale.y || 0,
+  //       z: style.transform.Scale.z || 0,
+  //       centerX: style.transformOrigin?.x || 0,
+  //       centerY: style.transformOrigin?.y || 0,
+  //     })
+  //   }
+  //   if (style.transform.Rotate) {
+  //     instance.rotate({
+  //       x: style.transform.Rotate.x || 0,
+  //       y: style.transform.Rotate.y || 0,
+  //       z: style.transform.Rotate.z || 0,
+  //       centerX: style.transformOrigin?.x || 0,
+  //       centerY: style.transformOrigin?.y || 0,
+  //       angle: style.transform.Rotate.angle
+  //     })
+  //   }
+  // }
 }
 
 export const pseudoModify = new PseudoStyleModify()

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

@@ -37,6 +37,11 @@ class FlexManager {
     }
   }
 
+  static useFlexLayout (node: TaroElement): boolean {
+    const hmStyle: HarmonyStyle = getNormalAttributes(node) || {}
+    return !isUndefined(hmStyle.flexWrap) || [ItemAlign.Stretch, ItemAlign.Baseline].indexOf(hmStyle.alignItems!) !== -1
+  }
+
   static flexOptions (node: TaroElement): IFlexOptions {
     const hmStyle: HarmonyStyle = getNormalAttributes(node) || {}
     const isFlex = FlexManager.isFlexNode(node)

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

@@ -23,7 +23,7 @@ export default struct TaroView {
   }
 
   build () {
-    if (!isUndefined(this.node._st.hmStyle.flexWrap)) {
+    if (FlexManager.useFlexLayout(this.node)) {
       Flex(FlexManager.flexOptions(this.node)) {
         if (this.node._pseudo_before || this.node._pseudo_after) {
           PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })

package/dist/index.js

@@ -507,7 +507,9 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                     define.global = 'globalThis';
                 }
                 const ext = path__namespace.extname(target);
-                code = this.replaceDefineValue(code, define, ext);
+                if (![/d\.e?tsx?$/, /\.(json|md)$/].some(e => e.test(target))) {
+                    code = this.replaceDefineValue(code, define, ext);
+                }
                 if (['.ts'].includes(ext)) {
                     code = '// @ts-nocheck\n' + code;
                 }