Merge branch '2.x' into dev

2020-10-29 22:03:29 +08:00
parent 1bb46ab003 0cb55c33e0
commit 2293b652ab
7 changed files with 81 additions and 13 deletions
@@ -377,7 +377,7 @@ export default createComponent({
    watch(
      () => children.length,
      () => {
-        setCurrentIndexByName(currentName.value || props.active);
+        setCurrentIndexByName(props.active || currentName.value);
        setLine();
        nextTick(() => {
          scrollIntoView(true);