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

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

@@ -1,10 +1,12 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { createLazyChildren } from './render'
+import { rowModify, columnModify } from './style'
+import PseduoChildren from './pseudo'
+import { FlexManager } from './utils/flexManager'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
+import { getNodeThresholds, getStyleAttr, shouldBindEvent } from './utils/helper'
 
-import type { TaroAny, TaroStyleType, TaroScrollViewElement, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroScrollViewElement, TaroEvent } from '@tarojs/runtime'
 
 interface ScrollViewAttrs {
   scrollBar: BarState
@@ -22,135 +24,6 @@ interface ScrollViewEvent {
   scrollHeight: number
 }
 
-@Extend(Row)
-function rowAttrs (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .padding({
-    top: style.paddingTop,
-    right: style.paddingRight,
-    bottom: style.paddingBottom,
-    left: style.paddingLeft
-  })
-  .margin({
-    top: style.marginTop,
-    right: style.marginRight,
-    bottom: style.marginBottom,
-    left: style.marginLeft
-  })
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth || style.width,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundSize)
-  .backgroundImagePosition(style.backgroundPosition)
-  .borderStyle({
-    top: style.borderTopStyle,
-    right: style.borderRightStyle,
-    bottom: style.borderBottomStyle,
-    left: style.borderLeftStyle
-  })
-  .borderWidth({
-    top: style.borderTopWidth,
-    right: style.borderRightWidth,
-    bottom: style.borderBottomWidth,
-    left: style.borderLeftWidth
-  })
-  .borderColor({
-    top: style.borderTopColor,
-    right: style.borderRightColor,
-    bottom: style.borderBottomColor,
-    left: style.borderLeftColor
-  })
-  .borderRadius({
-    topLeft: style.borderTopLeftRadius,
-    topRight: style.borderTopRightRadius,
-    bottomLeft: style.borderBottomLeftRadius,
-    bottomRight: style.borderBottomRightRadius
-  })
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .linearGradient(style.linearGradient)
-  .clip(style.overflow)
-  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
-  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
-  .transform(style.transform)
-}
-
-@Extend(Column)
-function columnAttrs (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .padding({
-    top: style.paddingTop,
-    right: style.paddingRight,
-    bottom: style.paddingBottom,
-    left: style.paddingLeft
-  })
-  .margin({
-    top: style.marginTop,
-    right: style.marginRight,
-    bottom: style.marginBottom,
-    left: style.marginLeft
-  })
-  .width(style.width)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight || style.height,
-    maxHeight: style.maxHeight
-  })
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundSize)
-  .backgroundImagePosition(style.backgroundPosition)
-  .borderStyle({
-    top: style.borderTopStyle,
-    right: style.borderRightStyle,
-    bottom: style.borderBottomStyle,
-    left: style.borderLeftStyle
-  })
-  .borderWidth({
-    top: style.borderTopWidth,
-    right: style.borderRightWidth,
-    bottom: style.borderBottomWidth,
-    left: style.borderLeftWidth
-  })
-  .borderColor({
-    top: style.borderTopColor,
-    right: style.borderRightColor,
-    bottom: style.borderBottomColor,
-    left: style.borderLeftColor
-  })
-  .borderRadius({
-    topLeft: style.borderTopLeftRadius,
-    topRight: style.borderTopRightRadius,
-    bottomLeft: style.borderBottomLeftRadius,
-    bottomRight: style.borderBottomRightRadius
-  })
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .linearGradient(style.linearGradient)
-  .clip(style.overflow)
-  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
-  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
-  .transform(style.transform)
-}
-
-
 function getAttributes (node: TaroScrollViewElement): ScrollViewAttrs {
   const _attrs = node._attrs
   const scrollAttrs: ScrollViewAttrs = {
@@ -176,50 +49,81 @@ function handleScrollEvent (node: TaroScrollViewElement, eventName = 'scroll', x
     deltaY: vp2px(yOffset),
     scrollLeft: vp2px(currentXOffset),
     scrollTop: vp2px(currentYOffset),
-    scrollWidth: vp2px(Number(node._scroll?.width)),
-    scrollHeight: vp2px(Number(node._scroll?.height)),
+    scrollWidth: vp2px(Number(node._nodeInfo?._scroll?.width)),
+    scrollHeight: vp2px(Number(node._nodeInfo?._scroll?.height)),
   }
   const event: TaroEvent = createTaroEvent(eventName, { detail: value }, node)
 
   eventHandler(event, eventName, node)
 }
 
-@Builder
-export default function TaroScrollView (node: TaroScrollViewElement) {
-    Scroll(node.scroller) {
-      if (node._attrs.scrollX) {
-        Row() {
-          createLazyChildren(node)
-        }
-        .width(null)
-        .rowAttrs(getNormalAttributes(node))
-        .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
-          node._scroll = areaResult
-        }, node, ['scroll', 'scrollstart', 'scrollend']))
-      } else {
-        Column() {
-          createLazyChildren(node)
+@Component
+export default struct TaroScrollView {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroScrollViewElement) => void = this.customBuilder
+  @ObjectLink node: TaroScrollViewElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  build () {
+    if (this.node.hmStyle?.display !== 'none') {
+      Scroll(this.node.scroller) {
+        if (this.node._attrs.scrollX) {
+          Row() {
+            if (this.node._pseudo_before || this.node._pseudo_after) {
+              PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
+            } else {
+              this.createLazyChildren(this.node)
+            }
+          }
+          .attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+          .width(null)
+          .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
+            this.node._nodeInfo._scroll = areaResult
+          }, this.node, ['scroll', 'scrollstart', 'scrollend']))
+          .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
+          .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+          .flexGrow(0).flexShrink(0)
+        } else {
+          Column() {
+            if (this.node._pseudo_before || this.node._pseudo_after) {
+              PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
+            } else {
+              this.createLazyChildren(this.node)
+            }
+          }
+          .attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+          .height(null)
+          .alignItems(HorizontalAlign.Start)
+          .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
+            this.node._nodeInfo._scroll = areaResult
+          }, this.node, ['scroll', 'scrollstart', 'scrollend']))
+          .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
+          .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+          .flexGrow(0).flexShrink(0)
         }
-        .height(null)
-        .columnAttrs(getNormalAttributes(node))
-        .alignItems(HorizontalAlign.Start)
-        .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
-          node._scroll = areaResult
-        }, node, ['scroll', 'scrollstart', 'scrollend']))
       }
+      .width(getStyleAttr(this.node, 'width'))
+      .height(getStyleAttr(this.node, 'height'))
+      .flexGrow(this.node.hmStyle?.flexGrow)
+      .flexShrink(this.node.hmStyle?.flexShrink)
+      .scrollable(getScrollable(this.node))
+      .scrollBar(getAttributes(this.node).scrollBar)
+      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
+      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+        this.node._nodeInfo.areaInfo = res[1]
+      }))
+      .onScroll(shouldBindEvent(() => { handleScrollEvent(this.node, 'scroll') }, this.node, ['scroll']))
+      .onScrollStart(shouldBindEvent(() => { handleScrollEvent(this.node, 'scrollstart') }, this.node, ['scrollstart']))
+      .onScrollStop(shouldBindEvent(() => { handleScrollEvent(this.node, 'scrollend') }, this.node, ['scrollend']))
+      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+      .onReachEnd(shouldBindEvent(() => { handleScrollEvent(this.node, 'scrolltolower') }, this.node, ['scrolltolower']))
     }
-    .width(getNormalAttributes(node).width)
-    .height(getNormalAttributes(node).height)
-    .flexGrow(getNormalAttributes(node).flexGrow)
-    .scrollable(getScrollable(node))
-    .scrollBar(getAttributes(node).scrollBar)
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
-    }))
-    .onScroll(shouldBindEvent(() => { handleScrollEvent(node, 'scroll') }, node, ['scroll']))
-    .onScrollStart(shouldBindEvent(() => { handleScrollEvent(node, 'scrollstart') }, node, ['scrollstart']))
-    .onScrollStop(shouldBindEvent(() => { handleScrollEvent(node, 'scrollend') }, node, ['scrollend']))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+  }
 }

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

@@ -1,8 +1,9 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { getNodeThresholds, shouldBindEvent, getNormalAttributes } from './utils/helper'
+import commonStyleModify from './style'
+import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroAny, TaroSliderElement, TaroStyleType, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroSliderElement, TaroEvent } from '@tarojs/runtime'
 
 interface SliderAttrs {
   selectedColor?: ResourceColor
@@ -11,71 +12,6 @@ interface SliderAttrs {
   blockColor?: ResourceColor
 }
 
-@Extend(Slider)
-function style (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .padding({
-    top: style.paddingTop,
-    right: style.paddingRight,
-    bottom: style.paddingBottom,
-    left: style.paddingLeft
-  })
-  .margin({
-    top: style.marginTop,
-    right: style.marginRight,
-    bottom: style.marginBottom,
-    left: style.marginLeft
-  })
-  .width(style.width)
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundSize)
-  .backgroundImagePosition(style.backgroundPosition)
-  .borderStyle({
-    top: style.borderTopStyle,
-    right: style.borderRightStyle,
-    bottom: style.borderBottomStyle,
-    left: style.borderLeftStyle
-  })
-  .borderWidth({
-    top: style.borderTopWidth,
-    right: style.borderRightWidth,
-    bottom: style.borderBottomWidth,
-    left: style.borderLeftWidth
-  })
-  .borderColor({
-    top: style.borderTopColor,
-    right: style.borderRightColor,
-    bottom: style.borderBottomColor,
-    left: style.borderLeftColor
-  })
-  .borderRadius({
-    topLeft: style.borderTopLeftRadius,
-    topRight: style.borderTopRightRadius,
-    bottomLeft: style.borderBottomLeftRadius,
-    bottomRight: style.borderBottomRightRadius
-  })
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .linearGradient(style.linearGradient)
-  .clip(style.overflow)
-  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
-  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
-  .transform(style.transform)
-}
-
 @Extend(Slider)
 function attrs (attr: SliderAttrs) {
   .selectedColor(attr.selectedColor)
@@ -101,9 +37,12 @@ function themeStyles(isDisabled: boolean) {
 
 @Component
 export default struct TaroSlider {
-  node: TaroSliderElement | null = null
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroSliderElement) => void = this.customBuilder
+  @ObjectLink node: TaroSliderElement
 
   @State value: number = 0
+  @State overwriteStyle: Record<string, TaroAny> = {}
 
   aboutToAppear () {
     if (this.node) {
@@ -126,7 +65,7 @@ export default struct TaroSlider {
       style: SliderStyle.OutSet,
       direction: Axis.Horizontal
     })
-      .style(getNormalAttributes(node))
+      .attributeModifier(commonStyleModify.setNode(node).setAnimationStyle(this.overwriteStyle))
       .attrs(getAttributes(node))
       .width(!!node._attrs.showValue ? '90%' : '100%')
       .themeStyles(!!node._attrs.disabled)
@@ -138,7 +77,7 @@ export default struct TaroSlider {
         } else {
           this.value = value
           this.node?.updateFormWidgetValue(value)
-          
+
           if (mode === SliderChangeMode.End) {
             const event: TaroEvent = createTaroEvent('change', { detail: { value: this.value } }, node)
             eventHandler(event, 'change', node)
@@ -158,7 +97,7 @@ export default struct TaroSlider {
   }
 
   build() {
-    if (this.node) {
+    if (this.node && this.node.hmStyle?.display !== 'none') {
       if (!!this.node._attrs.showValue) {
         Row() {
           this.createSlider(this.node)
@@ -172,4 +111,4 @@ export default struct TaroSlider {
       }
     }
   }
-}
+}

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

@@ -0,0 +1,280 @@
+import type { TaroAny, HarmonyStyle, TaroElement, TaroStyleType } from '@tarojs/runtime'
+import { isUndefined } from '@tarojs/shared'
+import { computeBackgroundPosition } from './utils'
+import { getNormalAttributes } from './utils/helper'
+import { isMaxWidthView } from './utils/styles'
+
+class CommonStyleModify implements AttributeModifier<CommonAttribute> {
+  initStyle?: TaroStyleType
+  node: TaroElement | null = null
+  style: TaroStyleType | null = null
+  overwriteStyle: Record<string, TaroAny> = {}
+  
+  setAnimationStyle (overwriteStyle: Record<string, TaroAny>) {
+    this.overwriteStyle = overwriteStyle
+
+    return this
+  }
+
+  setNode (node: TaroElement, initStyle?: TaroStyleType) {
+    this.node = node
+    this.style = getNormalAttributes(this.node)
+    this.initStyle = initStyle
+    // 覆盖初始化样式
+    if (initStyle) {
+      Object.keys(initStyle).forEach(key => {
+        if (this.style && !this.style[key]) {
+          this.style[key] = initStyle[key]
+        }
+      })
+    }
+    return this
+  }
+
+  applyNormalAttribute(instance: CommonAttribute): void {
+    if (this.node && this.style) {
+      setNormalAttributeIntoInstance(instance, this.style, this.node)
+    }
+
+    setAnimationAttributeIntoInstance(instance, this.overwriteStyle)
+  }
+}
+
+class PseudoStyleModify implements AttributeModifier<CommonAttribute> {
+  style: TaroStyleType | null = null
+
+  setStyle (style: HarmonyStyle) {
+    this.style = style
+    return this
+  }
+
+  applyNormalAttribute(instance: CommonAttribute): void {
+    if (this.style) {
+      setNormalAttributeIntoInstance(instance, this.style)
+    }
+  }
+}
+
+
+class RowStyleModify extends CommonStyleModify {
+
+  applyNormalAttribute(instance: CommonAttribute): void {
+    if (this.style) {
+      setNormalAttributeIntoInstance(instance, this.style, this.node)
+      instance.constraintSize({
+        minWidth: this.style.minWidth || this.style.width,
+        maxWidth: this.style.maxWidth,
+        minHeight: this.style.minHeight,
+        maxHeight: this.style.maxHeight
+      })
+    }
+
+    setAnimationAttributeIntoInstance(instance, this.overwriteStyle)
+  }
+}
+
+class ColumnStyleModify extends CommonStyleModify {
+  applyNormalAttribute(instance: CommonAttribute): void {
+    if (this.style) {
+      setNormalAttributeIntoInstance(instance, this.style, this.node)
+      instance.constraintSize({
+        minWidth: this.style.minWidth,
+        maxWidth: this.style.maxWidth,
+        minHeight: this.style.minHeight || this.style.height,
+        maxHeight: this.style.maxHeight
+      })
+    }
+
+    setAnimationAttributeIntoInstance(instance, this.overwriteStyle)
+  }
+}
+
+function setAnimationAttributeIntoInstance(instance: CommonAttribute, overwriteStyle: Record<string, TaroAny>) {
+  // 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,
+  })
+}
+
+function setNormalAttributeIntoInstance(instance: CommonAttribute, style: TaroStyleType, node?: TaroElement | null) {
+  if (!isUndefined(style.id)) {
+    instance.id(style.id)
+    instance.key(style.id)
+  }
+  if (!isUndefined(style.flexGrow)) {
+    instance.flexGrow(style.flexGrow)
+  }
+  if (!isUndefined(style.flexShrink)) {
+    instance.flexShrink(style.flexShrink)
+  }
+  if (!isUndefined(style.flexBasis)) {
+    instance.flexBasis(style.flexBasis)
+  }
+  if (!isUndefined(style.alignSelf)) {
+    instance.alignSelf(style.alignSelf)
+  }
+  if (!isUndefined(style.paddingTop) || !isUndefined(style.paddingRight) || !isUndefined(style.paddingBottom) || !isUndefined(style.paddingLeft)) {
+    instance.padding({
+      top: style.paddingTop,
+      right: style.paddingRight,
+      bottom: style.paddingBottom,
+      left: style.paddingLeft
+    })
+  }
+  if (!isUndefined(style.marginTop) || !isUndefined(style.marginRight) || !isUndefined(style.marginBottom) || !isUndefined(style.marginLeft)) {
+    instance.margin({
+      top: style.marginTop,
+      right: style.marginRight,
+      bottom: style.marginBottom,
+      left: style.marginLeft
+    })
+  }
+  if (node) {
+    instance.width(isMaxWidthView(node as TaroElement) && isUndefined(style.width) ? '100%' : style.width)
+  } else {
+    if (!isUndefined(style.width)) {
+      instance.width(style.width)
+    }
+  }
+  if (!isUndefined(style.height)) {
+    instance.height(style.height)
+  }
+  if (!isUndefined(style.minWidth) || !isUndefined(style.maxWidth) || !isUndefined(style.minHeight) || !isUndefined(style.maxHeight)) {
+    instance.constraintSize({
+      minWidth: style.minWidth,
+      maxWidth: style.maxWidth,
+      minHeight: style.minHeight,
+      maxHeight: style.maxHeight
+    })
+  }
+  if (!isUndefined(style.backgroundColor)) {
+    instance.backgroundColor(style.backgroundColor)
+  }
+  if (!isUndefined(style.backgroundImage)) {
+    if (style.backgroundImage.colors) {
+      instance.linearGradient(style.backgroundImage)
+    } else {
+      instance.backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
+    }
+  }
+  if (!isUndefined(style.backgroundSize)) {
+    instance.backgroundImageSize(style.backgroundSize)
+  }
+  if (!isUndefined(style.backgroundPosition)) {
+    if (typeof style.backgroundPosition !== 'number') {
+      let pos = computeBackgroundPosition(style)
+      instance.backgroundImagePosition({
+        x: pos.offsetX,
+        y: pos.offsetY,
+      })
+    } else {
+      instance.backgroundImagePosition(style.backgroundPosition)
+    }
+  }
+  if (!isUndefined(style.borderTopStyle) || !isUndefined(style.borderRightStyle) || !isUndefined(style.borderBottomStyle) || !isUndefined(style.borderLeftStyle)) {
+    instance.borderStyle({
+      top: style.borderTopStyle,
+      right: style.borderRightStyle,
+      bottom: style.borderBottomStyle,
+      left: style.borderLeftStyle
+    })
+  }
+  if (!isUndefined(style.borderTopWidth) || !isUndefined(style.borderRightWidth) || !isUndefined(style.borderBottomWidth) || !isUndefined(style.borderLeftWidth)) {
+    instance.borderWidth({
+      top: style.borderTopWidth,
+      right: style.borderRightWidth,
+      bottom: style.borderBottomWidth,
+      left: style.borderLeftWidth
+    })
+  }
+  if (!isUndefined(style.borderTopColor) || !isUndefined(style.borderRightColor) || !isUndefined(style.borderBottomColor) || !isUndefined(style.borderLeftColor)) {
+    instance.borderColor({
+      top: style.borderTopColor,
+      right: style.borderRightColor,
+      bottom: style.borderBottomColor,
+      left: style.borderLeftColor
+    })
+  }
+  if (!isUndefined(style.borderTopLeftRadius) || !isUndefined(style.borderTopRightRadius) || !isUndefined(style.borderBottomLeftRadius) || !isUndefined(style.borderBottomRightRadius)) {
+    instance.borderRadius({
+      topLeft: style.borderTopLeftRadius,
+      topRight: style.borderTopRightRadius,
+      bottomLeft: style.borderBottomLeftRadius,
+      bottomRight: style.borderBottomRightRadius
+    })
+  }
+  if (!isUndefined(style.zIndex)) {
+    instance.zIndex(style.zIndex)
+  }
+  if (!isUndefined(style.opacity)) {
+    instance.opacity(style.opacity)
+  }
+  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 })
+  // }
+  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,
+      y: style.top || 0,
+    })
+  }
+  if (style.position === 'relative') {
+    instance.offset({
+      x: style.left || 0,
+      y: style.top || 0,
+    })
+  }
+}
+
+export const pseudoModify = new PseudoStyleModify()
+export const rowModify = new RowStyleModify()
+export const columnModify = new ColumnStyleModify()
+
+export default new CommonStyleModify()