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
@@ -125,3 +125,23 @@ test('disabled in cascade', () => {

  expect(wrapper.find('.van-picker-column__item--disabled')).toMatchSnapshot();
 });
+
+test('should move to next option when default option is disabled', () => {
+  const wrapper = mount(Picker, {
+    propsData: {
+      columns: [
+        {
+          text: 'A1',
+          disabled: true,
+          children: [{ text: 'B1' }, { text: 'B2' }],
+        },
+        {
+          text: 'A2',
+          children: [{ text: 'B3' }, { text: 'B4' }],
+        },
+      ],
+    },
+  });
+
+  expect(wrapper).toMatchSnapshot();
+});