@tarojs/plugin-platform-harmony-ets 4.0.0-alpha.3 → 4.0.0-alpha.31

package/dist/apis/storage/index.ts

@@ -3,114 +3,181 @@
  * 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 { callAsyncFail, callAsyncSuccess, temporarilyNotSupport, validateParams } from '../utils'
+import { temporarilyNotSupport, validateParams } from '../utils'
+import { MethodHandler } from '../utils/handler'
 
 import type Taro from '@tarojs/taro/types'
 
-const preferencesPromise = (Current as any).contextPromise
-  .then((context) => {
-    return bundleManager
-      .getBundleInfoForSelf(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION)
-      .then(data => {
-        return dataPreferences
-          .getPreferences(context, `${data.appInfo.uid}Store`)
-      })
-  })
-  .catch((error) => {
-    hilog.error(0x0000, 'TaroFailedTag', 'Failed to load the storage. Cause: %{public}s', error.code ? JSON.stringify(error) : error.message || error)
-  })
+let context
+let kvManager: distributedKVStore.KVManager
+let kvStore: distributedKVStore.SingleKVStore
+let kvStorePromise: Promise<void>
+
+(Current as any).contextPromise.then((ctx) => {
+  context = ctx
+  const kvManagerConfig: distributedKVStore.KVManagerConfig = {
+    context: context,
+    bundleName: 'com.example.taro'
+  }
 
-async function getItem (key: string): Promise<{ result: boolean, data?: number | string | boolean }> {
   try {
-    const preferences = await preferencesPromise
-    const item = await preferences.get(key, null)
+    // 创建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
+    }
 
-    return { result: true, data: item }
-  } catch (error) {
-    return { result: false }
+    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 context
+})
 
 const storageSchema = {
   key: 'String'
 }
 
+function checkContextExist (api: string, isAsync = false) {
+  if (!context) {
+    const message = `${api} 调用失败，Taro 不支持过早地调用 ${api}，请确保页面已经渲染完成再调用此 API`
+    if (isAsync) {
+      return {
+        isExist: false,
+        error: Promise.reject(new Error(message))
+      }
+    } else {
+      console.warn(message)
+
+      return {
+        isExist: false,
+      }
+    }
+  }
+
+  return {
+    isExist: true,
+  }
+}
+
 export function getStorage<T = any> (options: Taro.getStorage.Option<T>) {
+  const name = 'getStorage'
+  const { isExist, error } = checkContextExist(name, true)
+
+  if (!isExist) {
+    return error
+  }
+
+  const { key, success, fail, complete } = options || {}
+  const handle = new MethodHandler<{data: any}>({ name, success, fail, complete })
+
   return new Promise((resolve, reject) => {
-    try {
-      validateParams('getStorage', options, storageSchema)
-    } catch (error) {
-      const res = { errMsg: error.message }
-      return callAsyncFail(reject, res, options)
-    }
-    getItem(options.key).then(({ result, data }) => {
-      const res: Record<string, any> = { errMsg: 'getStorage:ok' }
-
-      if (result) {
-        res.data = data
-        callAsyncSuccess(resolve, res, options)
-      } else {
-        res.errMsg = 'getStorage:fail data not found'
-        callAsyncFail(reject, res, options)
+    kvStorePromise.then(() => {
+      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
+        }
+
+        handle.success({ data }, { resolve, reject })
+      })
     })
   })
 }
 
 export function setStorage (options: Taro.setStorage.Option) {
-  return new Promise((resolve, reject) => {
-    try {
-      validateParams('setStorage', options, storageSchema)
-    } catch (error) {
-      const res = { errMsg: error.message }
-      return callAsyncFail(reject, res, options)
-    }
+  const name = 'setStorage'
+  const { isExist, error } = checkContextExist(name, true)
+
+  if (!isExist) {
+    return error
+  }
 
-    const { key, data } = options
-    const res = { errMsg: 'setStorage:ok' }
+  const { key, data, success, fail, complete } = options || {}
+  const handle = new MethodHandler({ name, success, fail, complete })
+
+  return new Promise((resolve, reject) => {
+    kvStorePromise.then(() => {
+      try {
+        validateParams(name, options, storageSchema)
+      } catch (error) {
+        const res = { errMsg: error.message }
+        return handle.fail(res, { resolve, reject })
+      }
 
-    preferencesPromise.then(async (preferences) => {
-      await preferences.put(key, data)
-      await 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
+        }
 
-      callAsyncSuccess(resolve, res, options)
+        handle.success({}, { resolve, reject })
+      })
     })
   })
 }
 
 export function removeStorage (options: Taro.removeStorage.Option) {
-  return new Promise((resolve, reject) => {
-    try {
-      validateParams('removeStorage', options, storageSchema)
-    } catch (error) {
-      const res = { errMsg: error.message }
-      return callAsyncFail(reject, res, options)
-    }
+  const name = 'removeStorage'
+  const { isExist, error } = checkContextExist(name, true)
 
-    const { key } = options
+  if (!isExist) {
+    return error
+  }
 
-    preferencesPromise.then(async (preferences) => {
-      await preferences.delete(key)
-      await preferences.flush()
+  const { key, success, fail, complete } = options || {}
+  const handle = new MethodHandler({ name, success, fail, complete })
 
-      const res = { errMsg: 'removeStorage:ok' }
-      callAsyncSuccess(resolve, res, options)
-    })
-  })
-}
+  return new Promise((resolve, reject) => {
+    kvStorePromise.then(() => {
+      try {
+        validateParams(name, options, storageSchema)
+      } catch (error) {
+        const res = { errMsg: error.message }
+        return handle.fail(res, { resolve, reject })
+      }
 
-export function clearStorage (options: Taro.clearStorage.Option) {
-  return new Promise(resolve => {
-    preferencesPromise.then(async (preferences) => {
-      await preferences.clear()
-      await preferences.flush()
+      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
+        }
 
-      const res = { errMsg: 'clearStorage:ok' }
-      callAsyncSuccess(resolve, res, options)
+        handle.success({}, { resolve, reject })
+      })
     })
   })
 }
@@ -118,11 +185,6 @@ export function clearStorage (options: Taro.clearStorage.Option) {
 export const getStorageInfoSync = temporarilyNotSupport('getStorageInfoSync')
 export const getStorageInfo = temporarilyNotSupport('getStorageInfo')
 
-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 const createBufferURL = /* @__PURE__ */ temporarilyNotSupport('createBufferURL')
 export const revokeBufferURL = /* @__PURE__ */ temporarilyNotSupport('revokeBufferURL')
 
@@ -131,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

@@ -1,4 +1,5 @@
 import matrix4 from '@ohos.matrix4'
+import { isUndefined } from '@tarojs/shared'
 
 import { temporarilyNotSupport } from '../../utils'
 
@@ -22,7 +23,6 @@ type TStep = {
 type TRule = Record<string, any>
 
 export class Animation implements Taro.Animation {
-
   unit: string
   DEFAULT: IAnimationAttr
 
@@ -71,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
   }
 
@@ -85,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: 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
   }
 
@@ -185,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
   }
 
@@ -211,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 })

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,10 +29,11 @@ export function showToast (options) {
       return callAsyncFail(reject, res, options)
     }
 
-    prompt.showToast({
+    promptAction.showToast({
       message: options.title,
       duration: options.duration,
-      bottom: options.bottom
+      bottom: options.bottom,
+      showMode: 1 // 设置弹窗显示模式，显示在应用之上。
     })
     callAsyncSuccess(resolve, resCallback('showToast'), options)
   })
@@ -72,37 +73,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 +96,19 @@ export function showModal (options) {
           },
           options
         )
+      } else {
+        callAsyncSuccess(
+          resolve,
+          {
+            ...resCallback('showModal'),
+            confirm: true,
+            cancel: false,
+            content: null
+          },
+          options
+        )
       }
-    }
-
-    prompt.showDialog(modalOptions)
+    })
   })
 }
 
@@ -152,45 +145,35 @@ 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,
           {
             ...data,
-            errMsg: data.errMsg.replace('showActionMenu', 'showActionSheet')
+            errMsg: data.errMsg?.replace('showActionMenu', 'showActionSheet')
           },
           options
         )
       }
-    }
 
-    prompt.showActionMenu(actionSheetOptions)
-  })
-}
-
-export function hideToast (options) {
-  return new Promise(resolve => {
-    prompt.showToast({
-      message: '关闭中',
-      duration: 10,
-      bottom: '9999px'
+      callAsyncSuccess(
+        resolve,
+        {
+          ...data,
+          ...resCallback('showActionSheet')
+        },
+        options
+      )
     })
-    callAsyncSuccess(resolve, resCallback('hideToast'), options)
   })
 }
 
+export const hideToast = /* @__PURE__ */ temporarilyNotSupport('hideToast')
+
 export const showLoading = temporarilyNotSupport('showLoading')
 export const hideLoading = temporarilyNotSupport('hideLoading')
 

package/dist/apis/ui/navigation-bar/index.ts

@@ -19,7 +19,7 @@ export const setNavigationBarTitle: typeof Taro.setNavigationBarTitle = function
 
 export const setNavigationBarColor: typeof Taro.setNavigationBarColor = function (options) {
   const { success, fail, complete } = options || {}
-  const handle = new MethodHandler({ name: 'setNavigationBarTitle', success, fail, complete })
+  const handle = new MethodHandler({ name: 'setNavigationBarColor', success, fail, complete })
 
   return new Promise((resolve, reject) => {
     eventCenter.trigger('__taroNavigationStyle', {