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 #3263 #3264

Open
wants to merge 1 commit into
base: v2
Choose a base branch
from
Open

fix #3263 #3264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 4 additions & 20 deletions src/components/popup-picker/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
</slot>
<inline-desc v-if="inlineDesc">{{ inlineDesc }}</inline-desc>
</div>
<div class="vux-cell-primary vux-popup-picker-select-box">
<div class="weui-cell__bd vux-popup-picker-select-box">
<div class="vux-popup-picker-select" :style="{textAlign: valueTextAlign}">
<span class="vux-popup-picker-value vux-cell-value" v-if="!displayFormat && !showName && value.length">{{value | array2string}}</span>
<span class="vux-popup-picker-value vux-cell-value" v-if="!displayFormat && showName && value.length">{{value | value2name(data)}}</span>
<span class="vux-popup-picker-value vux-cell-value" v-if="displayFormat && value.length">{{ displayFormat(value, value2name(value, data)) }}</span>
<span class="vux-popup-picker-value weui-input" v-if="!displayFormat && !showName && value.length">{{value | array2string}}</span>
<span class="vux-popup-picker-value weui-input" v-if="!displayFormat && showName && value.length">{{value | value2name(data)}}</span>
<span class="vux-popup-picker-value weui-input" v-if="displayFormat && value.length">{{ displayFormat(value, value2name(value, data)) }}</span>
<span v-if="!value.length && placeholder" v-text="placeholder" class="vux-popup-picker-placeholder vux-cell-placeholder"></span>
</div>
</div>
Expand Down Expand Up @@ -289,22 +289,6 @@ export default {
width: 100%;
position: relative;
}
.vux-popup-picker-select-box.weui-cell__bd:after {
content: " ";
display: inline-block;
transform: rotate(45deg);
height: 6px;
width: 6px;
border-width: 2px 2px 0 0;
border-color: #C8C8CD;
border-style: solid;
position: relative;
top: -2px;
position: absolute;
top: 50%;
right: 15px;
margin-top: -3px;
}
.vux-popup-picker-cancel {
color: @popup-picker-header-cancel-text-color;
}
Expand Down