@tarojs/plugin-platform-harmony-ets 4.0.0-beta.46 → 4.0.0-beta.48

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/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,10 +71,6 @@ 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

package/dist/apis/storage/index.ts

@@ -193,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/icon.ets

@@ -65,13 +65,10 @@ export default struct TaroIcon {
     Image(getIconData(this.node))
       .objectFit(ImageFit.Contain)
       .fillColor(this.node._attrs.color || ICON_COLOR_MAP[this.node._attrs.type] || Color.Black)
-      .attributeModifier(commonStyleModify.setNode(this.node, {
-        width: convertNumber2PX(23),
-        height: convertNumber2PX(23)
-      }).setAnimationStyle(this.overwriteStyle))
+      .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .size({
-        width: convertNumber2VP(Number(this.node._attrs.size) || 23),
-        height: convertNumber2VP(Number(this.node._attrs.size) || 23),
+        width: Number(this.node._attrs.size) || 23,
+        height: Number(this.node._attrs.size) || 23
       })
       .onComplete(e => eventHandler(e, 'complete', this.node))
       .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))

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/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,7 +37,9 @@ class TextStyleModify implements AttributeModifier<TextAttribute> {
 
   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]
       })
@@ -81,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]
       })
@@ -226,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/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)) {