1.0.0.0723

1.修改safari下close图标偏移的问题
2.修改windows系统下选中图标位置错位的问题
3.修改图标前缀避免冲突

index.html

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

src/components/element/label.js

@@ -43,7 +43,7 @@ class Label extends Component{
 				return (
 					<div class={className} style={ style }>
 						<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>
 				)
 			})

src/components/element/model/general.js

@@ -29,7 +29,7 @@ class General extends Component{
 			return (
 				<div class={className} value={ item[value] } onClick={ this.optionClick.bind(this, item, selected, item[disabled]) }>
 					<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 class='xm-option-content' dangerouslySetInnerHTML={{ __html: template(item, sels, item[name], item[value]) }}></div>
 				</div>

src/style/iconfont.less

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

src/style/index.less

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