@tarojs/plugin-platform-harmony-ets 4.0.0-canary.11 → 4.0.0-canary.13

package/dist/apis/base/system.ts

@@ -27,6 +27,14 @@ let windowRect
 
     try {
       display = _display.getDefaultDisplaySync()
+
+      setSafeArea({
+        top: statusBarHeight,
+        left: 0,
+        right: display.width,
+        bottom: navigationIndicatorRect?.top
+      })
+
       // @ts-ignore
       display.getCutoutInfo((err, { boundingRects = [], waterfallDisplayAreaRects = {} }: _display.CutoutInfo = {}) => {
         if (err?.code) {
@@ -35,17 +43,16 @@ let windowRect
         }
 
         const top = Math.max(...boundingRects.map(rect => rect.top + rect.height), waterfallDisplayAreaRects.top?.top + waterfallDisplayAreaRects.top?.height, statusBarHeight)
-        const bottom = display.height - Math.min(waterfallDisplayAreaRects.bottom?.top, navigationIndicatorRect?.top)
+        const bottom = Math.min(display.height - waterfallDisplayAreaRects.bottom?.top, navigationIndicatorRect?.top)
         const left = waterfallDisplayAreaRects.left?.left + waterfallDisplayAreaRects.left?.width
         const right = display.width - waterfallDisplayAreaRects.right?.left
-        safeArea = {
+
+        setSafeArea({
           top,
-          bottom,
           left,
           right,
-          height: bottom - top,
-          width: right - left,
-        }
+          bottom
+        })
       })
     } catch (e) {
       console.error('Failed to get display', e)
@@ -53,6 +60,19 @@ let windowRect
   })
 })
 
+
+function setSafeArea({ top, left, right, bottom }) {
+  safeArea = {
+    top,
+    bottom,
+    left,
+    right,
+    height: bottom - top,
+    width: right - left,
+  }
+}
+
+
 /* 同步版本 */
 export const getSystemInfoSync: typeof Taro.getSystemInfoSync = function () {
   const res: any = {}

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'
@@ -27,9 +28,20 @@ export const setClipboardData: typeof Taro.setClipboardData = function (options)
 
   return new Promise((resolve, reject) => {
     const systemPasteboard = pasteboard.getSystemPasteboard()
-    const pasteData = pasteboard.createPlainTextData(data)
+    const pasteData = pasteboard.createData(pasteboard.MIMETYPE_TEXT_PLAIN, data)
 
-    systemPasteboard.setPasteData(pasteData, (error, data) => { // callback形式调用异步接口
+    try {
+      systemPasteboard.setDataSync(pasteData)
+      promptAction.showToast({
+        message: '内容已复制',
+        duration: 1500,
+        bottom: '50%',
+        showMode: 1 // 设置弹窗显示模式，显示在应用之上。
+      })
+      return handle.success({
+        data,
+      }, { resolve, reject })
+    } catch (error) {
       if (error) {
         console.error('Failed to set PasteData. Cause: ' + JSON.stringify(error))
         res = {
@@ -37,12 +49,8 @@ export const setClipboardData: typeof Taro.setClipboardData = function (options)
           error: error
         }
         callAsyncFail(reject, res, options)
-      } else {
-        return handle.success({
-          data,
-        }, { resolve, reject })
       }
-    })
+    }
   })
 }
 
@@ -54,7 +62,7 @@ export const getClipboardData: typeof Taro.getClipboardData = function (options)
   const handle = new MethodHandler({ name: 'getClipboardData', success, fail, complete })
   return new Promise((resolve, reject) => {
     const systemPasteboard = pasteboard.getSystemPasteboard()
-    systemPasteboard.getPasteData((error, pasteData) => { // callback 形式调用异步接口
+    systemPasteboard.getData((error, pasteData) => { // callback 形式调用异步接口
       if (error) {
         console.error('Failed to obtain PasteData. Cause: ' + JSON.stringify(error))
         return handle.fail({

package/dist/apis/index.ts

@@ -62,7 +62,6 @@ let displayWidth = display.width
 let ratioCache: number | false = false
 let designWidthFunc: (input: number) => number
 let designWidth = defaultDesignWidth
-let deviceRatio = defaultDesignRatio
 function getRatio (value: number) {
   // Note: 提前调用 display 可能无法获取正确值
   if (ratioCache === false || displayWidth !== display.width) {
@@ -72,13 +71,9 @@ function getRatio (value: number) {
         ? config.designWidth
         : () => config.designWidth
       designWidth = designWidthFunc(value) || defaultDesignWidth
-      deviceRatio = config.deviceRatio || defaultDesignRatio
-      if (!(designWidth in deviceRatio)) {
-        throw new Error(`deviceRatio 配置中不存在 ${designWidth} 的设置！`)
-      }
     }
     displayWidth = display.width
-    ratioCache = Math.min(display.width, display.height) / designWidth / deviceRatio[designWidth]
+    ratioCache = Math.min(display.width, display.height) / designWidth
   }
 
   return ratioCache
@@ -113,6 +108,7 @@ export function pxTransform (size: number): number | string {
   switch (targetUnit) {
     case 'vp':
       return pxTransformHelper(size, 'px')
+      // return `${size}lpx`
     default:
       // NOTE: 鸿蒙环境下 style 会自动完成设计稿转换，无需在方法内二次调整
   }

package/dist/apis/media/image/index.ts

@@ -112,7 +112,7 @@ export const chooseImage: typeof Taro.chooseImage = function (options) {
     photoSelectOptions.MIMEType = picker.PhotoViewMIMETypes.IMAGE_TYPE // 过滤选择媒体文件类型为IMAGE
 
     photoViewPicker.select(photoSelectOptions).then((photoSelectResult) => {
-      callAsyncSuccess(resolve, { tempFilePaths: photoSelectResult.photoUris })
+      callAsyncSuccess(resolve, { tempFilePaths: photoSelectResult.photoUris }, options)
     }).catch((error) => {
       callAsyncFail(reject, error, options)
     })

package/dist/apis/storage/index.ts

@@ -3,8 +3,7 @@
  * https://developer.harmonyos.com/cn/docs/documentation/doc-references-V3/js-apis-data-preferences-0000001427745052-V3
 */
 import bundleManager from '@ohos.bundle.bundleManager'
-import dataPreferences from '@ohos.data.preferences'
-import hilog from '@ohos.hilog'
+import distributedKVStore from '@ohos.data.distributedKVStore'
 import { Current } from '@tarojs/runtime'
 
 import { temporarilyNotSupport, validateParams } from '../utils'
@@ -13,25 +12,50 @@ import { MethodHandler } from '../utils/handler'
 import type Taro from '@tarojs/taro/types'
 
 let context
-let preferences: any
+let kvManager: distributedKVStore.KVManager
+let kvStore: distributedKVStore.SingleKVStore
+let kvStorePromise: Promise<void>
 
 (Current as any).contextPromise.then((ctx) => {
   context = ctx
-  return context
-})
+  const kvManagerConfig: distributedKVStore.KVManagerConfig = {
+    context: context,
+    bundleName: 'com.example.taro'
+  }
 
-function getPreferences () {
   try {
-    if (!preferences && context) {
-      const data = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION)
-      preferences = dataPreferences.getPreferencesSync(context, { name: `${data.appInfo.uid}Store` })
+    // 创建KVManager实例
+    kvManager = distributedKVStore.createKVManager(kvManagerConfig)
+    // 继续创建获取数据库
+    const options: distributedKVStore.Options = {
+      createIfMissing: true,
+      encrypt: false,
+      backup: false,
+      autoSync: false,
+      // kvStoreType不填时，默认创建多设备协同数据库
+      kvStoreType: distributedKVStore.KVStoreType.SINGLE_VERSION,
+      // 多设备协同数据库：kvStoreType: distributedKVStore.KVStoreType.DEVICE_COLLABORATION,
+      securityLevel: distributedKVStore.SecurityLevel.S1
     }
-  } catch (error) {
-    hilog.error(0x0000, 'TaroFailedTag', 'Failed to load the storage. Cause: %{public}s', error.code ? JSON.stringify(error) : error.message || error)
+
+    const data = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION)
+    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}`)
   }
 
-  return preferences
-}
+  return context
+})
 
 const storageSchema = {
   key: 'String'
@@ -71,52 +95,27 @@ 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 })
-    }
+    kvStorePromise.then(() => {
+      try {
+        validateParams(name, options, storageSchema)
+      } catch (error) {
+        const res = { errMsg: error.message }
+        return handle.fail(res, { resolve, reject })
+      }
 
-    const preferences = getPreferences()
-    
-    if (!preferences) return handle.fail({}, { 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
+        }
 
-    const data = preferences.getSync(key, null)
-    if (data) {
-      return handle.success({ data }, { resolve, reject })
-    } else {
-      return handle.success({ errMsg: 'data not found' }, { resolve, reject })
-    }
+        handle.success({ data }, { resolve, reject })
+      })
+    })
   })
 }
 
-export function getStorageSync (key: string) {
-  const name = 'getStorageSync'
-  const { isExist, error } = checkContextExist(name, false)
-
-  if (!isExist) {
-    return error
-  }
-
-  if (!key) {
-    throw new Error(`${name}:fail parameter error: parameter should be String`)
-  }
-
-  const preferences = getPreferences()
-  
-  if (!preferences) {
-    throw new Error(`${name}:fail:preferences is null`)
-  }
-
-  const data = preferences.getSync(key, null)
-  if (data) {
-    return data
-  } else {
-    throw new Error('data not found')
-  }
-}
-
 export function setStorage (options: Taro.setStorage.Option) {
   const name = 'setStorage'
   const { isExist, error } = checkContextExist(name, true)
@@ -129,46 +128,27 @@ 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 })
-    }
-
-    const preferences = getPreferences()
-
-    if (!preferences) return handle.fail({}, { resolve, reject })
+    kvStorePromise.then(() => {
+      try {
+        validateParams(name, options, storageSchema)
+      } catch (error) {
+        const res = { errMsg: error.message }
+        return handle.fail(res, { resolve, reject })
+      }
 
-    preferences.putSync(key, data)
-    preferences.flush()
+      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
+        }
 
-    return handle.success({}, { resolve, reject })
+        handle.success({}, { resolve, reject })
+      })
+    })
   })
 }
 
-export function setStorageSync (key: string, data: any) {
-  const name = 'setStorageSync'
-  const { isExist, error } = checkContextExist(name, false)
-
-  if (!isExist) {
-    return error
-  }
-
-  if (!key) {
-    throw new Error(`${name}:fail key error: key should be String`)
-  }
-
-  const preferences = getPreferences()
-  
-  if (!preferences) {
-    throw new Error(`${name}:fail:preferences is null`)
-  }
-
-  preferences.putSync(key, data)
-  preferences.flush()
-}
-
 export function removeStorage (options: Taro.removeStorage.Option) {
   const name = 'removeStorage'
   const { isExist, error } = checkContextExist(name, true)
@@ -181,87 +161,27 @@ 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 })
-    }
-
-    const preferences = getPreferences()
-
-    if (!preferences) return handle.fail({}, { resolve, reject })
-
-    preferences.deleteSync(key)
-    preferences.flush()
-
-    return handle.success({}, { resolve, reject })
-  })
-}
-
-export function removeStorageSync (key: string) {
-  const name = 'removeStorageSync'
-  const { isExist, error } = checkContextExist(name, false)
-
-  if (!isExist) {
-    return error
-  }
-
-  if (!key) {
-    throw new Error(`${name}:fail key error: key should be String`)
-  }
-
-  const preferences = getPreferences()
-  
-  if (!preferences) {
-    throw new Error(`${name}:fail:preferences is null`)
-  }
-
-  preferences.deleteSync(key)
-  preferences.flush()
-}
-
-export function clearStorage (options: Taro.clearStorage.Option) {
-  const name = 'clearStorage'
-  const { isExist, error } = checkContextExist(name, true)
-
-  if (!isExist) {
-    return error
-  }
-
-  const { success, fail, complete } = options || {}
-  const handle = new MethodHandler({ name, success, fail, complete })
-
-  return new Promise((resolve, reject) => {
-    const preferences = getPreferences()
+    kvStorePromise.then(() => {
+      try {
+        validateParams(name, options, storageSchema)
+      } catch (error) {
+        const res = { errMsg: error.message }
+        return handle.fail(res, { resolve, reject })
+      }
 
-    if (!preferences) return handle.fail({}, { 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
+        }
 
-    preferences.clearSync()
-    preferences.flush()
-    
-    return handle.success({}, { resolve, reject })
+        handle.success({}, { resolve, reject })
+      })
+    })
   })
 }
 
-export function clearStorageSync () {
-  const name = 'clearStorageSync'
-  const { isExist, error } = checkContextExist(name, false)
-
-  if (!isExist) {
-    return error
-  }
-
-  const preferences = getPreferences()
-  
-  if (!preferences) {
-    throw new Error(`${name}:fail:preferences is null`)
-  }
-
-  preferences.clearSync()
-  preferences.flush()
-}
-
 export const getStorageInfoSync = temporarilyNotSupport('getStorageInfoSync')
 export const getStorageInfo = temporarilyNotSupport('getStorageInfo')
 
@@ -273,5 +193,11 @@ export const batchSetStorage = /* @__PURE__ */ temporarilyNotSupport('batchSetSt
 export const batchGetStorageSync = /* @__PURE__ */ temporarilyNotSupport('batchGetStorageSync')
 export const batchGetStorage = /* @__PURE__ */ temporarilyNotSupport('batchGetStorage')
 
+export const clearStorage = temporarilyNotSupport('clearStorage')
+export const getStorageSync = temporarilyNotSupport('getStorageSync', 'getStorage')
+export const setStorageSync = temporarilyNotSupport('setStorageSync', 'setStorage')
+export const clearStorageSync = temporarilyNotSupport('clearStorageSync', 'clearStorage')
+export const removeStorageSync = temporarilyNotSupport('removeStorageSync', 'removeStorage')
+
 export * from './background-fetch'
 export * from './cache-manager'

package/dist/apis/ui/animation/animation.ts

@@ -23,7 +23,6 @@ type TStep = {
 type TRule = Record<string, any>
 
 export class Animation implements Taro.Animation {
-
   unit: string
   DEFAULT: IAnimationAttr
 
@@ -72,6 +71,9 @@ export class Animation implements Taro.Animation {
       transformOrigin,
       rule: Object.assign({}, this.rule)
     })
+    if (this.rule.transform) {
+      this.rule.transform = Object.assign({}, this.rule.transform)
+    }
     return this
   }
 
@@ -86,92 +88,137 @@ export class Animation implements Taro.Animation {
   }
 
   rotate (angle: number): Taro.Animation {
-    this.rule.rotate = { x: 0, y: 0, z: 1, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x: 0, y: 0, z: 1, angle }
     return this
   }
 
   rotate3d (x: number, y?: number | undefined, z?: number | undefined, angle?: number | undefined): Taro.Animation {
-    this.rule.rotate = { x, y, z, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x, y, z, angle }
     return this
   }
 
   rotateX (angle: number): Taro.Animation {
-    this.rule.rotate = { x: 1, y: 0, z: 0, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x: 1, y: 0, z: 0, angle }
     return this
   }
 
   rotateY (angle: number): Taro.Animation {
-    this.rule.rotate = { x: 0, y: 1, z: 0, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x: 0, y: 1, z: 0, angle }
     return this
   }
 
   rotateZ (angle: number): Taro.Animation {
-    this.rule.rotate = { x: 0, y: 0, z: 1, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x: 0, y: 0, z: 1, angle }
     return this
   }
 
   scale (sx: number, sy?: number | undefined): Taro.Animation {
-    this.rule.scale = { x: sx, y: isUndefined(sy) ? sx : sy }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { x: sx, y: isUndefined(sy) ? sx : sy }
     return this
   }
 
   scale3d (sx: number, sy: number, sz: number): Taro.Animation {
-    this.rule.scale = { x: sx, y: sy, z: sz }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { x: sx, y: sy, z: sz }
     return this
   }
 
   scaleX (scale: number): Taro.Animation {
-    this.rule.scale = { x: scale }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { x: scale }
     return this
   }
 
   scaleY (scale: number): Taro.Animation {
-    this.rule.scale = { y: scale }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { y: scale }
     return this
   }
 
   scaleZ (scale: number): Taro.Animation {
-    this.rule.scale = { z: scale }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { z: scale }
     return this
   }
 
   skew (ax: number, ay: number): Taro.Animation {
-    this.rule.skew = { x: ax, y: ay }
+    temporarilyNotSupport('animation.skew:' + `${ax}, ${ay}`)(ax, ay)
     return this
   }
 
   skewX (angle: number): Taro.Animation {
-    this.rule.skew = { x: angle }
+    temporarilyNotSupport('animation.skewX:' + angle)(angle)
     return this
   }
 
   skewY (angle: number): Taro.Animation {
-    this.rule.skew = { y: angle }
+    temporarilyNotSupport('animation.skewY:' + angle)(angle)
     return this
   }
 
   translate (tx?: number | undefined, ty?: number | undefined): Taro.Animation {
-    this.rule.translate = { x: tx, y: ty }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { x: tx, y: ty }
     return this
   }
 
   translate3d (tx?: number | undefined, ty?: number | undefined, tz?: number | undefined): Taro.Animation {
-    this.rule.translate = { x: tx, y: ty, z: tz }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { x: tx, y: ty, z: tz }
     return this
   }
 
   translateX (translation: number): Taro.Animation {
-    this.rule.translate = { x: translation }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { x: translation }
     return this
   }
 
   translateY (translation: number): Taro.Animation {
-    this.rule.translate = { y: translation }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { y: translation }
     return this
   }
 
   translateZ (translation: number): Taro.Animation {
-    this.rule.translate = { z: translation }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { z: translation }
     return this
   }
 
@@ -186,23 +233,17 @@ export class Animation implements Taro.Animation {
   }
 
   width (value: string | number): Taro.Animation {
-    this.rule.size = {
-      ...this.rule.size,
-      width: value
-    }
+    this.rule.width = value
     return this
   }
 
   height (value: string | number): Taro.Animation {
-    this.rule.size = {
-      ...this.rule.size,
-      height: value
-    }
+    this.rule.height = value
     return this
   }
 
   left (value: string | number): Taro.Animation {
-    temporarilyNotSupport('animation.left:' + value)(value)
+    this.rule.left = value
     return this
   }
 
@@ -212,7 +253,7 @@ export class Animation implements Taro.Animation {
   }
 
   top (value: string | number): Taro.Animation {
-    temporarilyNotSupport('animation.top:' + value)(value)
+    this.rule.top = value
     return this
   }
 

package/dist/apis/ui/background.ts

@@ -11,7 +11,8 @@ export function setBackgroundColor(options: Taro.setBackgroundColor.Option) {
 
   return new Promise((resolve, reject) => {
     eventCenter.trigger('__taroPageStyle', {
-      backgroundColor: options.backgroundColor || options.backgroundColorTop || options.backgroundColorBottom,
+      backgroundColor: options.backgroundColorBottom || options.backgroundColor,
+      backgroundColorContext: options.backgroundColorTop || options.backgroundColor
     })
 
     return handle.success({}, { resolve, reject })