Merge branch '2.x' into dev

2020-11-04 20:06:59 +08:00
parent fdac9b15f5 287a4acea0
commit 1805f21308
18 changed files with 88 additions and 16 deletions
@@ -66,7 +66,15 @@ export default createComponent({
      let cursor = { children: props.columns };

      while (cursor && cursor.children) {
-        const defaultIndex = cursor.defaultIndex ?? +props.defaultIndex;
+        const { children } = cursor;
+        let defaultIndex = cursor.defaultIndex ?? +this.defaultIndex;
+
+        while (
+          children[defaultIndex].disabled &&
+          defaultIndex < children.length - 1
+        ) {
+          defaultIndex++;
+        }

        formatted.push({
          values: cursor.children,
@@ -74,7 +82,7 @@ export default createComponent({
          defaultIndex,
        });

-        cursor = cursor.children[defaultIndex];
+        cursor = children[defaultIndex];
      }

      formattedColumns.value = formatted;