Merge branch '2.x' into dev

2020-12-21 11:02:14 +08:00
parent 3027d7cd01 659ea9cf07
commit 8bbd944ece
28 changed files with 1373 additions and 0 deletions
@@ -317,6 +317,7 @@ export default createComponent({
          title={item.title}
          color={props.color}
          style={item.titleStyle}
+          class={item.titleClass}
          isActive={index === state.currentIndex}
          disabled={item.disabled}
          scrollable={scrollable.value}
@@ -418,6 +419,7 @@ export default createComponent({
      props,
      setLine,
      currentName,
+      scrollIntoView,
    });

    return () => (