Skip to content

Commit ee8c38c

Browse files
author
levy
committed
Merge branch 'dev'
2 parents 36e8786 + 2405bcc commit ee8c38c

File tree

10 files changed

+231
-92
lines changed

10 files changed

+231
-92
lines changed

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
"husky": {
3333
"hooks": {
3434
"pre-commit": "lint-staged",
35-
"commit-msg": "vant commit-lint"
35+
"commit-msg": "vant commit-lint",
36+
"pre-push": "yarn test"
3637
}
3738
},
3839
"lint-staged": {

‎src/address-list/test/__snapshots__/demo.spec.js.snap

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ exports[`renders demo correctly 1`] = `
1616
<div class="van-radio__icon van-radio__icon--round van-radio__icon--checked"><i class="van-icon van-icon-success">
1717
<!----></i></div><span class="van-radio__label">设为默认</span>
1818
</div>
19-
<div class="van-address-item__icons-wrapper"><i class="van-icon van-icon-edit van-address-item__edit">
20-
<!----></i><i class="van-icon van-icon-delete van-address-item__delete">
21-
<!----></i></div>
19+
<div class="van-address-item__icons-wrapper"><span class="van-address-item__edit" style="display: flex;"><i class="van-icon van-icon-edit"><!----></i></span><span class="van-address-item__delete" style="display: flex;"><i class="van-icon van-icon-delete"><!----></i></span></div>
2220
</div>
2321
</div>
2422
</div>
@@ -33,9 +31,7 @@ exports[`renders demo correctly 1`] = `
3331
<div class="van-radio__icon van-radio__icon--round"><i class="van-icon van-icon-success">
3432
<!----></i></div><span class="van-radio__label">设为默认</span>
3533
</div>
36-
<div class="van-address-item__icons-wrapper"><i class="van-icon van-icon-edit van-address-item__edit">
37-
<!----></i><i class="van-icon van-icon-delete van-address-item__delete">
38-
<!----></i></div>
34+
<div class="van-address-item__icons-wrapper"><span class="van-address-item__edit" style="display: flex;"><i class="van-icon van-icon-edit"><!----></i></span><span class="van-address-item__delete" style="display: flex;"><i class="van-icon van-icon-delete"><!----></i></span></div>
3935
</div>
4036
</div>
4137
</div>
@@ -52,9 +48,7 @@ exports[`renders demo correctly 1`] = `
5248
<div class="van-radio__icon van-radio__icon--round"><i class="van-icon van-icon-success">
5349
<!----></i></div><span class="van-radio__label">设为默认</span>
5450
</div>
55-
<div class="van-address-item__icons-wrapper"><i class="van-icon van-icon-edit van-address-item__edit">
56-
<!----></i><i class="van-icon van-icon-delete van-address-item__delete">
57-
<!----></i></div>
51+
<div class="van-address-item__icons-wrapper"><span class="van-address-item__edit" style="display: flex;"><i class="van-icon van-icon-edit"><!----></i></span><span class="van-address-item__delete" style="display: flex;"><i class="van-icon van-icon-delete"><!----></i></span></div>
5852
</div>
5953
</div>
6054
</div><button class="van-button van-button--danger van-button--large van-button--square van-address-list__add"><span class="van-button__text">新增地址</span></button>

‎src/address-list/test/__snapshots__/index.spec.js.snap

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ exports[`unswitchable 1`] = `
1414
<div class="van-radio__icon van-radio__icon--round"><i class="van-icon van-icon-success">
1515
<!----></i></div><span class="van-radio__label">设为默认</span>
1616
</div>
17-
<div class="van-address-item__icons-wrapper"><i class="van-icon van-icon-edit van-address-item__edit">
18-
<!----></i><i class="van-icon van-icon-delete van-address-item__delete">
19-
<!----></i></div>
17+
<div class="van-address-item__icons-wrapper"><span class="van-address-item__edit" style="display: flex;"><i class="van-icon van-icon-edit"><!----></i></span><span class="van-address-item__delete" style="display: flex;"><i class="van-icon van-icon-delete"><!----></i></span></div>
2018
</div>
2119
</div>
2220
</div>
@@ -31,9 +29,7 @@ exports[`unswitchable 1`] = `
3129
<div class="van-radio__icon van-radio__icon--round"><i class="van-icon van-icon-success">
3230
<!----></i></div><span class="van-radio__label">设为默认</span>
3331
</div>
34-
<div class="van-address-item__icons-wrapper"><i class="van-icon van-icon-edit van-address-item__edit">
35-
<!----></i><i class="van-icon van-icon-delete van-address-item__delete">
36-
<!----></i></div>
32+
<div class="van-address-item__icons-wrapper"><span class="van-address-item__edit" style="display: flex;"><i class="van-icon van-icon-edit"><!----></i></span><span class="van-address-item__delete" style="display: flex;"><i class="van-icon van-icon-delete"><!----></i></span></div>
3733
</div>
3834
</div>
3935
</div>

‎src/grid-item/index.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { BORDER } from '../utils/constant';
33
import { ChildrenMixin } from '../mixins/relation';
44
import { route, routeProps } from '../utils/router';
55
import Icon from '../icon';
6+
import Info from '../info';
67

78
const [createComponent, bem] = createNamespace('grid-item');
89

@@ -69,16 +70,13 @@ export default createComponent({
6970
}
7071

7172
return [
72-
this.slots('icon') ||
73-
(this.icon && (
74-
<Icon
75-
name={this.icon}
76-
dot={this.dot}
77-
info={this.info}
78-
size={this.parent.iconSize}
79-
class={bem('icon')}
80-
/>
81-
)),
73+
<div style="display: flex; position: relative">
74+
{this.slots('icon') ||
75+
(this.icon && (
76+
<Icon name={this.icon} size={this.parent.iconSize} class={bem('icon')} />
77+
))}
78+
<Info dot={this.dot} info={this.info} />
79+
</div>,
8280
this.slots('text') || (this.text && <span class={bem('text')}>{this.text}</span>)
8381
];
8482
}

‎src/grid/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ Vue.use(Grid).use(GridItem);
9292
<van-grid :column-num="2">
9393
<van-grid-item icon="home-o" text="Text" dot />
9494
<van-grid-item icon="search" text="Text" info="99+" />
95+
<van-grid-item text="Text" info="99+">
96+
<span slot="icon">slot=icon</span>
97+
</van-grid-item>
9598
</van-grid>
9699
```
97100

‎src/grid/README.zh-CN.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ Vue.use(Grid).use(GridItem);
110110
<van-grid :column-num="2">
111111
<van-grid-item icon="home-o" text="文字" dot />
112112
<van-grid-item icon="search" text="文字" info="99+" />
113+
<van-grid-item text="文字" info="99+">
114+
<span slot="icon">slot=icon</span>
115+
</van-grid-item>
113116
</van-grid>
114117
```
115118

‎src/grid/demo/index.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@
4949
<van-grid :column-num="2">
5050
<van-grid-item icon="home-o" :text="$t('text')" dot />
5151
<van-grid-item icon="search" :text="$t('text')" info="99+" />
52+
<van-grid-item :text="$t('text')" info="99+">
53+
<span slot="icon">slot=icon</span>
54+
</van-grid-item>
5255
</van-grid>
5356
</demo-block>
5457
</demo-section>

0 commit comments

Comments
 (0)