@tarojs/plugin-platform-harmony-ets 4.0.0-beta.40 → 4.0.0-beta.41

package/dist/apis/index.ts

@@ -78,7 +78,7 @@ function getRatio (value: number) {
       }
     }
     displayWidth = display.width
-    ratioCache = Math.min(display.width, display.height) / designWidth / deviceRatio[designWidth]
+    ratioCache = Math.min(display.width, display.height) / designWidth
   }
 
   return ratioCache
@@ -112,8 +112,8 @@ export function pxTransform (size: number): number | string {
   const val = size
   switch (targetUnit) {
     case 'vp':
-      // return pxTransformHelper(size, 'px')
-      return `${size}lpx`
+      return pxTransformHelper(size, 'px')
+      // return `${size}lpx`
     default:
       // NOTE: 鸿蒙环境下 style 会自动完成设计稿转换，无需在方法内二次调整
   }

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,32 +12,53 @@ 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
 
 (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)
+    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
+      // 请确保获取到键值数据库实例后，再进行相关数据操作
+    })
+  } catch (e) {
+    console.error(`Failed to create KVManager. Code:${e.code},message:${e.message}`)
   }
 
-  return preferences
-}
+  return context
+})
 
 const storageSchema = {
   key: 'String'
 }
 
 function checkContextExist (api: string, isAsync = false) {
-  if (!context) {
+  if (!context || !kvStore) {
     const message = `${api} 调用失败，Taro 不支持过早地调用 ${api}，请确保页面已经渲染完成再调用此 API`
     if (isAsync) {
       return {
@@ -78,45 +98,18 @@ export function getStorage<T = any> (options: Taro.getStorage.Option<T>) {
       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)
@@ -136,39 +129,18 @@ export function setStorage (options: Taro.setStorage.Option) {
       return handle.fail(res, { resolve, reject })
     }
 
-    const preferences = getPreferences()
-
-    if (!preferences) return handle.fail({}, { 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)
@@ -188,80 +160,18 @@ export function removeStorage (options: Taro.removeStorage.Option) {
       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()
-
-    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 +183,11 @@ 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 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/components-harmony-ets/scrollView.ets

@@ -1,6 +1,6 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { rowModify, columnModify } from './style'
+import commonStyleModify from './style'
 import PseduoChildren from './pseudo'
 import { FlexManager } from './utils/flexManager'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
@@ -70,9 +70,13 @@ export default struct TaroScrollView {
     }
   }
 
+  isScrollX() {
+    return this.node._attrs.scrollX || getStyleAttr(this.node, 'overflow') === 'scroll' && getStyleAttr(this.node, 'flexDirection') === FlexDirection.Row
+  }
+
   build () {
     Scroll(this.node.scroller) {
-      if (this.node._attrs.scrollX) {
+      if (this.isScrollX()) {
         Row() {
           if (this.node._pseudo_before || this.node._pseudo_after) {
             PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
@@ -80,7 +84,9 @@ export default struct TaroScrollView {
             this.createLazyChildren(this.node)
           }
         }
-        .attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+        .alignItems(FlexManager.alignItems<VerticalAlign>(this.node))
+        .justifyContent(FlexManager.justifyContent(this.node))
+        .height(getStyleAttr(this.node, 'height'))
         .width(null)
         .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
           this.node._nodeInfo._scroll = areaResult
@@ -94,20 +100,21 @@ export default struct TaroScrollView {
             this.createLazyChildren(this.node)
           }
         }
-        .attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+        .alignItems(FlexManager.alignItems<HorizontalAlign>(this.node))
+        .justifyContent(FlexManager.justifyContent(this.node))
+        .width(getStyleAttr(this.node, 'width'))
         .height(null)
-        .alignItems(HorizontalAlign.Start)
         .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
           this.node._nodeInfo._scroll = areaResult
         }, this.node, ['scroll', 'scrollstart', 'scrollend']))
         .flexGrow(0).flexShrink(0)
       }
     }
-    .width(getStyleAttr(this.node, 'width'))
-    .height(getStyleAttr(this.node, 'height'))
+    .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+    .width(this.isScrollX() ? getStyleAttr(this.node, 'width') : undefined)
+    .height(!this.isScrollX() ? getStyleAttr(this.node, 'height') : undefined)
     .align(Alignment.TopStart)
-    .flexGrow(this.node.hmStyle?.flexGrow)
-    .flexShrink(this.node.hmStyle?.flexShrink)
+    .clip(true)
     .scrollable(getScrollable(this.node))
     .scrollBar(getAttributes(this.node).scrollBar)
     .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))

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

@@ -116,9 +116,6 @@ class RowStyleModify extends CommonStyleModify {
       if (this.node) {
         instance.alignItems(FlexManager.alignItems<VerticalAlign>(this.node))
         instance.justifyContent(FlexManager.justifyContent(this.node))
-        if (this.node._st.hmStyle.overflow === 'scroll') {
-          instance.height('100%')
-        }
       }
     }
 
@@ -139,9 +136,6 @@ class ColumnStyleModify extends CommonStyleModify {
       if (this.node) {
         instance.alignItems(FlexManager.alignItems<HorizontalAlign>(this.node))
         instance.justifyContent(FlexManager.justifyContent(this.node))
-        if (this.node._st.hmStyle.overflow === 'scroll') {
-          instance.width('100%')
-        }
       }
     }
 
@@ -346,39 +340,6 @@ export function setNormalAttributeIntoInstance(instance: CommonAttribute, style:
   if (!isUndefined(style.overflow)) {
     instance.clip(style.overflow === 'hidden')
   }
-  // if (!isUndefined(style.transformOrigin)) {
-  //   instance.rotate({ centerX: style.transformOrigin.x, centerY: style.transformOrigin.y, angle: 0 })
-  //   instance.scale({ centerX: style.transformOrigin.x, centerY: style.transformOrigin.y })
-  // }
-  // // Note: 移植到setAnimationAttributeIntoInstance设置
-  // 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: 0
-  //     })
-  //   }
-  // }
   if (style.position === 'absolute' || style.position === 'fixed') {
     instance.position({
       x: style.left || 0,

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

@@ -13,6 +13,8 @@ interface SwiperAttrs {
   vertical?: boolean
   autoPlay?: boolean
   indicator?: boolean
+  nextMargin?: Length
+  prevMargin?: Length
 }
 
 @Extend(Swiper)
@@ -24,6 +26,8 @@ function swiperAttr (attr: SwiperAttrs) {
   .vertical(attr.vertical)
   .autoPlay(attr.autoPlay)
   .indicator(attr.indicator)
+  .nextMargin(attr.nextMargin)
+  .prevMargin(attr.prevMargin)
 }
 
 function getSwiperAttributes (node: TaroSwiperElement): SwiperAttrs {
@@ -36,6 +40,8 @@ function getSwiperAttributes (node: TaroSwiperElement): SwiperAttrs {
   swiperAttrs.vertical = _attrs.vertical || false
   swiperAttrs.autoPlay = _attrs.autoplay || false
   swiperAttrs.indicator = _attrs.indicatorDots || false
+  swiperAttrs.nextMargin = _attrs.nextMargin || 0
+  swiperAttrs.prevMargin = _attrs.previousMargin || 0
   return swiperAttrs
 }
 

package/dist/runtime-ets/bom/getComputedStyle.ts

@@ -1,5 +1,5 @@
-import { TaroElement } from '../dom/element/element'
+// import { TaroElement } from '../dom/element/element'
 
-export function getComputedStyle (node: TaroElement) {
+export function getComputedStyle (node: any) {
   return node._st
 }

package/dist/runtime-ets/dom/stylesheet/type.ts

@@ -132,7 +132,7 @@ export namespace HarmonyType {
     repeating?: boolean
   }
   export interface RadialGradient {
-    center: Point
+    center: any
     radius: number | string
     colors: Array<[ResourceColor, number]>
     repeating?: boolean

package/dist/runtime-utils.d.ts

@@ -502,13 +502,8 @@ declare namespace apis {
     /** 验证私密消息。 */
     const authPrivateMessage: (option?: {}, ...args: any[]) => Promise<ICallbackResult & Record<string, unknown>>;
     function getStorage<T = any>(options: Taro.getStorage.Option<T>): Promise<unknown> | undefined;
-    function getStorageSync(key: string): any;
     function setStorage(options: Taro.setStorage.Option): Promise<unknown> | undefined;
-    function setStorageSync(key: string, data: any): Promise<never> | undefined;
     function removeStorage(options: Taro.removeStorage.Option): Promise<unknown> | undefined;
-    function removeStorageSync(key: string): Promise<never> | undefined;
-    function clearStorage(options: Taro.clearStorage.Option): Promise<unknown> | undefined;
-    function clearStorageSync(): Promise<never> | undefined;
     const getStorageInfoSync: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
     const getStorageInfo: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
     const createBufferURL: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
@@ -517,6 +512,11 @@ declare namespace apis {
     const batchSetStorage: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
     const batchGetStorageSync: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
     const batchGetStorage: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
+    const clearStorage: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
+    const getStorageSync: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
+    const setStorageSync: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
+    const clearStorageSync: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
+    const removeStorageSync: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
     const setBackgroundFetchToken: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
     const onBackgroundFetchData: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
     const getBackgroundFetchToken: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;