@tarojs/plugin-platform-harmony-ets 4.0.0-beta.13 → 4.0.0-beta.131

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

@@ -1,68 +1,93 @@
+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'
+import commonStyleModify, { textModify, setNormalTextAttributeIntoInstance } from './style'
 import { getButtonColor } from './button'
+import { getImageMode } from './image'
 import { BUTTON_THEME_COLOR } from './utils/constant/style'
-import { getNodeThresholds, getNormalAttributes, getFontAttributes, shouldBindEvent } from './utils/helper'
+import { getNodeThresholds, getStyleAttr, shouldBindEvent, getNormalAttributes } from './utils/helper'
 
-import type { TaroButtonElement, TaroElement, TaroTextElement, TaroAny, TaroTextStyleType, TaroStyleType } from '@tarojs/runtime'
+import type { HarmonyStyle, TaroAny, TaroButtonElement, TaroElement, TaroTextElement } from '@tarojs/runtime'
 
-@Extend(Text)
-function textNormalFontStyle (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .opacity(style.opacity)
-  .fontColor(style.color)
-  .fontSize(style.fontSize)
-  .fontWeight(style.fontWeight)
-  .fontStyle(style.fontStyle)
-  .fontFamily(style.fontFamily)
-  .lineHeight(style.lineHeight)
-  .decoration({
-    type: style.textDecoration,
-    color: style.color
-  })
-}
+function getButtonFontSize (node: TaroButtonElement): string | number {
+  const isMini = node._attrs.size === 'mini'
 
-@Extend(Text)
-function textSpecialFontStyle(attr: TaroTextStyleType) {
-  .textAlign(attr.textAlign)
-  .textOverflow(attr.textOverflow)
-  .maxLines(attr.WebkitLineClamp)
-  .letterSpacing(attr.letterSpacing)
+  return isMini ? convertNumber2VP(26) : convertNumber2VP(36)
 }
 
-function getButtonFontSize (node: TaroButtonElement) {
-  const isMini = node._attrs.size === 'mini'
+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 isMini ? convertNumber2VP(26) : convertNumber2VP(36)
+    return isFlexView || isPercentWidth ? null : getStyleAttr(node, 'width')
+  }
 }
 
+
 @Component
 export default struct TaroText {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroTextElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroTextElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
 
   build () {
-    if (this.node.nodeType === NodeType.TEXT_NODE && this.node.parentNode) {
-      if ((this.node.parentNode as TaroElement).tagName === 'BUTTON') {
-        Text(this.node.textContent)
-          .textNormalFontStyle(getNormalAttributes(this.node.parentNode as TaroElement))
-          .textSpecialFontStyle(getFontAttributes(this.node.parentNode as TaroElement))
-          .fontSize((this.node.parentNode as TaroButtonElement).hmStyle.fontSize || getButtonFontSize(this.node.parentNode as TaroButtonElement))
-          .fontColor((this.node.parentNode as TaroButtonElement).hmStyle.color || getButtonColor(this.node.parentNode as TaroButtonElement, BUTTON_THEME_COLOR.get((this.node.parentNode as TaroButtonElement)._attrs.type).text))
-      } else {
-        Text(this.node.textContent)
-          .textNormalFontStyle(getNormalAttributes(this.node.parentNode as TaroElement))
-          .textSpecialFontStyle(getFontAttributes(this.node.parentNode as TaroElement))
-          .width(getNormalAttributes(this.node.parentNode as TaroElement).width)
-          .height(getNormalAttributes(this.node.parentNode as TaroElement).height)
+    if (this.node.nodeType === NodeType.TEXT_NODE) {
+      if (this.node.parentNode) {
+        if ((this.node.parentNode as TaroElement).tagName === 'BUTTON') {
+          Text(this.node.textContent)
+            .attributeModifier(textModify.setNode(this.node?.parentElement as TaroElement, {
+              fontSize: getButtonFontSize(this.node.parentNode as TaroButtonElement),
+              color: getButtonColor(this.node.parentNode as TaroButtonElement, BUTTON_THEME_COLOR.get((this.node.parentNode as TaroButtonElement)._attrs.type || '').text)
+            }))
+        } else {
+          Text(this.node.textContent)
+            .attributeModifier(textModify.setNode(this.node?.parentElement as TaroElement))
+            .width(getTextInViewWidth(this.node.parentElement))
+        }
       }
     } else {
-      Text(this.node.textContent)
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-      .attributeModifier(commonStyleModify.setNode(this.node))
-      .textNormalFontStyle(getNormalAttributes(this.node))
-      .textSpecialFontStyle(getFontAttributes(this.node))
+      Text(this.node.textContent) {
+        // text 下还有标签
+        if (this.node.childNodes.length > 1 || ((this.node.childNodes[0] && this.node.childNodes[0] as TaroElement)?.nodeType === NodeType.ELEMENT_NODE)) {
+          ForEach(this.node.childNodes, (item: TaroElement) => {
+            if (item.tagName === 'IMAGE') {
+              ImageSpan(item.getAttribute('src'))
+                .attributeModifier(commonStyleModify.setNode(item))
+                .objectFit(getImageMode(item.getAttribute('mode')))
+                .verticalAlign(getImageSpanAlignment(this.node?.hmStyle?.verticalAlign))
+                .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', item) }, item, ['click']))
+            } else if (item.nodeType === NodeType.TEXT_NODE) {
+              Span(item.textContent)
+            } else if (item.tagName === 'TEXT') {
+              Span(item.textContent)
+                .attributeModifier(spanModify.setNode(item))
+                .letterSpacing(item._st.hmStyle.letterSpacing)
+                .textBackgroundStyle({
+                  color: item._st.hmStyle.backgroundColor,
+                  radius: {
+                    topLeft: item._st.hmStyle.borderTopLeftRadius,
+                    topRight: item._st.hmStyle.borderTopRightRadius,
+                    bottomLeft: item._st.hmStyle.borderBottomLeftRadius,
+                    bottomRight: item._st.hmStyle.borderBottomRightRadius,
+                  }
+                })
+                .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', item) }, item, ['click']))
+            }
+          }, (item: TaroElement) => `${item._nid}${this.node._updateTrigger}`)
+        }
+      }
+      .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', this.node) }, this.node, ['click']))
+      .attributeModifier(textModify.setNode(this.node).withNormalStyle().setAnimationStyle(this.overwriteStyle))
       .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
       .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
         this.node._nodeInfo.areaInfo = res[1]
@@ -70,3 +95,34 @@ export default struct TaroText {
     }
   }
 }
+
+function getImageSpanAlignment (align: TaroAny): TaroAny {
+  if (align === Alignment.Top) {
+    return ImageSpanAlignment.TOP
+  } else if (align === Alignment.Bottom) {
+    return ImageSpanAlignment.BOTTOM
+  } else if (align === Alignment.Center) {
+    return ImageSpanAlignment.CENTER
+  }
+}
+
+class SpanStyleModify implements AttributeModifier<SpanAttribute> {
+  node: TaroTextElement | null = null
+  style: HarmonyStyle | null = null
+  overwriteStyle: Record<string, TaroAny> = {}
+  withNormal = false
+
+  setNode (node: TaroTextElement) {
+    this.node = node
+    this.style = getNormalAttributes(this.node)
+    return this
+  }
+
+  applyNormalAttribute(instance: SpanAttribute): void {
+    if (this.node && this.style) {
+      setNormalTextAttributeIntoInstance(instance, this.style, this.node)
+    }
+  }
+}
+
+const spanModify = new SpanStyleModify()

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

@@ -1,10 +1,15 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
 import commonStyleModify from './style'
-import { getNodeThresholds, getNormalAttributes, getFontAttributes, shouldBindEvent, parseStyles } from './utils/helper'
+import { getNodeThresholds, getFontAttributes, shouldBindEvent, parseStyles } from './utils/helper'
 
 import type { TaroAny, TaroStyleType, TaroTextStyleType, TaroTextAreaElement, TaroEvent } from '@tarojs/runtime'
 
+interface TextareaAttrs extends TaroTextStyleType {
+  autoFocus?: boolean
+  disabled?: boolean
+}
+
 @Extend(TextArea)
 function textStyle (style: TaroStyleType) {
   .fontColor(style.color)
@@ -15,9 +20,18 @@ function textStyle (style: TaroStyleType) {
 }
 
 @Extend(TextArea)
-function textAttr(attr: TaroTextStyleType) {
+function textAttr(attr: TextareaAttrs) {
   .textAlign(attr.textAlign)
   .maxLines(attr.WebkitLineClamp)
+  .defaultFocus(attr.autoFocus)
+  .enabled(!attr.disabled)
+}
+
+function getAttributes(node: TaroTextAreaElement): TextareaAttrs {
+  const attrs: TaroAny = getFontAttributes(node)
+  attrs.autoFocus = node._attrs.autoFocus || node._attrs.focus || false
+  attrs.disabled = node._attrs.disabled || false
+  return attrs
 }
 
 function getPlaceholderColor (node: TaroTextAreaElement): string {
@@ -30,7 +44,10 @@ function getPlaceholderColor (node: TaroTextAreaElement): string {
 export default struct TaroTextArea {
   @State value: string = ''
 
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroTextAreaElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroTextAreaElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
 
   aboutToAppear () {
     if (this.node) {
@@ -45,37 +62,35 @@ export default struct TaroTextArea {
   }
 
   build () {
-    if (this.node) {
-      TextArea({ text: this.value, placeholder: this.node._attrs?.placeholder || '', controller: this.node.controller })
-        .key(this.node._nid)
-        .maxLength(Number(this.node._attrs?.maxlength) || null)
-        .placeholderColor(getPlaceholderColor(this.node))
-        .attributeModifier(commonStyleModify.setNode(this.node))
-        .textStyle(getNormalAttributes(this.node))
-        .textAttr(getFontAttributes(this.node))
-        .onChange((value: string) => {
-          const event: TaroEvent = createTaroEvent('input', { detail: { value } }, this.node)
-          
-          this.value = value
-          this.node?.updateFormWidgetValue(value)
-          eventHandler(event, 'input', this.node)
-        })
-        .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-        .onBlur(() => {
-          const event: TaroEvent = createTaroEvent('blur', { detail: { value: this.value } }, this.node)
-          eventHandler(event, 'blur', this.node)
-        })
-        .onFocus(() => {
-          const event: TaroEvent = createTaroEvent('focus', { detail: { value: this.value, height: this.node?._height } }, this.node)
-    
-          eventHandler(event, 'focus', this.node)
-        })
-        .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-          if (this.node) {
-            this.node._nodeInfo.areaInfo = res[1]
-          }
-        }))
-        .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-    }
+    TextArea({ text: this.value, placeholder: this.node._attrs?.placeholder || '', controller: this.node.controller })
+      .key(this.node._nid.toString())
+      .maxLength(Number(this.node._attrs?.maxlength) || null)
+      .placeholderColor(getPlaceholderColor(this.node))
+      .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+      .textStyle(this.node?.hmStyle)
+      .textAttr(getAttributes(this.node))
+      .onChange((value: string) => {
+        const event: TaroEvent = createTaroEvent('input', { detail: { value } }, this.node)
+
+        this.value = value
+        this.node?.updateFormWidgetValue(value)
+        eventHandler(event, 'input', this.node)
+      })
+      .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', this.node) }, this.node, ['click']))
+      .onBlur(() => {
+        const event: TaroEvent = createTaroEvent('blur', { detail: { value: this.value } }, this.node)
+        eventHandler(event, 'blur', this.node)
+      })
+      .onFocus(() => {
+        const event: TaroEvent = createTaroEvent('focus', { detail: { value: this.value, height: this.node?._height } }, this.node)
+
+        eventHandler(event, 'focus', this.node)
+      })
+      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+        if (this.node) {
+          this.node._nodeInfo.areaInfo = res[1]
+        }
+      }))
+      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
   }
 }

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

@@ -60,7 +60,7 @@ class AttributeManager {
     const dataValue: string = AttributeManager.getNodeStyle(style, 'animation')
 
     if (dataValue) {
-      let values: string[] = dataValue.trim().split(new RegExp("/\s+/"))
+      let values: string[] = dataValue.toString().trim().split(new RegExp("/\s+/"))
       switch (values.length) {
         case 4:
           res = { duration: values[0], curve: values[1], delay: values[2] }
@@ -140,7 +140,7 @@ class AttributeManager {
     }
     let resultTransform: matrix4.Matrix4Transit
 
-    const matches = transform.match(new RegExp("/(\w+)\(([^)]+)\)/g")) || [];
+    const matches: string[] = transform.match(new RegExp("/(\w+)\(([^)]+)\)/g")) || [];
 
     // 处理matrix
 

package/dist/components-harmony-ets/utils/DynamicCenter.ts

@@ -11,7 +11,7 @@ export class DynamicCenter {
     if (!node._isCompileMode || !node._instance) return
 
     if (node._attrs?._dynamicID) {
-      node._instance[node._attrs._dynamicID] = null
+      node._instance[node._attrs._dynamicID] = new TaroElement('Ignore')
     }
     node._instance = null
   }
@@ -36,4 +36,4 @@ export class DynamicCenter {
       this.bindComponentToNodeWithDFS(node.childNodes[i] as TaroElement, component)
     }
   }
-}
+}

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

@@ -1,20 +1,20 @@
-import type { TaroElement } from '@tarojs/runtime'
+import type { TaroElement, HarmonyStyle } from '@tarojs/runtime'
 import { isUndefined } from '@tarojs/shared'
+import { getNormalAttributes } from './styles'
 
 interface IFlexOptions {
   direction: FlexDirection,
   justifyContent: FlexAlign,
-  alignItems: VerticalAlign | HorizontalAlign,
-  // Row 和 Column 不支持下面两个属性
-  // wrap: FlexWrap,
-  // alignContent: FlexAlignContent
+  alignItems: ItemAlign,
+  wrap?: FlexWrap,
+  alignContent?: FlexAlign
 }
 
 class FlexManager {
   static isFlexNode (node: TaroElement): boolean {
     return !!node.hmStyle?.display?.includes('flex')
   }
-  
+
   static convertFlexAlignItemsToColumnOrRow (direction: FlexDirection, alignItems: ItemAlign | undefined): 	VerticalAlign | HorizontalAlign {
     if (direction === FlexDirection.Column) {
       switch (alignItems) {
@@ -37,23 +37,53 @@ class FlexManager {
     }
   }
 
+  static useFlexLayout (node: TaroElement): boolean {
+    const hmStyle: HarmonyStyle = getNormalAttributes(node) || {}
+    const isReverse = hmStyle.flexDirection && [FlexDirection.RowReverse, FlexDirection.ColumnReverse].indexOf(hmStyle.flexDirection) !== -1;
+    const isUnknownAlign = [ItemAlign.Stretch, ItemAlign.Baseline].indexOf(hmStyle.alignItems!) !== -1;
+    return !isUndefined(hmStyle.flexWrap) || isReverse || isUnknownAlign;
+  }
+
   static flexOptions (node: TaroElement): IFlexOptions {
-    const hmStyle = node.hmStyle
+    const hmStyle: HarmonyStyle = getNormalAttributes(node) || {}
     const isFlex = FlexManager.isFlexNode(node)
-    const justifyContent: FlexAlign = isFlex ? (isUndefined(hmStyle.justifyContent) ? FlexAlign.Start : hmStyle.justifyContent) : FlexAlign.Start
-
     let flexDirection = hmStyle.flexDirection
     if (!flexDirection && flexDirection !== 0) {
       flexDirection = hmStyle.display === 'flex' ? FlexDirection.Row : FlexDirection.Column
     }
 
-    const alignItems = isFlex ? FlexManager.convertFlexAlignItemsToColumnOrRow(flexDirection, hmStyle.alignItems) : HorizontalAlign.Start
-
     return {
-      alignItems,
-      justifyContent,
+      alignItems: isFlex ? (isUndefined(hmStyle.alignItems) ? ItemAlign.Start : hmStyle.alignItems) : ItemAlign.Start,
+      justifyContent: isFlex ? (isUndefined(hmStyle.justifyContent) ? FlexAlign.Start : hmStyle.justifyContent) : FlexAlign.Start,
       direction: flexDirection,
+      wrap: isFlex ? hmStyle.flexWrap: FlexWrap.NoWrap,
+      alignContent: isFlex ? hmStyle.alignContent: FlexAlign.Start
+    }
+  }
+
+  static direction (node: TaroElement): FlexDirection {
+    const hmStyle: HarmonyStyle = getNormalAttributes(node)
+    let flexDirection = hmStyle.flexDirection
+    if (!flexDirection && flexDirection !== 0) {
+      flexDirection = hmStyle.display === 'flex' ? FlexDirection.Row : FlexDirection.Column
     }
+    return flexDirection
+  }
+
+  static alignItems<T> (node: TaroElement): T {
+    const hmStyle: HarmonyStyle = getNormalAttributes(node)
+    const isFlex = FlexManager.isFlexNode(node)
+    let flexDirection = hmStyle.flexDirection
+    if (!flexDirection && flexDirection !== 0) {
+      flexDirection = hmStyle.display === 'flex' ? FlexDirection.Row : FlexDirection.Column
+    }
+    return (isFlex ? FlexManager.convertFlexAlignItemsToColumnOrRow(flexDirection, hmStyle.alignItems) : HorizontalAlign.Start) as T
+  }
+
+  static justifyContent (node: TaroElement): FlexAlign {
+    const hmStyle: HarmonyStyle = getNormalAttributes(node)
+    const isFlex = FlexManager.isFlexNode(node)
+    return isFlex ? (isUndefined(hmStyle.justifyContent) ? FlexAlign.Start : hmStyle.justifyContent) : FlexAlign.Start
   }
 }
 

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

@@ -1,7 +1,8 @@
-import { getNormalAttributes, getStyle, getFontAttributes } from './styles'
+import { VIEW } from '@tarojs/runtime'
 
-import type { TFunc } from '@tarojs/runtime/dist/runtime.esm'
-import type { TaroElement } from '@tarojs/runtime'
+import { getNormalAttributes, getFontAttributes, getStyleAttr } from './styles'
+
+import type { TaroAny, TaroElement, TaroNode } from '@tarojs/runtime'
 
 export const parseStyles = (styles = ''): Record<string, string> => {
   const styleObj: Record<string, string> = {}
@@ -9,7 +10,7 @@ export const parseStyles = (styles = ''): Record<string, string> => {
     .split(';')
     .filter((style) => style.split(':').length === 2)
     .map((style) => [
-    style.split(':')[0].trim().replace(new RegExp("/-./g"), c => c.substring(1).toUpperCase()),
+    style.split(':')[0].trim().replace(new RegExp("-([a-z])", "g"), (_, letter: string): string => letter.toUpperCase()),
     style.split(':')[1].trim()
     ])
     .forEach((style) => {
@@ -20,7 +21,7 @@ export const parseStyles = (styles = ''): Record<string, string> => {
   return styleObj
 }
 
-export function shouldBindEvent (cb: TFunc, node: TaroElement | null, eventNames: string[], disabled = false) {
+export function shouldBindEvent (cb: TaroAny, node: TaroElement | null, eventNames: string[], disabled = false): TaroAny {
   if (!node || node._attrs?.disabled || disabled) return null
   if (!node.__listeners) {
     return null
@@ -31,9 +32,20 @@ export function shouldBindEvent (cb: TFunc, node: TaroElement | null, eventNames
 }
 
 export function getNodeThresholds (node: TaroElement): number[] | null {
-  if (!node) return null
+  return node?._nodeInfo?.thresholds || null
+}
 
-  return node?._nodeInfo.thresholds || null
+export function isTagFirstChild (node: TaroElement, tagName = VIEW, level = 0): boolean {
+  const parent: TaroElement | null = node.parentElement
+  const list: TaroNode[] = node.parentNode?.childNodes || []
+  if (list.length < 1 || level < 0) return false
+  else if (!parent) return true
+
+  if (parent.nodeName === tagName.toUpperCase()) {
+    return list[0] === node
+  } else {
+    return (list[0] === node) && isTagFirstChild(parent, tagName, --level)
+  }
 }
 
-export { getNormalAttributes, getStyle, getFontAttributes }
+export { getNormalAttributes, getFontAttributes, getStyleAttr }

package/dist/components-harmony-ets/utils/htmlParser/HarmonyHTMLParser.ts

@@ -99,5 +99,4 @@ function parseTag(htmlString, startIndex) {
   return tag
 }
 
-
-export default parseHTML
+export default parseHTML

package/dist/components-harmony-ets/utils/htmlParser/index.ts

@@ -15,7 +15,7 @@ function buildDomTree(dom: TTreeNode) {
     case 'span': tagName = 'text'; break
   }
   if (!tagName) return null
-  
+
   const ele = document.createElement(tagName)
   attributes && Object.keys(attributes).forEach(key => {
     if (key === 'style') {

package/dist/components-harmony-ets/utils/index.ts

@@ -1,5 +1,8 @@
 import { convertNumber2VP } from '@tarojs/runtime'
-import { isNumber } from '@tarojs/shared'
+import { isNumber, isUndefined } from '@tarojs/shared'
+
+import type { RichTextProps } from '@tarojs/components/types/RichText'
+import type { TaroRichTextElement } from '@tarojs/runtime'
 
 export function getSingleSelector(range, rangeKey): any[] {
   return range.map((data) => data[rangeKey])
@@ -18,66 +21,67 @@ export function getMultiSelector(ctx, range, rangeKey, value) {
   }))
 }
 
-export function getUnit (val) {
-  if (/\d+(vp)$/.test(val)) {
+export function getUnit (val: string | number): string {
+  if (isNumber(val) || /\d+px$/.test(val)) {
+    return convertNumber2VP(parseFloat(val as string))
+  } else if (/\d+(vp)$/.test(val)) {
     return val
-  } else if (isNumber(val) || /\d+px$/.test(val)) {
-    return convertNumber2VP(parseFloat(val))
   }
   return val
 }
 
-function handleNodeStyleData (dataValue: string, handler: (values: string[]) => { [key: string]: string } | void) {
-  let res: any = {}
-  if (dataValue) {
-    const values = dataValue.trim().split(/\s+/)
-    const data = handler(values)
-
-    if (!data) return res
-
-    res = data
+export function generateText (node: TaroRichTextElement): string {
+  return parseHtmlNode(node._attrs.nodes || '')
+}
 
-    Object.keys(res).forEach(key => {
-      const exec = `${res[key]}`.match(/(\d+)(px)$/)
-      if (exec && values.length > 1) {
-        res[key] = getUnit(+exec[1])
-      }
-    })
+// 将nodeTree转换成harmony需要的string结构
+function nodeToHtml(node: RichTextProps.Text | RichTextProps.HTMLElement): string {
+  if (node.type === 'text') {
+    return node.text
+  }
+  if (node.attrs) {
+    const attributes = Object.entries(node.attrs)
+      .map((item: [string, string]) => `${item[0]}="${item[1]}"`)
+      .join(' ')
+    const childrenHtml: string = typeof node.children === 'string' ? node.children : (node.children || []).map((child: RichTextProps.Text | RichTextProps.HTMLElement) => nodeToHtml(child)).join('')
+    return `<${node.name}${attributes ? ' ' + attributes : ''}>${childrenHtml}</${node.name}>`
   }
+  return ''
+}
 
-  return res
+function parseHtmlNode (nodes: Array<RichTextProps.Text | RichTextProps.HTMLElement> | string) {
+  return typeof nodes === 'string' ? nodes : `<div>${nodes.map(node => nodeToHtml(node)).join('')}</div>`
 }
 
-export function getNodeBorderRadiusData (dataValue: string) {
-  return handleNodeStyleData(dataValue, values => {
-    switch (values.length) {
-      case 1:
-        return { topLeft: values[0], topRight: values[0], bottomRight: values[0], bottomLeft: values[0] }
-      case 2:
-        return { topLeft: values[0], topRight: values[1], bottomRight: values[0], bottomLeft: values[1] }
-      case 3:
-        return { topLeft: values[0], topRight: values[1], bottomRight: values[2], bottomLeft: values[1] }
-      case 4:
-        return { topLeft: values[0], topRight: values[1], bottomRight: values[2], bottomLeft: values[3] }
-      default:
-        break
+// 背景偏移算法：https://developer.mozilla.org/zh-CN/docs/Web/CSS/background-position
+export function computeBackgroundPosition(style) {
+  let offsetX = style.backgroundPosition?.x || 0
+  let offsetY = style.backgroundPosition?.y || 0
+  if (style.backgroundSize && typeof style.backgroundSize !== 'number') {
+    if (!isUndefined(style.backgroundSize.width) && style.width) {
+      if (typeof style.backgroundPosition.x === 'string' && style.backgroundPosition.x.indexOf('%') > 0) {
+        // (container width - image width) * (position x%) = (x offset value)
+        const width = parseFloat(style.width)
+        const bgWidth = parseFloat(style.backgroundSize.width)
+        const bgOffsetX = parseFloat(style.backgroundPosition.x)
+        offsetX = Number((width - bgWidth) * (bgOffsetX) / 100) || 0
+      }
+    }
+    if (!isUndefined(style.backgroundSize.height) && style.height) {
+      if (typeof style.backgroundPosition.y === 'string' && style.backgroundPosition.y.indexOf('%') > 0) {
+        // (container height - image height) * (position y%) = (y offset value)
+        const height = parseFloat(style.height)
+        const bgHeight = parseFloat(style.backgroundSize.height)
+        const bgOffsetY = parseFloat(style.backgroundPosition.y)
+        offsetY = Number((height - bgHeight) * (bgOffsetY) / 100) || 0
+      }
     }
-  })
+  }
+
+  return { offsetX, offsetY }
 }
 
-export function getNodeMarginOrPaddingData (dataValue: string) {
-  return handleNodeStyleData(dataValue, values => {
-    switch (values.length) {
-      case 1:
-        return { top: values[0], right: values[0], bottom: values[0], left: values[0] }
-      case 2:
-        return { top: values[0], right: values[1], bottom: values[0], left: values[1] }
-      case 3:
-        return { top: values[0], right: values[1], bottom: values[2], left: values[1] }
-      case 4:
-        return { top: values[0], right: values[1], bottom: values[2], left: values[3] }
-      default:
-        break
-    }
-  })
+export function convertVp2Px(val: string | number) {
+  const vp = parseFloat(`${val}`)
+  return vp2px(vp)
 }