@tarojs/plugin-platform-harmony-ets 4.0.0-beta.25 → 4.0.0-beta.27

package/dist/apis/utils/index.ts

@@ -19,7 +19,7 @@ export function temporarilyNotSupport (name: string, recommended?: string) {
   return (option = {}, ...args) => {
     const { success, fail, complete } = option as any
     const handle = new MethodHandler({ name, success, fail, complete })
-    let errMsg = '暂时不支持 API'
+    let errMsg = `暂时不支持 API ${name}`
     if (recommended) {
       errMsg += `, 请使用 ${recommended}`
     }

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

@@ -1,3 +1,4 @@
+import { isString } from '@tarojs/shared'
 import { eventHandler, convertNumber2VP, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, NodeType } from '@tarojs/runtime'
 
 import commonStyleModify from './style'
@@ -39,6 +40,17 @@ function getButtonFontSize (node: TaroButtonElement) {
   return isMini ? convertNumber2VP(26) : convertNumber2VP(36)
 }
 
+function getTextInViewWidth (node: TaroElement | null): TaroAny {
+  if (node) {
+    const hmStyle = node.hmStyle || {}
+    const isFlexView = hmStyle.display === 'flex'
+    const width: TaroAny = getStyleAttr(node, 'width')
+    const isPercentWidth = isString(width) && width.includes('%')
+
+    return isFlexView || isPercentWidth ? null : getStyleAttr(node, 'width')
+  }
+}
+
 @Component
 export default struct TaroText {
   @Builder customBuilder() {}
@@ -65,8 +77,7 @@ export default struct TaroText {
           Text(this.node.textContent)
             .textNormalFontStyle(this.node.parentElement?.hmStyle || {})
             .textSpecialFontStyle(getFontAttributes(this.node.parentElement as TaroElement))
-            .width(getStyleAttr(this.node.parentElement, 'width'))
-            .height(getStyleAttr(this.node.parentElement, 'height'))
+            .width(getTextInViewWidth(this.node.parentElement))
         }
       }
     } else {

package/dist/components-harmony-ets/utils/styles.ets

@@ -27,13 +27,54 @@ export function getFontAttributes (node: TaroElement): TaroTextStyleType {
     }
   }
 
+  const isFlexText = hmStyle.display === 'flex'
+  let textAlign = hmStyle.textAlign
+  let verticalAlign = hmStyle.verticalAlign
+
+  // 按照 w3c 规范，一旦设置了 display: flex，textAlign 和 verticalAlign 都会直接失效
+  // 需要使用 justifyContent 和 alignItems
+  if (isFlexText) {
+    switch (hmStyle.justifyContent) {
+      case FlexAlign.Start:
+        textAlign = TextAlign.Start
+        break
+      case FlexAlign.Center:
+        textAlign = TextAlign.Center
+        break
+      case FlexAlign.End:
+        textAlign = TextAlign.End
+        break
+      case FlexAlign.SpaceBetween:
+      case FlexAlign.SpaceAround:
+        textAlign = TextAlign.JUSTIFY
+        break
+      default:
+        textAlign = TextAlign.Start
+        break
+    }
+    switch (hmStyle.alignItems) {
+      case ItemAlign.Start:
+        verticalAlign = Alignment.Top
+        break
+      case ItemAlign.Center:
+        verticalAlign = Alignment.Center
+        break
+      case ItemAlign.End:
+        verticalAlign = Alignment.End
+        break
+      default:
+        verticalAlign = Alignment.Top
+        break
+    }
+  }
+
   const attributes: TaroAny = {
+    textAlign,
+    verticalAlign,
     WebkitLineClamp: WebkitLineClamp,
     // 已做处理的属性
     letterSpacing: hmStyle.letterSpacing,
-    textAlign: hmStyle.textAlign,
     textOverflow: hmStyle.textOverflow,
-    verticalAlign: hmStyle.verticalAlign,
     lineHeight: lineHeight
   }
 
@@ -44,8 +85,7 @@ export function getFontAttributes (node: TaroElement): TaroTextStyleType {
 export function isMaxWidthView (node: TaroElement) {
   const parentNode: TaroElement = node.parentNode as TaroElement
 
-  return node.tagName === 'VIEW' && parentNode && parentNode.tagName === 'VIEW' &&
-    !(FlexManager.isFlexNode(parentNode) && FlexManager.flexOptions(parentNode).direction !== FlexDirection.Column)
+  return node.tagName === 'VIEW' && parentNode && parentNode.tagName === 'VIEW' && !FlexManager.isFlexNode(parentNode)
 }
 
 export function getNormalAttributes (node: TaroElement): HarmonyStyle {

package/dist/runtime-utils.js

@@ -186,7 +186,7 @@ function temporarilyNotSupport(name, recommended) {
     return (option = {}, ...args) => {
         const { success, fail, complete } = option;
         const handle = new MethodHandler({ name, success, fail, complete });
-        let errMsg = '暂时不支持 API';
+        let errMsg = `暂时不支持 API ${name}`;
         if (recommended) {
             errMsg += `, 请使用 ${recommended}`;
         }