@tarojs/plugin-platform-harmony-ets 4.0.0-beta.45 → 4.0.0-beta.47

package/dist/apis/device/clipboard.ts

@@ -1,5 +1,6 @@
 // 从 API Version 6 开始支持
 import pasteboard from '@ohos.pasteboard'
+import promptAction from '@ohos.promptAction'
 import { isString } from '@tarojs/shared'
 
 import { callAsyncFail, getParameterError, object2String } from '../utils'
@@ -38,6 +39,9 @@ export const setClipboardData: typeof Taro.setClipboardData = function (options)
         }
         callAsyncFail(reject, res, options)
       } else {
+
+        promptAction.showToast({ message: '内容已复制' })
+        
         return handle.success({
           data,
         }, { resolve, reject })

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 })
+      })
     })
   })
 }
@@ -183,7 +193,7 @@ export const batchSetStorage = /* @__PURE__ */ temporarilyNotSupport('batchSetSt
 export const batchGetStorageSync = /* @__PURE__ */ temporarilyNotSupport('batchGetStorageSync')
 export const batchGetStorage = /* @__PURE__ */ temporarilyNotSupport('batchGetStorage')
 
-export const clearStorage = temporarilyNotSupport('removeStorageSync')
+export const clearStorage = temporarilyNotSupport('clearStorage')
 export const getStorageSync = temporarilyNotSupport('getStorageSync', 'getStorage')
 export const setStorageSync = temporarilyNotSupport('setStorageSync', 'setStorage')
 export const clearStorageSync = temporarilyNotSupport('clearStorageSync', 'clearStorage')

package/dist/apis/ui/interaction/index.ts

@@ -1,4 +1,4 @@
-import prompt from '@ohos.prompt'
+import promptAction from '@ohos.promptAction'
 
 import { callAsyncFail, callAsyncSuccess, temporarilyNotSupport, validateParams } from '../../utils'
 
@@ -29,7 +29,7 @@ export function showToast (options) {
       return callAsyncFail(reject, res, options)
     }
 
-    prompt.showToast({
+    promptAction.showToast({
       message: options.title,
       duration: options.duration,
       bottom: options.bottom
@@ -72,37 +72,20 @@ export function showModal (options) {
     })
   }
 
-  return new Promise(resolve => {
+  return new Promise((resolve, reject) => {
     const modalOptions = {
       title,
       message: content,
       buttons: buttons,
-      success: (data) => {
-        if (data.index === 1 || !showCancel) {
-          callAsyncSuccess(
-            resolve,
-            {
-              ...resCallback('showModal'),
-              confirm: true,
-              cancel: false,
-              content: null
-            },
-            options
-          )
-        } else {
-          callAsyncSuccess(
-            resolve,
-            {
-              ...resCallback('showModal'),
-              confirm: false,
-              cancel: true
-            },
-            options
-          )
-        }
-      },
-      // 鸿蒙没有失败方法，只有取消
-      cancel: (_) => {
+    }
+
+    promptAction.showDialog(modalOptions, (error, data) => {
+      if (error) {
+        const res = { errMsg: error }
+        callAsyncFail(reject, res, options)
+      }
+
+      if (data.index === 0 && showCancel) {
         callAsyncSuccess(
           resolve,
           {
@@ -112,10 +95,19 @@ export function showModal (options) {
           },
           options
         )
+      } else {
+        callAsyncSuccess(
+          resolve,
+          {
+            ...resCallback('showModal'),
+            confirm: true,
+            cancel: false,
+            content: null
+          },
+          options
+        )
       }
-    }
-
-    prompt.showDialog(modalOptions)
+    })
   })
 }
 
@@ -152,19 +144,11 @@ export function showActionSheet (options) {
 
     const actionSheetOptions = {
       title,
-      buttons,
-      success: (data) => {
-        callAsyncSuccess(
-          resolve,
-          {
-            ...data,
-            ...resCallback('showActionSheet')
-          },
-          options
-        )
-      },
-      // 取消方法，并非失败
-      fail: (data) => {
+      buttons
+    }
+
+    promptAction.showActionMenu(actionSheetOptions, (error, data) => {
+      if (error) {
         callAsyncFail(
           reject,
           {
@@ -174,15 +158,22 @@ export function showActionSheet (options) {
           options
         )
       }
-    }
 
-    prompt.showActionMenu(actionSheetOptions)
+      callAsyncSuccess(
+        resolve,
+        {
+          ...data,
+          ...resCallback('showActionSheet')
+        },
+        options
+      )
+    })
   })
 }
 
 export function hideToast (options) {
   return new Promise(resolve => {
-    prompt.showToast({
+    promptAction.showToast({
       message: '关闭中',
       duration: 10,
       bottom: '9999px'

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/index.ets

@@ -1,4 +1,4 @@
-import TaroImage from './image'
+import TaroImage, { getImageMode } from './image'
 import TaroText from './text'
 import TaroView from './view'
 import TaroIcon from './icon'
@@ -23,15 +23,18 @@ import TaroMovableView from './movableView'
 import { TaroRadio, TaroRadioGroup } from './radio'
 import { TaroCheckboxGroup, TaroCheckbox } from './checkbox'
 
-import commonStyleModify, { rowModify, columnModify } from './style'
+import commonStyleModify, { rowModify, columnModify, textModify, setNormalTextAttributeIntoInstance } from './style'
 import { getButtonColor } from './button'
 import { FlexManager } from './utils/flexManager'
 import { DynamicCenter } from './utils/DynamicCenter'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
 import { BUTTON_THEME_COLOR } from './utils/constant/style'
+import { getStyleAttr } from './utils/styles'
 import { shouldBindEvent, getNodeThresholds, getNormalAttributes, getFontAttributes } from './utils/helper'
 
 export {
+  textModify,
+  getStyleAttr,
   FlexManager,
   DynamicCenter,
   getButtonColor,
@@ -44,6 +47,8 @@ export {
   getNodeThresholds,
   BUTTON_THEME_COLOR,
   getNormalAttributes,
+  setNormalTextAttributeIntoInstance,
+  getImageMode,
 }
 
 export {
@@ -72,5 +77,5 @@ export {
   TaroRadio,
   TaroRadioGroup,
   TaroCheckboxGroup,
-  TaroCheckbox
+  TaroCheckbox,
 }

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

@@ -1,4 +1,5 @@
 import type { TaroAny, HarmonyStyle, TaroElement, TaroStyleType, TaroTextElement }  from '@tarojs/runtime'
+import { ObjectAssign }  from '@tarojs/runtime'
 import { isUndefined } from '@tarojs/shared'
 import { computeBackgroundPosition } from './utils'
 import { getNormalAttributes } from './utils/helper'
@@ -36,6 +37,13 @@ class TextStyleModify implements AttributeModifier<TextAttribute> {
 
   setAnimationStyle (overwriteStyle: Record<string, TaroAny>) {
     this.overwriteStyle = overwriteStyle
+    if (this.style && this.overwriteStyle && Object.keys(this.overwriteStyle).length) {
+      // 防止污染原始样式
+      this.style = ObjectAssign({}, this.style)
+      Object.keys(this.overwriteStyle).forEach(key => {
+        this.style![key] = this.overwriteStyle[key]
+      })
+    }
     return this
   }
 
@@ -43,12 +51,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 || {})
   }
 }
 
@@ -76,7 +84,9 @@ class CommonStyleModify implements AttributeModifier<CommonAttribute> {
   
   setAnimationStyle (overwriteStyle: Record<string, TaroAny>) {
     this.overwriteStyle = overwriteStyle
-    if (this.style && this.overwriteStyle) {
+    if (this.style && this.overwriteStyle && Object.keys(this.overwriteStyle).length) {
+      // 防止污染原始样式
+      this.style = ObjectAssign({}, this.style)
       Object.keys(this.overwriteStyle).forEach(key => {
         this.style![key] = this.overwriteStyle[key]
       })
@@ -87,9 +97,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 +132,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,33 +152,33 @@ 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.transform?.Translate?.x || style.transform?.Translate?.x,
-    y: overwriteStyle.transform?.Translate?.y || style.transform?.Translate?.y,
-    z: overwriteStyle.transform?.Translate?.z || style.transform?.Translate?.z,
+    x: style.transform?.Translate?.x,
+    y: style.transform?.Translate?.y,
+    z: style.transform?.Translate?.z,
   })
   instance.scale({
-    x: overwriteStyle.transform?.Scale?.x || style.transform?.Scale?.x,
-    y: overwriteStyle.transform?.Scale?.y || style.transform?.Scale?.y,
-    z: overwriteStyle.transform?.Scale?.z || style.transform?.Scale?.z,
-    centerX: overwriteStyle.transformOrigin?.x || style.transformOrigin?.x || 0,
-    centerY: overwriteStyle.transformOrigin?.y || style.transformOrigin?.y || 0,
+    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: overwriteStyle.transform?.Rotate?.x || style.transform?.Rotate?.x,
-    y: overwriteStyle.transform?.Rotate?.y || style.transform?.Rotate?.y,
-    z: overwriteStyle.transform?.Rotate?.z || style.transform?.Rotate?.z,
-    centerX: overwriteStyle.transformOrigin?.x || style.transformOrigin?.x || 0,
-    centerY: overwriteStyle.transformOrigin?.y || style.transformOrigin?.y || 0,
-    angle: overwriteStyle.transform?.Rotate?.angle || style.transform?.Rotate?.angle || 0,
+    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,
   })
 }
 
@@ -222,6 +231,7 @@ export function setSpecialTextAttributeIntoInstance(instance: TextAttribute, sty
 }
 
 export function setNormalAttributeIntoInstance(instance: CommonAttribute, style: TaroStyleType, node?: TaroElement | null) {
+  instance.renderFit(RenderFit.RESIZE_FILL)
   if (!isUndefined(style.id)) {
     instance.id(style.id)
     instance.key(style.id)

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

@@ -247,7 +247,7 @@ class TaroPlatformHarmony extends service.TaroPlatform {
                 SUPPORT_TARO_POLYFILL: 'disabled',
             },
         });
-        return Object.assign(Object.assign(Object.assign({}, config), { buildAdapter: config.platform, fileType: this.fileType, platformType: this.platformType, useETS: this.useETS, useNesting: config.useNesting, useJSON5: this.useJSON5 }), extraOptions);
+        return Object.assign(Object.assign(Object.assign({}, config), { buildAdapter: config.platform, fileType: this.fileType, platformType: this.platformType, useETS: this.useETS, useJSON5: this.useJSON5 }), extraOptions);
     }
     /**
      * 调用 runner 开始编译
@@ -507,7 +507,7 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                     define.global = 'globalThis';
                 }
                 const ext = path__namespace.extname(target);
-                if (![/d\.e?tsx?$/, /\.(json|md)$/].some(e => e.test(target))) {
+                if (![/d\.e?tsx?$/, /\.(json|map|md)$/].some(e => e.test(target))) {
                     code = this.replaceDefineValue(code, define, ext);
                 }
                 if (['.ts'].includes(ext)) {