Skip to content

feat: grid-item用icon插槽时也能用info属性 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
levy9527 merged 4 commits into from
Nov 12, 2019
Merged

feat: grid-item用icon插槽时也能用info属性 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e071fd
feat: grid-item用icon插槽时也能用info属性
donaldshen Nov 12, 2019
06e87a7
test: 更新snapshot
donaldshen Nov 12, 2019
8ef3aee
chore: push时运行test
donaldshen Nov 12, 2019
709b459
feat: 更好的slot效果
donaldshen Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"husky": {
"hooks": {
"pre-commit": "lint-staged",
"commit-msg": "vant commit-lint"
"commit-msg": "vant commit-lint",
"pre-push": "yarn test"
}
},
"lint-staged": {
Expand Down
12 changes: 3 additions & 9 deletions src/address-list/test/__snapshots__/demo.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-radio__icon van-radio__icon--round van-radio__icon--checked"><i class="van-icon van-icon-success">
<!----></i></div><span class="van-radio__label">设为默认</span>
</div>
<div class="van-address-item__icons-wrapper"><i class="van-icon van-icon-edit van-address-item__edit">
<!----></i><i class="van-icon van-icon-delete van-address-item__delete">
<!----></i></div>
<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>
</div>
</div>
</div>
Expand All @@ -33,9 +31,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-radio__icon van-radio__icon--round"><i class="van-icon van-icon-success">
<!----></i></div><span class="van-radio__label">设为默认</span>
</div>
<div class="van-address-item__icons-wrapper"><i class="van-icon van-icon-edit van-address-item__edit">
<!----></i><i class="van-icon van-icon-delete van-address-item__delete">
<!----></i></div>
<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>
</div>
</div>
</div>
Expand All @@ -52,9 +48,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-radio__icon van-radio__icon--round"><i class="van-icon van-icon-success">
<!----></i></div><span class="van-radio__label">设为默认</span>
</div>
<div class="van-address-item__icons-wrapper"><i class="van-icon van-icon-edit van-address-item__edit">
<!----></i><i class="van-icon van-icon-delete van-address-item__delete">
<!----></i></div>
<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>
</div>
</div>
</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>
Expand Down
8 changes: 2 additions & 6 deletions src/address-list/test/__snapshots__/index.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ exports[`unswitchable 1`] = `
<div class="van-radio__icon van-radio__icon--round"><i class="van-icon van-icon-success">
<!----></i></div><span class="van-radio__label">设为默认</span>
</div>
<div class="van-address-item__icons-wrapper"><i class="van-icon van-icon-edit van-address-item__edit">
<!----></i><i class="van-icon van-icon-delete van-address-item__delete">
<!----></i></div>
<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>
</div>
</div>
</div>
Expand All @@ -31,9 +29,7 @@ exports[`unswitchable 1`] = `
<div class="van-radio__icon van-radio__icon--round"><i class="van-icon van-icon-success">
<!----></i></div><span class="van-radio__label">设为默认</span>
</div>
<div class="van-address-item__icons-wrapper"><i class="van-icon van-icon-edit van-address-item__edit">
<!----></i><i class="van-icon van-icon-delete van-address-item__delete">
<!----></i></div>
<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>
</div>
</div>
</div>
Expand Down
18 changes: 8 additions & 10 deletions src/grid-item/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { BORDER } from '../utils/constant';
import { ChildrenMixin } from '../mixins/relation';
import { route, routeProps } from '../utils/router';
import Icon from '../icon';
import Info from '../info';

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

Expand Down Expand Up @@ -69,16 +70,13 @@ export default createComponent({
}

return [
this.slots('icon') ||
(this.icon && (
<Icon
name={this.icon}
dot={this.dot}
info={this.info}
size={this.parent.iconSize}
class={bem('icon')}
/>
)),
<div style="display: flex; position: relative">
{this.slots('icon') ||
(this.icon && (
<Icon name={this.icon} size={this.parent.iconSize} class={bem('icon')} />
))}
<Info dot={this.dot} info={this.info} />
</div>,
this.slots('text') || (this.text && <span class={bem('text')}>{this.text}</span>)
];
}
Expand Down
3 changes: 3 additions & 0 deletions src/grid/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ Vue.use(Grid).use(GridItem);
<van-grid :column-num="2">
<van-grid-item icon="home-o" text="Text" dot />
<van-grid-item icon="search" text="Text" info="99+" />
<van-grid-item text="Text" info="99+">
<span slot="icon">slot=icon</span>
</van-grid-item>
</van-grid>
```

Expand Down
3 changes: 3 additions & 0 deletions src/grid/README.zh-CN.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ Vue.use(Grid).use(GridItem);
<van-grid :column-num="2">
<van-grid-item icon="home-o" text="文字" dot />
<van-grid-item icon="search" text="文字" info="99+" />
<van-grid-item text="文字" info="99+">
<span slot="icon">slot=icon</span>
</van-grid-item>
</van-grid>
```

Expand Down
3 changes: 3 additions & 0 deletions src/grid/demo/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
<van-grid :column-num="2">
<van-grid-item icon="home-o" :text="$t('text')" dot />
<van-grid-item icon="search" :text="$t('text')" info="99+" />
<van-grid-item :text="$t('text')" info="99+">
<span slot="icon">slot=icon</span>
</van-grid-item>
</van-grid>
</demo-block>
</demo-section>
Expand Down
Loading