@tarojs/plugin-platform-harmony-ets 4.0.0-beta.30 → 4.0.0-beta.32

package/dist/apis/index.ts

@@ -105,19 +105,18 @@ export function pxTransformHelper (size: number, unit?: string, isNumber = false
   return isNumber ? val : val + targetUnit
 }
 
-export function pxTransform (size: number): number {
+export function pxTransform (size: number): number | string {
   const config = (Current as any).taro?.config || {}
   const targetUnit = config.targetUnit || defaultTargetUnit
 
-  let val = size
+  const val = size
   switch (targetUnit) {
     case 'vp':
-      val = px2vp(size)
-      break
+      return pxTransformHelper(size, 'px')
     default:
       // NOTE: 鸿蒙环境下 style 会自动完成设计稿转换，无需在方法内二次调整
   }
-  return val + config.targetUnit
+  return val + targetUnit
 }
 
 export function canIUseWebp () {

package/dist/apis/storage/index.ts

@@ -22,7 +22,7 @@ let preferences: any
 
 function getPreferences () {
   try {
-    if (!preferences) {
+    if (!preferences && context) {
       const data = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION)
       preferences = dataPreferences.getPreferencesSync(context, { name: `${data.appInfo.uid}Store` })
     }
@@ -37,13 +37,42 @@ 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: 'getStorage', success, fail, complete })
+  const handle = new MethodHandler<{data: any}>({ name, success, fail, complete })
 
   return new Promise((resolve, reject) => {
     try {
-      validateParams('getStorage', options, storageSchema)
+      validateParams(name, options, storageSchema)
     } catch (error) {
       const res = { errMsg: error.message }
       return handle.fail(res, { resolve, reject })
@@ -63,14 +92,21 @@ export function getStorage<T = any> (options: Taro.getStorage.Option<T>) {
 }
 
 export function getStorageSync (key: string) {
+  const name = 'getStorageSync'
+  const { isExist, error } = checkContextExist(name, false)
+
+  if (!isExist) {
+    return error
+  }
+
   if (!key) {
-    throw new Error('getStorageSync:fail parameter error: parameter should be String')
+    throw new Error(`${name}:fail parameter error: parameter should be String`)
   }
 
   const preferences = getPreferences()
   
   if (!preferences) {
-    throw new Error('getStorageSync:fail:preferences is null')
+    throw new Error(`${name}:fail:preferences is null`)
   }
 
   const data = preferences.getSync(key, null)
@@ -82,12 +118,19 @@ export function getStorageSync (key: string) {
 }
 
 export function setStorage (options: Taro.setStorage.Option) {
+  const name = 'setStorage'
+  const { isExist, error } = checkContextExist(name, true)
+
+  if (!isExist) {
+    return error
+  }
+
   const { key, data, success, fail, complete } = options || {}
-  const handle = new MethodHandler({ name: 'setStorage', success, fail, complete })
+  const handle = new MethodHandler({ name, success, fail, complete })
 
   return new Promise((resolve, reject) => {
     try {
-      validateParams('setStorage', options, storageSchema)
+      validateParams(name, options, storageSchema)
     } catch (error) {
       const res = { errMsg: error.message }
       return handle.fail(res, { resolve, reject })
@@ -105,14 +148,21 @@ export function setStorage (options: Taro.setStorage.Option) {
 }
 
 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('setStorageSync:fail key error: key should be String')
+    throw new Error(`${name}:fail key error: key should be String`)
   }
 
   const preferences = getPreferences()
   
   if (!preferences) {
-    throw new Error('setStorageSync:fail:preferences is null')
+    throw new Error(`${name}:fail:preferences is null`)
   }
 
   preferences.putSync(key, data)
@@ -120,12 +170,19 @@ export function setStorageSync (key: string, data: any) {
 }
 
 export function removeStorage (options: Taro.removeStorage.Option) {
+  const name = 'removeStorage'
+  const { isExist, error } = checkContextExist(name, true)
+
+  if (!isExist) {
+    return error
+  }
+
   const { key, success, fail, complete } = options || {}
-  const handle = new MethodHandler({ name: 'removeStorage', success, fail, complete })
+  const handle = new MethodHandler({ name, success, fail, complete })
 
   return new Promise((resolve, reject) => {
     try {
-      validateParams('removeStorage', options, storageSchema)
+      validateParams(name, options, storageSchema)
     } catch (error) {
       const res = { errMsg: error.message }
       return handle.fail(res, { resolve, reject })
@@ -143,14 +200,21 @@ export function removeStorage (options: Taro.removeStorage.Option) {
 }
 
 export function removeStorageSync (key: string) {
+  const name = 'removeStorageSync'
+  const { isExist, error } = checkContextExist(name, false)
+
+  if (!isExist) {
+    return error
+  }
+
   if (!key) {
-    throw new Error('removeStorageSync:fail key error: key should be String')
+    throw new Error(`${name}:fail key error: key should be String`)
   }
 
   const preferences = getPreferences()
   
   if (!preferences) {
-    throw new Error('removeStorageSync:fail:preferences is null')
+    throw new Error(`${name}:fail:preferences is null`)
   }
 
   preferences.deleteSync(key)
@@ -158,8 +222,15 @@ export function removeStorageSync (key: string) {
 }
 
 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: 'clearStorage', success, fail, complete })
+  const handle = new MethodHandler({ name, success, fail, complete })
 
   return new Promise((resolve, reject) => {
     const preferences = getPreferences()
@@ -174,10 +245,17 @@ export function clearStorage (options: Taro.clearStorage.Option) {
 }
 
 export function clearStorageSync () {
+  const name = 'clearStorageSync'
+  const { isExist, error } = checkContextExist(name, false)
+
+  if (!isExist) {
+    return error
+  }
+
   const preferences = getPreferences()
   
   if (!preferences) {
-    throw new Error('clearStorageSync:fail:preferences is null')
+    throw new Error(`${name}:fail:preferences is null`)
   }
 
   preferences.clearSync()

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

@@ -36,7 +36,7 @@ class CommonStyleModify implements AttributeModifier<CommonAttribute> {
       setNormalAttributeIntoInstance(instance, this.style, this.node)
     }
 
-    setAnimationAttributeIntoInstance(instance, this.overwriteStyle)
+    setAnimationAttributeIntoInstance(instance, this.overwriteStyle, this.style || {})
   }
 }
 
@@ -69,7 +69,7 @@ class RowStyleModify extends CommonStyleModify {
       })
     }
 
-    setAnimationAttributeIntoInstance(instance, this.overwriteStyle)
+    setAnimationAttributeIntoInstance(instance, this.overwriteStyle, this.style || {})
   }
 }
 
@@ -85,29 +85,31 @@ class ColumnStyleModify extends CommonStyleModify {
       })
     }
 
-    setAnimationAttributeIntoInstance(instance, this.overwriteStyle)
+    setAnimationAttributeIntoInstance(instance, this.overwriteStyle, this.style || {})
   }
 }
 
-function setAnimationAttributeIntoInstance(instance: CommonAttribute, overwriteStyle: Record<string, TaroAny>) {
+function setAnimationAttributeIntoInstance(instance: CommonAttribute, overwriteStyle: Record<string, TaroAny>, style: TaroStyleType) {
   // Animation 需要提前和 @State 变量绑定才能产生动画效果，因此不能做 if else 判断
   instance.translate({
-    x: overwriteStyle.translate?.x,
-    y: overwriteStyle.translate?.y,
-    z: overwriteStyle.translate?.z,
-  }).scale({
-    x: overwriteStyle.scale?.x,
-    y: overwriteStyle.scale?.y,
-    z: overwriteStyle.scale?.z,
-    centerX: overwriteStyle.transformOrigin?.x,
-    centerY: overwriteStyle.transformOrigin?.y,
-  }).rotate({
-    x: overwriteStyle.rotate?.x,
-    y: overwriteStyle.rotate?.y,
-    z: overwriteStyle.rotate?.z,
-    centerX: overwriteStyle.transformOrigin?.x,
-    centerY: overwriteStyle.transformOrigin?.y,
-    angle: overwriteStyle.rotate?.angle,
+    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,
   })
 }
 
@@ -231,34 +233,35 @@ function setNormalAttributeIntoInstance(instance: CommonAttribute, style: TaroSt
   //   instance.rotate({ centerX: style.transformOrigin.x, centerY: style.transformOrigin.y, angle: 0 })
   //   instance.scale({ centerX: style.transformOrigin.x, centerY: style.transformOrigin.y })
   // }
-  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
-      })
-    }
-  }
+  // // 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/utils/styles.ets

@@ -106,14 +106,6 @@ export function getNormalAttributes (node: TaroElement, initStyle?: HarmonyStyle
     normalAttributes = ObjectAssign({}, normalAttributes, pseudoStylesheet)
   }
 
-  // taro_page 等写死在运行时里的节点，没有 _nodeInfo
-  if (node._nodeInfo) {
-    const overwriteStyle: TaroStyleType = node._nodeInfo?.overwriteStyle
-    // 处理覆盖属性：如动画的覆盖
-    if (overwriteStyle) {
-      normalAttributes = ObjectAssign({}, normalAttributes, overwriteStyle)
-    }
-  }
   // 初始化默认的值
   if (initStyle) {
     normalAttributes = ObjectAssign({}, initStyle, normalAttributes)

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

@@ -5,6 +5,15 @@ import { CSSProperties } from 'react'
 import { TaroElement } from '../element/element'
 import { BORDER_STYLE_MAP, capitalizeFirstLetter, FlexManager, getNodeMarginOrPaddingData, getUnit } from './util'
 
+// 背景解析正则
+const BACKGROUND_REGEX = {
+  IMAGE: /url\((['"])?(.*?)\1\)|(linear|radial)-gradient\([^)]*\)/,
+  COLOR: /(#[0-9a-fA-F]{3,6}|rgb\(\d+,\s*\d+,\s*\d+\)|rgba?\(\d+,\s*\d+,\s*\d+,\s*(?:0?\.\d+|\d+%)\)|transparent)/,
+  REPEAT: /(repeat-x|repeat-y|repeat|space|round|no-repeat)/,
+  POSITION: /(top|left|center|right|bottom|\d+(\.\d+)?(px|%|vw|vh)?)+/g,
+  SIZE: /(cover|contain|\d+(\.\d+)?(px|%|vw|vh)?)+/g
+}
+
 // Note: 将 web 端的 style 转换为 hm 端的 style
 export default function convertWebStyle2HmStyle(webStyle: CSSProperties, node?: TaroElement) {
   const hmStyle: Record<string, any> = node?._st?.hmStyle || {}
@@ -155,7 +164,12 @@ export default function convertWebStyle2HmStyle(webStyle: CSSProperties, node?:
         break
       }
       case 'background': {
-        // TODO： 暂未实现
+        const bg = setBackground(value)
+        if (bg['background-color']) { hmStyle.backgroundColor = bg['background-color'] }
+        bg['background-image'] && setBackgroundImage(hmStyle, bg['background-image'])
+        bg['background-repeat'] && setBackgroundRepeat(hmStyle, bg['background-repeat'])
+        bg['background-position'] && setBackgroundPosistion(hmStyle, bg['background-position'])
+        bg['background-size'] && setBackgroundSize(hmStyle, bg['background-size'])
         break
       }
       case 'backgroundColor': {
@@ -409,8 +423,11 @@ export default function convertWebStyle2HmStyle(webStyle: CSSProperties, node?:
         break
       }
       case 'transform': {
-        // todo: 需要更新
-        // hmStyle.transform = parseTransform(value)
+        hmStyle.transform = parseTransform(value)
+        break
+      }
+      case 'transformOrigin': {
+        hmStyle.transformOrigin = parseTransformOrigin(value)
         break
       }
       case 'position': {
@@ -456,6 +473,61 @@ function setBackgroundImage(hmStyle, value) {
   // todo 渐变需要处理
 }
 
+// 解析background属性
+function setBackground (backgroundValue: string) {
+  const result = {
+    'background-color': '',
+    'background-image': '',
+    'background-repeat': '',
+    'background-position': '',
+    'background-size': ''
+  }
+
+  if (!backgroundValue) return result
+
+  // 匹配background-image
+  const imageMatch = backgroundValue.match(BACKGROUND_REGEX.IMAGE)
+  if (imageMatch) {
+    result['background-image'] = imageMatch[0]
+    backgroundValue = backgroundValue.replace(imageMatch[0], '').trim()
+  }
+
+  // 匹配background-color
+  const colorMatch = backgroundValue.match(BACKGROUND_REGEX.COLOR)
+  if (colorMatch) {
+    result['background-color'] = colorMatch[0]
+    backgroundValue = backgroundValue.replace(colorMatch[0], '').trim()
+  }
+
+  // 匹配background-repeat
+  const repeatMatch = backgroundValue.match(BACKGROUND_REGEX.REPEAT)
+  if (repeatMatch) {
+    result['background-repeat'] = repeatMatch[0]
+    backgroundValue = backgroundValue.replace(repeatMatch[0], '').trim()
+  }
+
+  // 匹配background-position,background-size
+  // 先分割 / 分割出background-position\background-size
+  const positionSize = backgroundValue.split('/')
+  const [position, size] = positionSize
+  // 匹配background-position
+  if (position) {
+    const positionMatch = position.match(BACKGROUND_REGEX.POSITION)
+    if (positionMatch) {
+      result['background-position'] = positionMatch.join(' ')
+    }
+  }
+  if (size) {
+    // 匹配background-size
+    const sizeMatch = size.match(BACKGROUND_REGEX.SIZE)
+    if (sizeMatch) {
+      result['background-size'] = sizeMatch.join(' ')
+    }
+  }
+
+  return result
+}
+
 function setBackgroundRepeat(hmStyle, value) {
   if (typeof value === 'string') {
     switch (value) {
@@ -469,6 +541,13 @@ function setBackgroundRepeat(hmStyle, value) {
 
 function setBackgroundSize(hmStyle, value) {
   if (typeof value === 'string') {
+    if (value === 'cover') {
+      hmStyle.backgroundSize = ImageSize.Cover
+      return
+    } else if (value === 'contain') {
+      hmStyle.backgroundSize = ImageSize.Contain
+      return
+    }
     const sizes = value.split(' ')
     if (sizes.length === 1) {
       hmStyle.backgroundSize = { width: getUnit(sizes[0]) }
@@ -482,7 +561,7 @@ function setBackgroundPosistion (hmStyle, value) {
   if (typeof value === 'string') {
     const positions = value.split(' ')
     const horizontal = positions[0].toLowerCase()
-    const vertical = positions[1].toLowerCase() || 'top'
+    const vertical = positions[1]?.toLowerCase() || 'top'
 
     if (horizontal === 'left' && vertical === 'top') {
       hmStyle.backgroundPosition = Alignment.TopStart
@@ -526,12 +605,12 @@ function setFontWeight (hmStyle, value) {
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function parseTransform(transformString) {
   const transformRegex = /(\w+)\(([^)]+)\)/g
-  const transforms = []
+  const transform = {}
 
   let matchs
   while ((matchs = transformRegex.exec(transformString)) !== null) {
     const [, type, valueString] = matchs
-    const values = valueString.split(/\s*,\s*/).map(parseFloat)
+    const values = valueString.split(/\s*,\s*/)
 
     const transformObj = {
       type: capitalizeFirstLetter(type),
@@ -541,62 +620,101 @@ function parseTransform(transformString) {
     switch (type) {
       case 'translate':
       case 'translate3d':
-        transformObj.value.x = parseFloat(getUnit(values[0])) || 0
-        transformObj.value.y = parseFloat(getUnit(values[1])) || 0
-        transformObj.value.z = parseFloat(getUnit(values[2])) || 0
+        transformObj.value.x = (getUnit(values[0])) || 0
+        transformObj.value.y = (getUnit(values[1])) || 0
+        transformObj.value.z = (getUnit(values[2])) || 0
         break
       case 'translateX':
-        transformObj.value.x = parseFloat(getUnit(values[0])) || 0
+        transformObj.value.x = (getUnit(values[0])) || 0
         break
       case 'translateY':
-        transformObj.value.y = parseFloat(getUnit(values[0])) || 0
+        transformObj.value.y = (getUnit(values[0])) || 0
         break
       case 'translateZ':
-        transformObj.value.z = parseFloat(getUnit(values[0])) || 0
+        transformObj.value.z = (getUnit(values[0])) || 0
         break
       case 'rotate':
-        transformObj.value.angle = parseFloat(getUnit(values[0])) || 0
+      case 'rotateZ':
+        transformObj.value.angle = (getUnit(values[0])) || 0
         transformObj.value.x = 0
         transformObj.value.y = 0
         transformObj.value.z = 1
         break
       case 'rotate3d':
-        transformObj.value.angle = parseFloat(getUnit(values[0])) || 0
+        transformObj.value.angle = getUnit(values[0]) || 0
         transformObj.value.x = values[1] || 0
         transformObj.value.y = values[2] || 0
         transformObj.value.z = values[3] || 0
         break
       case 'rotateX':
-        transformObj.value.angle = parseFloat(getUnit(values[0])) || 0
+        transformObj.value.angle = getUnit(values[0]) || 0
         transformObj.value.x = 1
         transformObj.value.y = 0
         transformObj.value.z = 0
         break
       case 'rotateY':
-        transformObj.value.angle = parseFloat(getUnit(values[0])) || 0
+        transformObj.value.angle = getUnit(values[0]) || 0
         transformObj.value.x = 0
         transformObj.value.y = 1
         transformObj.value.z = 0
         break
       case 'scale':
       case 'scale3d':
-        transformObj.value.x = values[0] || 1
-        transformObj.value.y = values[1] || values[0] || 1
-        transformObj.value.z = values[2] || 1
+        transformObj.value.x = parseFloat(values[0]) || 1
+        transformObj.value.y = parseFloat(values[1] || values[0]) || 1
+        transformObj.value.z = parseFloat(values[2]) || 1
         break
       case 'scaleX':
-        transformObj.value.x = values[0] || 1
+        transformObj.value.x = parseFloat(values[0]) || 1
         break
       case 'scaleY':
-        transformObj.value.y = values[0] || 1
+        transformObj.value.y = parseFloat(values[0]) || 1
         break
       default:
         // Handle unrecognized transform types or ignore them
         break
     }
 
-    transforms.push(transformObj)
+    transform[transformObj.type] = transformObj.value
+  }
+
+  return transform
+}
+
+// 方向转百分比
+function directionToPercent(direction: string) {
+  switch (direction) {
+    case 'top':
+    case 'left':
+      return '0%'
+    case 'center':
+      return '50%'
+    case 'bottom':
+    case 'right':
+      return '100%'
+    default:
+      return direction
   }
+}
 
-  return transforms
+// 解析transform-orgin
+function parseTransformOrigin (value: string) {
+  if (typeof value === 'string') {
+    const values = value.split(' ')
+    if (values.length === 1) {
+      return {
+        x: getUnit(directionToPercent(values[0])),
+        y: getUnit(directionToPercent(values[0]))
+      }
+    } else if (values.length === 2) {
+      return {
+        x: getUnit(directionToPercent(values[0])),
+        y: getUnit(directionToPercent(values[1]))
+      }
+    }
+  }
+  return {
+    x: 0,
+    y: 0
+  }
 }

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

@@ -220,14 +220,14 @@ export function getUnit (val) {
   // 空的字符串代表 Reconciler remove 了这个 prop，不进行后面的逻辑了
   if (val === '') return val
 
-  if (/\d+(vp)$/.test(val)) {
+  if (/\d+(vp|px)$/.test(val)) {
     return val
   } else if (isNumber(val)) {
-    return convertNumber2VP(parseFloat(val))
+    return parseFloat(val) + 'px'
   }
   if (val) {
     // 匹配vw\vh
-    const exec = val.match(/(-?\d*(\.\d+)?)(vw|vh|px)$/)
+    const exec = val.match(/(-?\d*(\.\d+)?)(vw|vh)$/)
     if (exec) {
       const [, num, , unit] = exec
       return convertNumber2VP(parseFloat(num), unit)

package/dist/runtime-utils.d.ts

@@ -501,14 +501,14 @@ declare namespace apis {
     const getShareInfo: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
     /** 验证私密消息。 */
     const authPrivateMessage: (option?: {}, ...args: any[]) => Promise<ICallbackResult & Record<string, unknown>>;
-    function getStorage<T = any>(options: Taro.getStorage.Option<T>): Promise<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>;
-    function setStorageSync(key: string, data: any): void;
-    function removeStorage(options: Taro.removeStorage.Option): Promise<unknown>;
-    function removeStorageSync(key: string): void;
-    function clearStorage(options: Taro.clearStorage.Option): Promise<unknown>;
-    function clearStorageSync(): void;
+    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>;