Skip to content
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

[fix] popup-picker 分隔线选择器使用 first-of-type #2881

Open
wants to merge 2 commits into
base: v2
Choose a base branch
from
Open

[fix] popup-picker 分隔线选择器使用 first-of-type #2881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3df2975
type: fix
TomIsion Jun 23, 2018
9b26393
Merge branch 'v2' into v2
TomIsion Jun 23, 2018
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
2 changes: 1 addition & 1 deletion src/components/popup-picker/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ export default {
.vux-cell-box {
position: relative;
}
.vux-cell-box:not(:first-child):before {
.vux-cell-box:not(:first-of-type):before {
content: " ";
position: absolute;
top: 0;
Expand Down
5 changes: 5 additions & 0 deletions src/components/popup-picker/metas.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ events:
en: emits when picker value is changed
zh-CN: picker 值变化时触发，即滑动 picker 时触发
changes:
next:
en:
- '[fix] use first-of-type inplace of first-child #2880'
zh-CN:
- '[fix] 多个picker同时出现时使用 first-of-type 来实现分割线 #2880'
v2.9.0:
en:
- '[feature] add prop:disabled #2594'
Expand Down
2 changes: 1 addition & 1 deletion src/demos/PopupPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<br>

<group title="显示格式化">
<popup-picker title="时间" :inline-desc="`当前值[${formatDemoValue}]`"v-model="formatDemoValue" :data="[['01','02','03'],['11','12','13']]" :display-format="format"></popup-picker>
<popup-picker title="时间" :inline-desc="`当前值[${formatDemoValue}]`" v-model="formatDemoValue" :data="[['01','02','03'],['11','12','13']]" :display-format="format"></popup-picker>
</group>
</div>
</template>
Expand Down