Merge branch '2.x' into dev

package.json

@@ -68,7 +68,8 @@
   "devDependencies": {
     "@vant/cli": "^3.1.4",
     "@vue/compiler-sfc": "3.0.3",
-    "vue": "3.0.3"
+    "vue": "3.0.3",
+    "prettier": "2.1.0"
   },
   "sideEffects": [
     "es/**/style/*",

src/form/README.zh-CN.md

@@ -38,9 +38,7 @@ app.use(Form);
     :rules="[{ required: true, message: '请填写密码' }]"
   />
   <div style="margin: 16px;">
-    <van-button round block type="primary" native-type="submit">
-      提交
-    </van-button>
+    <van-button round block type="info" native-type="submit">提交</van-button>
   </div>
 </van-form>
 ```
@@ -89,9 +87,9 @@ export default {
     :rules="[{ validator: asyncValidator, message: '请输入正确内容' }]"
   />
   <div style="margin: 16px;">
-    <van-button round block type="primary" native-type="submit">
-      提交
-    </van-button>
+    <van-button round block type="primary" native-type="submit"
+      >提交</van-button
+    >
   </div>
 </van-form>
 ```

src/notice-bar/README.md

@@ -82,7 +82,7 @@ app.use(NoticeBar);
 ### Props
 
 | Attribute | Description | Type | Default |
-| --- | --- | --- | --- | --- |
+| --- | --- | --- | --- |
 | mode | Mode, can be set to `closeable` `link` | _string_ | `''` |
 | text | Notice text content | _string_ | `''` | - |
 | color | Text color | _string_ | `#f60` |

src/swipe-cell/README.md

@@ -137,8 +137,8 @@ export default {
 Use [ref](https://v3.vuejs.org/guide/component-template-refs.html) to get SwipeCell instance and call instance methods.
 
 | Name  | Description     | Attribute                 | Return value |
-| ----- | --------------- | --------------- | ------------ | --- |
-| open  | open SwipeCell  | position: `left | right`       | -   |
+| ----- | --------------- | ------------------------- | ------------ |
+| open  | open SwipeCell  | position: `left \| right` | -            |
 | close | close SwipeCell | -                         | -            |
 
 ### Less Variables

src/swipe-cell/README.zh-CN.md

@@ -149,8 +149,8 @@ beforeClose 的第一个参数为对象，对象中包含以下属性：
 通过 ref 可以获取到 SwipeCell 实例并调用实例方法，详见[组件实例方法](#/zh-CN/advanced-usage#zu-jian-shi-li-fang-fa)。
 
 | 方法名 | 说明             | 参数                      | 返回值 |
-| ------ | ---------------- | --------------- | ------ | --- |
-| open   | 打开单元格侧边栏 | position: `left | right` | -   |
+| ------ | ---------------- | ------------------------- | ------ |
+| open   | 打开单元格侧边栏 | position: `left \| right` | -      |
 | close  | 收起单元格侧边栏 | -                         | -      |
 
 ### 样式变量

yarn.lock

@@ -8374,6 +8374,11 @@ prepend-http@^2.0.0:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
   integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
+prettier@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npm.taobao.org/prettier/download/prettier-2.1.0.tgz?cache=0&sync_timestamp=1606521234483&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fprettier%2Fdownload%2Fprettier-2.1.0.tgz#5a9789f767a243118c60f3e56d95cb6544914fbb"
+  integrity sha1-WpeJ92eiQxGMYPPlbZXLZUSRT7s=
+
 prettier@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npm.taobao.org/prettier/download/prettier-2.2.0.tgz#8a03c7777883b29b37fb2c4348c66a78e980418b"