@tarojs/plugin-platform-harmony-ets 3.7.0-alpha.27 → 4.0.0-alpha.0

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

@@ -1,24 +1,12 @@
-import { bindInstanceToNode, eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, initComponentNodeInfo,
-  TaroElement,
-  TaroAny,
-  TaroEvent
-} from '@tarojs/runtime'
-
-import { createNode } from './render'
-import TaroComponentWrapper from './base'
-import { AttributeManager } from './utils/AttributeManager'
+import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
+
+import { createLazyChildren } from './render'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { createTaroEvent } from './utils/events'
 import { FlexManager } from './utils/FlexManager'
-import { shouldBindEvent, getNormalAttributes, getNodeThresholds, bindAnimation } from './utils/helper'
+import { shouldBindEvent, getNormalAttributes, getNodeThresholds } from './utils/helper'
 
-import type { TaroRadioGroupElement, TaroRadioElement } from './element'
-import type { TaroStyleType, HarmonyType } from '@tarojs/runtime'
+import type { TaroEvent, TaroAny, TaroStyleType, HarmonyType, TaroRadioGroupElement, TaroRadioElement } from '@tarojs/runtime'
 
-interface RadioOptions {
-  group: string
-  value: string
-}
 interface RadioAttrs {
   radioStyle?: HarmonyType.RadioStyle
   themeStyles?: boolean
@@ -40,6 +28,7 @@ function style (style: TaroStyleType) {
   .backgroundColor(style.backgroundColor)
   .backgroundImage(style.backgroundImage, style.backgroundRepeat)
   .backgroundImageSize(style.backgroundImageSize)
+  .backgroundImagePosition(style.backgroundImagePosition)
   .rotate(style.rotate)
   .scale(style.scale)
   .translate(style.translate)
@@ -74,65 +63,43 @@ function themeStyles(isDisabled: boolean) {
   .opacity(isDisabled ? 0.4 : 1)
 }
 
-@Component
-export struct TaroRadio {
-  nodeInfoMap: TaroAny = {}
-
-  @ObjectLink node: TaroRadioElement
-
-  @State checked: boolean = false
-
-  aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
-
-    this.checked = !!this.node._attrs.checked
-  }
-
-  @Styles defaultEvent () {
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-    .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, res => {
-      const eventResult: TaroAny = res.eventResult
-      this.nodeInfoMap[this.node._nid].areaInfo = eventResult[1]
-    }))
-  }
-
-  build() {
-    TaroComponentWrapper({ node: this.node }) {
-      Stack() {
-        Row() {
-          Radio({
-            group: this.node.group || this.node.parentNode?._nid || '',
-            value: this.node._attrs.value || '',
-          })
-            .checked(this.checked)
-            .defaultEvent()
-            .style(getNormalAttributes(this.node))
-            .radioAttr(getAttributes(this.node))
-            .onChange((value: boolean) => {
-              if (!!this.node._attrs.disabled) {
-                // FIXME 找下文档是否有强制刷新方法
-                this.checked = !this.checked
-                this.checked = !this.checked
-              } else {
-                this.checked = value
-                if (this.checked) {
-                  const event: TaroEvent = createTaroEvent('change', { detail: { value: this.node._attrs.value } }, this.node)
-                  eventHandler(event, 'change', this.node)
-                }
-              }
-            })
-          Text(this.node.textContent)
-            .textAlign(TextAlign.Center)
-            .opacity(!!this.node._attrs.disabled ? 0.4 : 1)
-        }
-        .onClick(() => {
-          if (!this.checked) {
-            this.checked = !this.checked
+@Builder
+export function TaroRadio (node: TaroRadioElement) {
+  Stack() {
+    Row() {
+      Radio({
+        group: node.group || node.parentNode?._nid || '',
+        value: node._attrs.value || '',
+      })
+        .checked(node.checked)
+        .style(getNormalAttributes(node))
+        .radioAttr(getAttributes(node))
+        .onChange((value: boolean) => {
+          if (!!node?._attrs.disabled) {
+            node.updateComponent()
+          } else {
+            node.updateCheckedValue(value)
+
+            if (value) {
+              const event: TaroEvent = createTaroEvent('change', { detail: { value: node?._attrs.value } }, node)
+              eventHandler(event, 'change', node)
+            }
           }
         })
-      }
+        .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
+        .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+          node._nodeInfo.areaInfo = res[1]
+        }))
+        .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+      Text(node.textContent)
+        .textAlign(TextAlign.Center)
+        .opacity(!!node?._attrs.disabled ? 0.4 : 1)
     }
+    .onClick(() => {
+      if (!node._checked && !node?._attrs.disabled) {
+        node.checked = !node.checked
+      }
+    })
   }
 }
 
@@ -152,6 +119,7 @@ function radioGroupAttrs (style: TaroStyleType) {
   .backgroundColor(style.backgroundColor)
   .backgroundImage(style.backgroundImage, style.backgroundRepeat)
   .backgroundImageSize(style.backgroundImageSize)
+  .backgroundImagePosition(style.backgroundImagePosition)
   .rotate(style.rotate)
   .scale(style.scale)
   .translate(style.translate)
@@ -169,53 +137,37 @@ function radioGroupAttrs (style: TaroStyleType) {
 
 @Component
 export struct TaroRadioGroup {
-  nodeInfoMap: TaroAny = {}
+  node: TaroRadioGroupElement | null = null
 
   @Styles visibleChangeEvent () {
     .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
   }
 
-  @ObjectLink node: TaroRadioGroupElement
-
   aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
-    // 绑定动画
-    bindAnimation(this.node)
-    const childList = this.node.getElementsByTagName<TaroRadioElement>('RADIO')
-    childList.forEach(element => {
-      element.group = this.node._attrs.name || this.node._nid
-    })
-    // 阻止事件冒泡传递上去
-    this.node.addEventListener('change', (e: TaroEvent) => e.stopPropagation())
-  }
-
-  // Element使用的获取器
-  getValue (): string | undefined {
-    const childList = this.node.getElementsByTagName<TaroRadioElement>('RADIO')
-    for (let i = 0; i < childList.length; i++) {
-      if (childList[i]._instance.checked) {
-        return childList[i]._attrs.value
-      }
+    if (this.node) {
+      const childList = this.node.getElementsByTagName<TaroRadioElement>('RADIO')
+      childList.forEach(element => {
+        element.group = this.node?._attrs.name || this.node?._nid
+      })
+      // 阻止事件冒泡传递上去
+      this.node.addEventListener('change', (e: TaroEvent) => e.stopPropagation())
     }
-    return undefined
   }
 
   @Styles defaultEvent () {
     .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 => {
-      const eventResult: TaroAny = res.eventResult
-      this.nodeInfoMap[this.node._nid].areaInfo = eventResult[1]
+    .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+      if (this.node) {
+        this.node._nodeInfo.areaInfo = res[1]
+      }
     }))
   }
 
   build() {
-    TaroComponentWrapper({ node: this.node }) {
+    if (this.node) {
       Flex(FlexManager.flexOptions(this.node)) {
-        ForEach(this.node.childNodes, (item: TaroElement) => {
-          createNode(item)
-        }, (item: TaroElement) => item._nid)
+        createLazyChildren(this.node)
       }
       .radioGroupAttrs(getNormalAttributes(this.node))
       .defaultEvent()

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

@@ -1,11 +1,10 @@
-import { bindInstanceToNode, eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, initComponentNodeInfo, TaroAny } from '@tarojs/runtime'
+import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
 
-import TaroComponentWrapper from './base'
-import { getNodeThresholds, getNormalAttributes, shouldBindEvent, bindAnimation } from './utils/helper'
+
+import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
 
 import type { RichTextProps } from '@tarojs/components/types/RichText'
-import type { TaroRichTextElement } from './element'
-import type { TaroStyleType } from '@tarojs/runtime'
+import type { TaroAny, TaroStyleType, TaroRichTextElement } from '@tarojs/runtime'
 
 @Extend(RichText)
 function attrs (style: TaroStyleType) {
@@ -23,6 +22,7 @@ function attrs (style: TaroStyleType) {
   .backgroundColor(style.backgroundColor)
   .backgroundImage(style.backgroundImage, style.backgroundRepeat)
   .backgroundImageSize(style.backgroundImageSize)
+  .backgroundImagePosition(style.backgroundImagePosition)
   .rotate(style.rotate)
   .scale(style.scale)
   .translate(style.translate)
@@ -31,52 +31,28 @@ function attrs (style: TaroStyleType) {
   .borderWidth(style.borderWidth)
   .borderColor(style.borderColor)
   .borderRadius(style.borderRadius)
-  .linearGradient(style.linearGradient)
+  // .linearGradient(style.linearGradient)
   .zIndex(style.zIndex)
   .opacity(style.opacity)
   .clip(style.clip)
 }
 
-@Component
-export default struct TaroRichText {
-  nodeInfoMap: TaroAny = {}
-
-  @ObjectLink node: TaroRichTextElement
 
-  @Styles visibleChangeEvent () {
-    .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-  }
-  
-  aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
-    // 绑定动画
-    bindAnimation(this.node)
-  }
+function generateText (node: TaroRichTextElement): string {
+  return parseHtmlNode(node._attrs.nodes || '')
+}
 
-  @Styles defaultEvent () {
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-    .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, res => {
-      const eventResult: TaroAny = res.eventResult
-      this.nodeInfoMap[this.node._nid].areaInfo = eventResult[1]
+@Builder
+export default function TaroRichText (node: TaroRichTextElement) {
+  RichText(generateText(node))
+    .attrs(getNormalAttributes(node))
+    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
+    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+      node._nodeInfo.areaInfo = res[1]
     }))
-  }
-
-  generateText (): string {
-    return parseHtmlNode(this.node._attrs.nodes || '')
-  }
-
-  build() {
-    TaroComponentWrapper({ node: this.node }) {
-      RichText(this.generateText())
-        .attrs(getNormalAttributes(this.node))
-        .defaultEvent()
-        .visibleChangeEvent()
-    }
-  }
+    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
 }
 
-
 // 将nodeTree转换成harmony需要的string结构
 function nodeToHtml(node: RichTextProps.Text | RichTextProps.HTMLElement): string {
   if (node.type === 'text') {

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

@@ -1,14 +1,10 @@
-import { bindScrollTo, bindInstanceToNode, eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, initComponentNodeInfo,
-  TaroEvent, TaroAny } from '@tarojs/runtime'
+import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { createNode } from './render'
-import TaroComponentWrapper from './base'
+import { createLazyChildren } from './render'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { createTaroEvent } from './utils/events'
-import { getNodeThresholds, getNormalAttributes, shouldBindEvent, bindAnimation } from './utils/helper'
+import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
 
-import type { TaroScrollViewElement, TaroElement } from './element'
-import type { TaroStyleType } from '@tarojs/runtime'
+import type { TaroAny, TaroStyleType, TaroScrollViewElement, TaroEvent } from '@tarojs/runtime'
 
 interface ScrollViewAttrs {
   scrollBar: BarState
@@ -32,9 +28,13 @@ function rowAttrs (style: TaroStyleType) {
   .key(style.id)
   .padding(style.padding)
   .margin(style.margin)
-  .width(style.width)
   .height(style.height)
-  .constraintSize(style.constraintSize)
+  .constraintSize({
+    minWidth: style?.constraintSize?.minWidth || style.width,
+    minHeight: style?.constraintSize?.minHeight,
+    maxWidth: style?.constraintSize?.maxWidth,
+    maxHeight: style?.constraintSize?.maxHeight,
+  })
   .flexGrow(style.flexGrow)
   .flexShrink(style.flexShrink)
   .flexBasis(style.flexBasis)
@@ -42,6 +42,7 @@ function rowAttrs (style: TaroStyleType) {
   .backgroundColor(style.backgroundColor)
   .backgroundImage(style.backgroundImage, style.backgroundRepeat)
   .backgroundImageSize(style.backgroundImageSize)
+  .backgroundImagePosition(style.backgroundImagePosition)
   .rotate(style.rotate)
   .scale(style.scale)
   .translate(style.translate)
@@ -63,8 +64,12 @@ function columnAttrs (style: TaroStyleType) {
   .padding(style.padding)
   .margin(style.margin)
   .width(style.width)
-  .height(style.height)
-  .constraintSize(style.constraintSize)
+  .constraintSize({
+    minWidth: style?.constraintSize?.minWidth,
+    minHeight: style?.constraintSize?.minHeight || style.height,
+    maxWidth: style?.constraintSize?.maxWidth,
+    maxHeight: style?.constraintSize?.maxHeight,
+  })
   .flexGrow(style.flexGrow)
   .flexShrink(style.flexShrink)
   .flexBasis(style.flexBasis)
@@ -72,6 +77,7 @@ function columnAttrs (style: TaroStyleType) {
   .backgroundColor(style.backgroundColor)
   .backgroundImage(style.backgroundImage, style.backgroundRepeat)
   .backgroundImageSize(style.backgroundImageSize)
+  .backgroundImagePosition(style.backgroundImagePosition)
   .rotate(style.rotate)
   .scale(style.scale)
   .translate(style.translate)
@@ -97,103 +103,65 @@ function getAttributes (node: TaroScrollViewElement): ScrollViewAttrs {
   return scrollAttrs
 }
 
+function getScrollable (node: TaroScrollViewElement) {
+  const _attrs = node._attrs
 
-@Component
-export default struct TaroScrollView {
-  nodeInfoMap: TaroAny = {}
-
-  wrapper?: Area
-
-  @Styles visibleChangeEvent () {
-    .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-  }
-
-  scroller: Scroller = new Scroller()
-
-  @ObjectLink node: TaroScrollViewElement
-
-  aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
-    // 绑定动画
-    bindAnimation(this.node)
-    bindScrollTo(this.node, this)
-  }
-
-  @Styles defaultEvent () {
-    .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 => {
-      const eventResult: TaroAny = res.eventResult
-      this.nodeInfoMap[this.node._nid].areaInfo = eventResult[1]
-    }))
-  }
+  return _attrs.scrollX ? ScrollDirection.Horizontal : ScrollDirection.Vertical
+}
 
-  @Styles defaultContainerEvent () {
-    .onAreaChange(shouldBindEvent((areaResult: Area) => {
-      this.wrapper = areaResult
-    }, this.node, ['scroll', 'scrollstart', 'scrollend']))
+function handleScrollEvent (node: TaroScrollViewElement, eventName = 'scroll', xOffset?: number, yOffset?: number) {
+  const currentOffset: ScrollViewCurrentOffset = node.scroller.currentOffset()
+  const currentXOffset = currentOffset.xOffset
+  const currentYOffset = currentOffset.yOffset
+  const value: ScrollViewEvent = {
+    deltaX: vp2px(xOffset),
+    deltaY: vp2px(yOffset),
+    scrollLeft: vp2px(currentXOffset),
+    scrollTop: vp2px(currentYOffset),
+    scrollWidth: vp2px(Number(node._scroll?.width)),
+    scrollHeight: vp2px(Number(node._scroll?.height)),
   }
+  const event: TaroEvent = createTaroEvent(eventName, { detail: value }, node)
 
+  eventHandler(event, eventName, node)
+}
 
-  handleScrollEvent (eventName = 'scroll', xOffset?: number, yOffset?: number) {
-    const currentOffset: ScrollViewCurrentOffset = this.scroller.currentOffset()
-    const currentXOffset = currentOffset.xOffset
-    const currentYOffset = currentOffset.yOffset
-    const value: ScrollViewEvent = {
-      deltaX: vp2px(xOffset),
-      deltaY: vp2px(yOffset),
-      scrollLeft: vp2px(currentXOffset),
-      scrollTop: vp2px(currentYOffset),
-      scrollWidth: vp2px(Number(this.wrapper?.width)),
-      scrollHeight: vp2px(Number(this.wrapper?.height)),
-    }
-    const event: TaroEvent = createTaroEvent(eventName, { detail: value }, this.node)
-    eventHandler(event, eventName, this.node)
-  }
-
-  build() {
-    TaroComponentWrapper({ node: this.node }) {
-      // Copy 额外增加visibleChangeEvent
-      if (this.node._attrs.scrollX) {
-        Scroll(this.scroller) {
-          Row() {
-            ForEach(this.node.childNodes, (item: TaroElement) => {
-              createNode(item)
-            }, (item: TaroElement) => item._nid)
-          }
-          .rowAttrs(getNormalAttributes(this.node))
-          .width(null)
-          .defaultContainerEvent()
+@Builder
+export default function TaroScrollView (node: TaroScrollViewElement) {
+    Scroll(node.scroller) {
+      if (node._attrs.scrollX) {
+        Row() {
+          createLazyChildren(node)
         }
-        .flexGrow(getNormalAttributes(this.node).flexGrow)
-        .scrollable(ScrollDirection.Horizontal)
-        .scrollBar(getAttributes(this.node).scrollBar)
-        .defaultEvent()
-        .onScroll(shouldBindEvent(() => { this.handleScrollEvent('scroll') }, this.node, ['scroll']))
-        .onScrollStart(shouldBindEvent(() => { this.handleScrollEvent('scrollstart') }, this.node, ['scrollstart']))
-        .onScrollStop(shouldBindEvent(() => { this.handleScrollEvent('scrollend') }, this.node, ['scrollend']))
-        .visibleChangeEvent()
+        .width(null)
+        .rowAttrs(getNormalAttributes(node))
+        .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
+          node._scroll = areaResult
+        }, node, ['scroll', 'scrollstart', 'scrollend']))
       } else {
-        Scroll(this.scroller) {
-          Column() {
-            ForEach(this.node.childNodes, (item: TaroElement) => {
-              createNode(item)
-            }, (item: TaroElement) => item._nid)
-          }
-          .columnAttrs(getNormalAttributes(this.node))
-          .height(null)
-          .defaultContainerEvent()
+        Column() {
+          createLazyChildren(node)
         }
-        .flexGrow(getNormalAttributes(this.node).flexGrow)
-        .scrollable(ScrollDirection.Vertical)
-        .scrollBar(getAttributes(this.node).scrollBar)
-        .defaultEvent()
-        .onScroll(shouldBindEvent(() => { this.handleScrollEvent('scroll') }, this.node, ['scroll']))
-        .onScrollStart(shouldBindEvent(() => { this.handleScrollEvent('scrollstart') }, this.node, ['scrollstart']))
-        .onScrollStop(shouldBindEvent(() => { this.handleScrollEvent('scrollend') }, this.node, ['scrollend']))
-        .visibleChangeEvent()
+        .height(null)
+        .columnAttrs(getNormalAttributes(node))
+        .alignItems(HorizontalAlign.Start)
+        .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
+          node._scroll = areaResult
+        }, node, ['scroll', 'scrollstart', 'scrollend']))
       }
     }
-  }
+    .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,30 +1,15 @@
-import { bindInstanceToNode, eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, initComponentNodeInfo,
-  TaroEvent, TaroAny } from '@tarojs/runtime'
+import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import TaroComponentWrapper from './base'
-import { createTaroEvent } from './utils/events'
 import { getNodeThresholds, shouldBindEvent, getNormalAttributes } from './utils/helper'
 
-import type { TaroSliderElement } from './element'
-import type { TaroStyleType } from '@tarojs/runtime'
+import type { TaroAny, TaroSliderElement, TaroStyleType, TaroEvent } from '@tarojs/runtime'
 
-interface SliderOptions {
-  min?: number
-  max?: number
-  value?: number
-  step?: number
-  style?: SliderStyle
-  direction?: Axis
-}
 interface SliderAttrs {
   selectedColor?: ResourceColor
   trackColor?: ResourceColor
   trackThickness?: Length
   blockColor?: ResourceColor
 }
-interface SliderParams {
-  width: string
-}
 
 @Extend(Slider)
 function style (style: TaroStyleType) {
@@ -42,6 +27,7 @@ function style (style: TaroStyleType) {
   .backgroundColor(style.backgroundColor)
   .backgroundImage(style.backgroundImage, style.backgroundRepeat)
   .backgroundImageSize(style.backgroundImageSize)
+  .backgroundImagePosition(style.backgroundImagePosition)
   .rotate(style.rotate)
   .scale(style.scale)
   .translate(style.translate)
@@ -81,79 +67,70 @@ function themeStyles(isDisabled: boolean) {
 
 @Component
 export default struct TaroSlider {
-  nodeInfoMap: TaroAny = {}
-
-  @ObjectLink node: TaroSliderElement
+  node: TaroSliderElement | null = null
 
   @State value: number = 0
 
-  @Styles visibleChangeEvent () {
-    .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-  }
-
   aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
-
-    this.value = Number(this.node._attrs.value || 0)
-  }
-
-  @Styles defaultEvent () {
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-    .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, res => {
-      const eventResult: TaroAny = res.eventResult
-      this.nodeInfoMap[this.node._nid].areaInfo = eventResult[1]
-    }))
+    if (this.node) {
+      this.value = this.node.value
+      this.node._instance = this
+    }
   }
 
-  @Builder createSlider () {
+  @Builder createSlider (node: TaroSliderElement) {
     Slider({
-      min: Number(this.node._attrs.min || 0),
-      max: Number(this.node._attrs.max || 100),
+      min: Number(node._attrs.min || 0),
+      max: Number(node._attrs.max || 100),
       value: this.value,
-      step: Number(this.node._attrs.step || 1),
+      step: Number(node._attrs.step || 1),
       style: SliderStyle.OutSet,
       direction: Axis.Horizontal
     })
-      .defaultEvent()
-      .style(getNormalAttributes(this.node))
-      .attrs(getAttributes(this.node))
-      .width(!!this.node._attrs.showValue ? '90%' : '100%')
-      .themeStyles(!!this.node._attrs.disabled)
+      .style(getNormalAttributes(node))
+      .attrs(getAttributes(node))
+      .width(!!node._attrs.showValue ? '90%' : '100%')
+      .themeStyles(!!node._attrs.disabled)
       .onChange((value: number, mode: SliderChangeMode) => {
-        if (!!this.node._attrs.disabled) {
+        if (!!node._attrs.disabled) {
           if (mode === SliderChangeMode.End) {
-            // FIXME 找下文档是否有强制刷新方法
-            this.value = this.value + 0.01
-            this.value = this.value - 0.01
+            this.node?.updateComponent()
           }
         } else {
           this.value = value
+          this.node?.updateFormWidgetValue(value)
+          
           if (mode === SliderChangeMode.End) {
-            const event: TaroEvent = createTaroEvent('change', { detail: { value: this.value } }, this.node)
-            eventHandler(event, 'change', this.node)
+            const event: TaroEvent = createTaroEvent('change', { detail: { value: this.value } }, node)
+            eventHandler(event, 'change', node)
           } else if (mode === SliderChangeMode.Moving) {
-            const event: TaroEvent = createTaroEvent('changing', { detail: { value: this.value } }, this.node)
-            eventHandler(event, 'changing', this.node)
+            const event: TaroEvent = createTaroEvent('changing', { detail: { value: this.value } }, node)
+            eventHandler(event, 'changing', node)
           }
         }
       })
-      .visibleChangeEvent()
+      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .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))
   }
 
   build() {
-    TaroComponentWrapper({ node: this.node }) {
+    if (this.node) {
       if (!!this.node._attrs.showValue) {
         Row() {
-          this.createSlider()
+          this.createSlider(this.node)
           Text(Number(this.value).toFixed(0))
             .width('10%')
             .textAlign(TextAlign.Center)
             .opacity(!!this.node._attrs.disabled ? 0.4 : 1)
         }
       } else {
-        this.createSlider()
+        this.createSlider(this.node)
       }
     }
   }
-}
+}