update

单选图标自定义
可以把搜索框放置到label上
修改update方法无法更新远程

src/components/framework/index.js

@@ -314,6 +314,14 @@ class Framework extends Component{
 		//重置class
 		if(type === 'class'){
 			this.setState({ bodyClass: data })
+		}else
+		//聚焦label搜索框
+		if(type === 'labelSearchBlur'){
+			this.labelView.blur(data);
+		}else
+		//聚焦label搜索框
+		if(type === 'labelSearch'){
+			this.generalView.labelSearch(data);
 		}
 	}
 
@@ -379,18 +387,18 @@ class Framework extends Component{
 
 		//普通多选数据
 		const valueProp = prop.value;
-		const labelProps = {  ...config, data, sels, ck: this.itemClick.bind(this), title: sels.map(sel => sel[prop.name]).join(',') }
+		const labelProps = {  ...config, data, sels, ck: this.itemClick.bind(this), title: sels.map(sel => sel[prop.name]).join(','), onReset: this.onReset.bind(this) }
 		const bodyProps = {  ...config, data, dataObj, flatData, sels, ck: this.itemClick.bind(this), show, onReset: this.onReset.bind(this) }
 
 		//渲染组件
-		let Body = content ? <Custom { ...bodyProps } /> : tree.show ? <Tree { ...bodyProps } /> : config.cascader.show ? <Cascader { ...bodyProps } /> : <General { ...bodyProps } />;
+		let Body = content ? <Custom { ...bodyProps } /> : tree.show ? <Tree { ...bodyProps } /> : config.cascader.show ? <Cascader { ...bodyProps } /> : <General { ...bodyProps } ref={ ref => this.generalView = ref } />;
 
 		return (
 			<xm-select { ...xmSelectProps } >
 				<input class="xm-select-default" lay-verify={ config.layVerify } lay-verType={ config.layVerType } name={ config.name } value={ sels.map(item => item[prop.value]).join(',') }></input>
 				<i class={ show ? 'xm-icon xm-icon-expand' : 'xm-icon' } />
 				{ sels.length === 0 && <div class="xm-tips">{ config.tips }</div> }
-				<Label { ...labelProps } />
+				<Label { ...labelProps } ref={ ref => this.labelView = ref } />
 				<div class={ ['xm-body', bodyClass, config.model.type, show ? '':'dis', ].join(' ') } ref={ ref => this.bodyView = ref}>
 					{ Body }
 				</div>

src/components/label/index.js

@@ -31,6 +31,11 @@ class Label extends Component{
 			this.labelRef.scrollLeft = left;
 		}
 	}
+
+	blur(){
+		let input = this.base.querySelector('.label-search-input');
+		input && input.blur();
+	}
 
 	componentDidMount(){
 		if (this.labelRef.addEventListener) {
@@ -97,6 +102,23 @@ class Label extends Component{
 					</div>
 				)
 			}
+		}else if(type == 'search'){
+			innerHTML = false;
+			let one = list[0][name];
+
+			html = (
+				<input class="label-search-input" type="text" placeholder={ config.searchTips } style={{ width: '100%', border: 'none' }} value={
+					one
+				} onInput={ e => {
+					this.props.onReset(e, 'labelSearch')
+				}}  onCompositionstart={ e => {
+					this.props.onReset(e, 'labelSearch')
+				}}  compositionupdate={ e => {
+					this.props.onReset(e, 'labelSearch')
+				}}  compositionend={ e => {
+					this.props.onReset(e, 'labelSearch')
+				}}></input>
+			)
 		}else{
 			if(list.length && conf && conf.template){
 				html = conf.template(data, list);
@@ -110,7 +132,7 @@ class Label extends Component{
 			<div class={ className }>
 				<div class="scroll" ref={ ref => this.labelRef = ref }>
 					{ innerHTML ?
-						<div class="label-content" dangerouslySetInnerHTML={{__html: html}}></div> :
+						<div class="label-content" dangerouslySetInnerHTML={{ __html: html }}></div> :
 						<div class="label-content" title={ title }>{ html }</div>
 					}
 				</div>

src/components/plugin/cascader.js

@@ -25,9 +25,9 @@ class Cascader extends Component{
 			if(item.__node.loading === true){
 				return;
 			}
-			
+
 			const { cascader, prop, sels } = this.props;
-			
+
 			//不是父节点的不需要处理
 			if(!cascader.lazy && !item[prop.optgroup]){
 				this.props.ck(item, selected, disabled);
@@ -151,7 +151,7 @@ class Cascader extends Component{
 		}
 
 		return (
-			<div onClick={ this.blockClick } class="xm-body-cascader" style={{ width: cascader.indent + 'px', height: config.height }}>
+			<div onClick={ this.blockClick } class="xm-body-cascader" style={{ width: cascader.indent + 'px', maxHeight: config.height }}>
 				{ arr }
 			</div>
 		)
@@ -160,13 +160,10 @@ class Cascader extends Component{
 	//组件完成挂载
 	componentDidMount(){
 		this.props.onReset('cascader', 'class');
-
 	}
 
 	//此时页面又被重新渲染了
-	componentDidUpdate(){
-
-	}
+	// componentDidUpdate(){}
 }
 
 export default Cascader;

src/components/plugin/general.js

@@ -77,6 +77,14 @@ class General extends Component{
 		this.setState({
 			pageIndex: index
 		})
+	}
+
+	labelSearch(e){
+		if(e.type == 'input'){
+			this.searchInput(e)
+		}else{
+			this.handleComposition(e)
+		}
 	}
 
 	searchInput(e){
@@ -86,7 +94,7 @@ class General extends Component{
 			return ;
 		}
 
-		clearTimeout(this.searchCid);
+		this.searchCid && clearTimeout(this.searchCid);
 		if(this.inputOver){
 			//保证输入框内的值是实时的
 			this.__value = v;
@@ -112,7 +120,7 @@ class General extends Component{
 
 		if(type === 'compositionstart'){
 			this.inputOver = false;
-			clearTimeout(this.searchCid);
+			this.searchCid && clearTimeout(this.searchCid);
 		}else if(type === 'compositionend'){
 			this.inputOver = true;
 			this.searchInput(e);
@@ -202,17 +210,23 @@ class General extends Component{
 				//清空输入框的值
 				this.setState({ filterValue: '', val: emptyVal });
 				this.__value = '';
-				this.searchInputRef && (this.searchInputRef.value = '');
+				this.searchInputRef && (this.searchInputRef.value = '');
+				this.props.onReset('', 'labelSearchBlur')
 			}else{
-				//聚焦输入框
+				//聚焦输入框
 				setTimeout(() => {
-					if(props.filterable){
+					if(props.model.label.type === 'search'){
+
+					}else if(props.filterable){
 						this.focus()
 					}else{
 						this.base.focus()
 					}
 				}, 0);
 			}
+		}
+		if(this.props.__update != props.__update){
+			this.setState({ remote: true })
 		}
 	}
 
@@ -256,7 +270,7 @@ class General extends Component{
 		}
 
 		const search = (
-			<div class={ filterable ? 'xm-search' : 'xm-search dis' }>
+			<div class={ filterable && config.model.label.type != 'search' ? 'xm-search' : 'xm-search dis' }>
 				<i class="xm-iconfont xm-icon-sousuo"></i>
 				<input class="xm-input xm-search-input" placeholder={ searchTips } />
 			</div>
@@ -449,8 +463,6 @@ class General extends Component{
 				return 0;
 			})() || ('xm-iconfont ' + (radio ? 'xm-icon-danx' : 'xm-icon-duox'))].join(' ');
 
-			console.log(iconClass)
-
 			//处理鼠标选择的背景色
 			const hoverChange = e => {
 				if(e.type === 'mouseenter'){

src/components/xm-select/index.js

@@ -44,7 +44,7 @@ class xmOptions {
 			return ;
 		}
 
-		render(<Framework { ...this.options } updateData={ updateData } />, dom);
+		render(<Framework { ...this.options } __update={ Date.now() } updateData={ updateData } />, dom);
 
 		//返回多选对象
 		return this;

src/config/options.js

@@ -154,9 +154,9 @@ export default function (lan = 'zn') {
 		},
 		//自定义选中的图标
 		iconfont: {
-			select: 'layui-icon layui-icon-cellphone',
-			unselect: 'layui-icon layui-icon-cellphone',
-			half: 'xm-iconfont xm-icon-banxuan',
+			select: '',
+			unselect: '',
+			half: '',
 		},
 		// 展开下拉框
 		show(){