theluyuan/xm-select
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.0.0.0723

Browse Source 
1.修改safari下close图标偏移的问题
2.修改windows系统下选中图标位置错位的问题
3.修改图标前缀避免冲突
This commit is contained in:
maplemei 2019-07-23 17:51:19 +08:00
parent 66321b8e95
commit c0a486b873
6 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/xm-select.js vendored
View File

File diff suppressed because one or more lines are too long

4
index.html
View File

@ -162,7 +162,7 @@
label: { label: {
type: 'count', type: 'count',
count: { count: {
template(data, sels){ template: function(data, sels){
return "已选中 " + sels.length + " 项, 共 " + data.length + " 项" return "已选中 " + sels.length + " 项, 共 " + data.length + " 项"
} }
} }
@ -182,7 +182,7 @@
label: { label: {
type: 'count', type: 'count',
count: { count: {
template(data, sels){ template: function(data, sels){
return "我是自定义的... 已选中 " + sels.length + " 项, 共 " + data.length + " 项" return "我是自定义的... 已选中 " + sels.length + " 项, 共 " + data.length + " 项"
} }
} }

2
src/components/element/label.js
View File

@ -43,7 +43,7 @@ class Label extends Component{
return ( return (
<div class={className} style={ style }> <div class={className} style={ style }>
<span style={ styleProps }>{ sel[name] }</span> <span style={ styleProps }>{ sel[name] }</span>
{ conf.showIcon && <i class="xm-iconfont icon-close" onClick={ this.iconClick.bind(this, sel, true, sel[disabled]) }></i> } { conf.showIcon && <i class="xm-iconfont xm-icon-close" onClick={ this.iconClick.bind(this, sel, true, sel[disabled]) }></i> }
</div> </div>
) )
}) })

2
src/components/element/model/general.js
View File

@ -29,7 +29,7 @@ class General extends Component{
return ( return (
<div class={className} value={ item[value] } onClick={ this.optionClick.bind(this, item, selected, item[disabled]) }> <div class={className} value={ item[value] } onClick={ this.optionClick.bind(this, item, selected, item[disabled]) }>
<div class="xm-option-icon" style={ { borderColor: theme.color, } }> <div class="xm-option-icon" style={ { borderColor: theme.color, } }>
<i class="xm-iconfont icon-duox" style={ iconStyle }></i> <i class="xm-iconfont xm-icon-duox" style={ iconStyle }></i>
</div> </div>
<div class='xm-option-content' dangerouslySetInnerHTML={{ __html: template(item, sels, item[name], item[value]) }}></div> <div class='xm-option-content' dangerouslySetInnerHTML={{ __html: template(item, sels, item[name], item[value]) }}></div>
</div> </div>

20
src/style/iconfont.less
View File

@ -20,42 +20,42 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-quanxuan:before { .xm-icon-quanxuan:before {
content: "\e62c"; content: "\e62c";
} }
.icon-caidan:before { .xm-icon-caidan:before {
content: "\e610"; content: "\e610";
} }
.icon-fanxuan:before { .xm-icon-fanxuan:before {
content: "\e837"; content: "\e837";
} }
.icon-pifu:before { .xm-icon-pifu:before {
content: "\e668"; content: "\e668";
} }
.icon-qingkong:before { .xm-icon-qingkong:before {
content: "\e63e"; content: "\e63e";
} }
.icon-sousuo:before { .xm-icon-sousuo:before {
content: "\e600"; content: "\e600";
} }
.icon-danx:before { .xm-icon-danx:before {
content: "\e62b"; content: "\e62b";
} }
.icon-duox:before { .xm-icon-duox:before {
content: "\e613"; content: "\e613";
} }
.icon-close:before { .xm-icon-close:before {
content: "\e601"; content: "\e601";
} }
.icon-expand:before { .xm-icon-expand:before {
content: "\e641"; content: "\e641";
} }

23
src/style/index.less
View File

@ -97,8 +97,8 @@ xm-select{
font-size: 12px; font-size: 12px;
cursor: pointer; cursor: pointer;
line-height: 20px; line-height: 20px;
position: relative; float: right;
top: -6px; margin-top: 2px;
} }
&.disabled{ &.disabled{
@ -144,19 +144,20 @@ xm-select{
&-icon{ &-icon{
color: #FFF; color: #FFF;
font-size: 16px;
width: 18px; width: 18px;
height: 18px; height: 18px;
position: absolute;
top: 9px;
border: @border; border: @border;
border-radius: 5px; border-radius: 5px;
z-index: 2; z-index: 2;
display: inline-block;
vertical-align: middle;
// position: absolute;
// top: 9px;
& > i { & > i {
position: absolute; float: left;
right: 0px; height: 18px;
top: -10px; line-height: 17px;
color: #FFF; color: #FFF;
} }
} }
@ -164,14 +165,14 @@ xm-select{
&-content{ &-content{
display: inline-block; display: inline-block;
position: relative; position: relative;
padding: 0 15px 0 30px; padding: 0 15px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
color: #666; color: #666;
line-height: 36px; line-height: 36px;
vertical-align: top; vertical-align: middle;
width: 100%; width: calc(100% - 18px);
} }
} }