blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.x' into dev

Browse Source
This commit is contained in:
chenjiahan 2020-12-14 17:07:29 +08:00
commit 96204b350c
11 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -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/*",

2
src/empty/README.md
View File

@ -51,7 +51,7 @@ Use the image prop to display different placeholder images.
```html
<van-empty description="Description">
<van-button round type="danger" class="bottom-button"> Button </van-button>
<van-button round type="danger" class="bottom-button">Button</van-button>
</van-empty>
<style>

2
src/empty/README.zh-CN.md
View File

@ -60,7 +60,7 @@ Empty 组件内置了多种占位图片类型，可以在不同业务场景下
```html
<van-empty description="描述文字">
<van-button round type="danger" class="bottom-button"> 按钮 </van-button>
<van-button round type="danger" class="bottom-button">按钮</van-button>
</van-empty>
<style>

10
src/form/README.zh-CN.md
View File

@ -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>
```

8
src/notice-bar/README.md
View File

@ -34,15 +34,15 @@ app.use(NoticeBar);
### Wrapable
```html
<van-notice-bar wrapable :scrollable="false"> Notice Content </van-notice-bar>
<van-notice-bar wrapable :scrollable="false">Notice Content</van-notice-bar>
```
### Mode
```html
<van-notice-bar mode="closeable"> Notice Content </van-notice-bar>
<van-notice-bar mode="closeable">Notice Content</van-notice-bar>
<van-notice-bar mode="link"> Notice Content </van-notice-bar>
<van-notice-bar mode="link">Notice Content</van-notice-bar>
```
### Custom Style
@ -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` |

4
src/notice-bar/README.zh-CN.md
View File

@ -60,10 +60,10 @@ app.use(NoticeBar);
```html
<!-- closeable 模式，在右侧显示关闭按钮 -->
<van-notice-bar mode="closeable"> 技术是开发它的人的共同灵魂。 </van-notice-bar>
<van-notice-bar mode="closeable">技术是开发它的人的共同灵魂。</van-notice-bar>
<!-- link 模式，在右侧显示链接箭头 -->
<van-notice-bar mode="link"> 技术是开发它的人的共同灵魂。 </van-notice-bar>
<van-notice-bar mode="link">技术是开发它的人的共同灵魂。</van-notice-bar>
```
### 自定义样式

2
src/number-keyboard/README.md
View File

@ -15,7 +15,7 @@ app.use(NumberKeyboard);
### Default Keyboard
```html
<van-cell @touchstart.stop="show = true"> Show Keyboard </van-cell>
<van-cell @touchstart.stop="show = true">Show Keyboard</van-cell>
<van-number-keyboard
:show="show"
@blur="show = false"

2
src/number-keyboard/README.zh-CN.md
View File

@ -21,7 +21,7 @@ app.use(NumberKeyboard);
数字键盘提供了 `input`、`delete`、`blur` 事件，分别对应输入内容、删除内容和失去焦点的动作。
```html
<van-cell @touchstart.stop="show = true"> 弹出默认键盘 </van-cell>
<van-cell @touchstart.stop="show = true">弹出默认键盘</van-cell>
<van-number-keyboard
:show="show"
@blur="show = false"

8
src/swipe-cell/README.md
View File

@ -136,10 +136,10 @@ 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` | - |
| close | close SwipeCell | - | - |
| Name | Description | Attribute | Return value |
| ----- | --------------- | ------------------------- | ------------ |
| open | open SwipeCell | position: `left \| right` | - |
| close | close SwipeCell | - | - |
### Less Variables

8
src/swipe-cell/README.zh-CN.md
View File

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

5
yarn.lock
View File

@ -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"