Merge branch 'dev' into next

2020-08-07 06:33:04 +08:00
parent 49206598fc db94fa3193
commit 17c64b24e7
84 changed files with 898 additions and 345 deletions
@@ -335,7 +335,9 @@ export default createComponent({
          allowHtml={this.allowHtml}
          className={item.className}
          itemHeight={this.itemPxHeight}
-          defaultIndex={item.defaultIndex || +this.defaultIndex}
+          defaultIndex={
+            isDef(item.defaultIndex) ? item.defaultIndex : +this.defaultIndex
+          }
          swipeDuration={this.swipeDuration}
          visibleItemCount={this.visibleItemCount}
          initialOptions={item.values}