Merge branch '2.x' into dev

2020-11-26 21:05:57 +08:00
parent ea44d636ba 1855cffeb2
commit 52fdf99c69
21 changed files with 240 additions and 62 deletions
@@ -160,7 +160,7 @@ test('toggleAll method', async () => {
      <van-checkbox-group v-model="result" ref="group">
        <van-checkbox name="a" />
        <van-checkbox name="b" />
-        <van-checkbox name="c" />
+        <van-checkbox name="c" disabled />
      </van-checkbox-group>
    `,
    data() {
@@ -186,4 +186,12 @@ test('toggleAll method', async () => {
  wrapper.vm.toggleAll(true);
  await later();
  expect(wrapper.vm.result).toEqual(['a', 'b', 'c']);
+
+  wrapper.vm.toggleAll({ skipDisabled: true });
+  await later();
+  expect(wrapper.vm.result).toEqual(['c']);
+
+  wrapper.vm.toggleAll({ checked: true, skipDisabled: true });
+  await later();
+  expect(wrapper.vm.result).toEqual(['a', 'b', 'c']);
 });