Merge branch 'dev' into next

2020-10-22 16:10:38 +08:00
parent c7a2a538e1 abbf448a43
commit b5cd336bb8
29 changed files with 276 additions and 80 deletions
@@ -21,9 +21,7 @@ Use `v-model` to control the name of active panels.
 <van-collapse v-model="activeNames">
  <van-collapse-item title="Title1" name="1">Content</van-collapse-item>
  <van-collapse-item title="Title2" name="2">Content</van-collapse-item>
-  <van-collapse-item title="Title3" name="3" disabled
-    >Content</van-collapse-item
-  >
+  <van-collapse-item title="Title3" name="3">Content</van-collapse-item>
 </van-collapse>
 ```

@@ -59,6 +57,22 @@ export default {
 };
 ```

+### Disabled
+
+Use the `disabled` prop to disable CollaseItem.
+
+```html
+<van-collapse v-model="activeNames">
+  <van-collapse-item title="Title1" name="1">Content</van-collapse-item>
+  <van-collapse-item title="Title2" name="2" disabled>
+    Content
+  </van-collapse-item>
+  <van-collapse-item title="Title3" name="3" disabled>
+    Content
+  </van-collapse-item>
+</van-collapse>
+```
+
 ### Custom title

 ```html