|
|
@@ -210,7 +210,7 @@ class SpreadDrop extends Component{
|
|
|
//点确定后隐藏弹窗
|
|
|
this.props.handleHide();
|
|
|
}
|
|
|
- handleSelect(item,isExclu,joint,listIndex,selected){//console.log(item,selected)
|
|
|
+ handleSelect(item,isExclu,joint,listIndex,selected){
|
|
|
let {withOn,withs,noneOn,exclusion,exists,nowOn,nones,noneIds,ban} = this.state;
|
|
|
/*if(this.props.selecteds)
|
|
|
console.log(exists,this.props.selecteds.exists,exists===this.props.selecteds.exists)*/
|
|
|
@@ -360,7 +360,7 @@ class SpreadDrop extends Component{
|
|
|
}
|
|
|
}*/
|
|
|
render(){
|
|
|
- const {placeholder,value,show,data,order,type,tagType,ikey} = this.props;
|
|
|
+ const {placeholder,value,show,data,order,type,tagType,ikey,pos} = this.props;
|
|
|
const {tmpDom,left} = this.state
|
|
|
const clickIndx = ikey.split('-')[1];//展开下拉的index
|
|
|
if(!show&&tmpDom){
|
|
|
@@ -381,8 +381,8 @@ class SpreadDrop extends Component{
|
|
|
onInput={this.onChange}
|
|
|
onkeydown={handleEnter}
|
|
|
>{value||placeholder}</div>
|
|
|
- <ListItems parDiv={this.$list} data={data} order={order} left={left} boxMark={type} tagType={tagType}
|
|
|
- show={show} cliIndex={clickIndx} handleSelect={this.handleSelect} handleConfirm={this.handleConfirm} handleClear={this.handleClear} {...this.state}></ListItems>
|
|
|
+ <ListItems parDiv={this.$list} pos={pos} data={data} order={order} left={left} boxMark={type} tagType={tagType}
|
|
|
+ show={show} handleSelect={this.handleSelect} handleConfirm={this.handleConfirm} handleClear={this.handleClear} {...this.state}></ListItems>
|
|
|
</div>
|
|
|
}
|
|
|
}
|
|
|
@@ -424,7 +424,7 @@ class ListItems extends Component{
|
|
|
clickConfirm(){
|
|
|
const {handleConfirm} = this.props;
|
|
|
this.child&&this.child.reset();//重置搜索框中的数据
|
|
|
- handleConfirm();
|
|
|
+ handleConfirm();
|
|
|
}
|
|
|
getStyle(){
|
|
|
const {show,left} = this.props;
|
|
|
@@ -433,20 +433,35 @@ class ListItems extends Component{
|
|
|
left:left
|
|
|
}
|
|
|
}
|
|
|
+ searchSelect(item){
|
|
|
+ const {handleSelect,handleConfirm} = this.props;
|
|
|
+ //添加id字段，用于调尾巴
|
|
|
+ const it = Object.assign({id:item.questionId},item);
|
|
|
+ handleSelect&&handleSelect(it); //添加到大数据推送一起选中
|
|
|
+ handleConfirm&&handleConfirm(); //确定事件
|
|
|
+ }
|
|
|
+ getPushItemIds(list){ //获取推送症状的id数组，去重用
|
|
|
+ return list&&list.map((it)=>{
|
|
|
+ return it.conceptId;
|
|
|
+ })||[];
|
|
|
+ }
|
|
|
render (){
|
|
|
- const {handleClear,handleConfirm,order,parDiv,boxMark,tagType,show,cliIndex} = this.props;
|
|
|
+ const {handleClear,order,parDiv,boxMark,tagType,show,data,pos} = this.props;
|
|
|
+ const pushUl = data.find((it)=>it.controlType===99);
|
|
|
+ const pushList = pushUl&&pushUl.questionDetailList;
|
|
|
+ //推送标签没有推送结果时不显示顺序说明
|
|
|
+ const noPush = tagType===11&&(!pushList||pushList.length===0);
|
|
|
+ const noSearch = boxMark==1 && tagType==11 && !pos; //非第一病程添加症状标签不显示搜索
|
|
|
return <div className={style["drop-list"]} ref={parDiv} style={this.getStyle()} contentEditable="false" onClick={(e)=>{e.stopPropagation();}}>
|
|
|
- <p className={style['orderTips']}>按{order?'从左到右从上到下':'点击'}顺序成文</p>
|
|
|
+ {noPush?'':<p className={style['orderTips']}>按{order?'从左到右从上到下':'点击'}顺序成文</p>}
|
|
|
{this.getLabels()}
|
|
|
+ {noSearch && <div className="search">
|
|
|
+ <SearchBox show={show} pushIds={this.getPushItemIds(pushList)} onSelect={this.searchSelect.bind(this)} onRef={(child)=>{this.child = child;}}/>
|
|
|
+ </div>}
|
|
|
<div className="oper clearfix">
|
|
|
<span className={style['clear']} onClick={handleClear}>清空选项</span>
|
|
|
<span className={style['confirm']} onClick={this.clickConfirm}>确定</span>
|
|
|
</div>
|
|
|
-
|
|
|
- {boxMark==1 && tagType==11 && <div className="search">
|
|
|
- <div className={style["line"]}></div>
|
|
|
- <SearchBox show={show} cliIndex={cliIndex} onSelect={handleConfirm} onRef={(child)=>{this.child = child;}}/>
|
|
|
- </div>}
|
|
|
</div>
|
|
|
}
|
|
|
}
|
|
|
@@ -517,6 +532,9 @@ class ListItem extends Component{
|
|
|
width:'6px',
|
|
|
background:'#f1f1f1'};
|
|
|
const barStyle={background:'#777',width:'100%'};
|
|
|
+ if(!datas||datas.length===0){
|
|
|
+ return <li className={style['no-push-data']}>暂无推送</li>
|
|
|
+ }
|
|
|
if(datas&&datas.length>11){
|
|
|
return <ScrollArea speed={0.8}
|
|
|
horizontal={false}
|
|
|
@@ -544,9 +562,12 @@ class ListItem extends Component{
|
|
|
|
|
|
getMainData(){//主诉添加症状-带搜索框
|
|
|
const {datas,isSpecialPos} = this.props;
|
|
|
+ if(!datas||datas.length===0){
|
|
|
+ return <li className={style['no-push-data']}>暂无推送数据，可通过搜索查找更多内容~ </li>
|
|
|
+ }
|
|
|
return datas&&datas.map((it,i)=>{
|
|
|
- return <li onClick={(e)=>this.handleClick(e,it,i)}
|
|
|
- className={this.getClass(it.id)}
|
|
|
+ return <li onClick={(e)=>this.handleClick(e,it,i)}
|
|
|
+ className={this.getClass(it.id)}
|
|
|
title={it.name.length>4?it.name:''}
|
|
|
style={{'width':'55px','display':'inline-block'}}>
|
|
|
{it.name&&it.name.length>4?it.name.slice(0,4)+'...':it.name}
|
|
|
@@ -555,12 +576,12 @@ class ListItem extends Component{
|
|
|
}
|
|
|
|
|
|
render(){
|
|
|
- const {datas,isSpecialPos,boxMark,tagType,listIndex,isSingle} = this.props;
|
|
|
- const pos = isSpecialPos?style['independent']:'';
|
|
|
- const ifMainSear = boxMark==1 && tagType==11?true:false;
|
|
|
+ const {datas,isSpecialPos,boxMark,tagType,listIndex,isSingle,pos} = this.props;
|
|
|
+ const posit = isSpecialPos?style['independent']:'';
|
|
|
+ const ifMainSear = boxMark==1 && tagType==11 && !pos?true:false;
|
|
|
// 单列直接设置宽度，多列则第二列设置(伴字ul不设置宽度)
|
|
|
const main = ifMainSear&&!isSingle&&listIndex==1?style['mainUl']:(ifMainSear&&isSingle?style['mainUl']:'');
|
|
|
- return <ul className={classNames(style['row'],pos,main)} onBlur={(e)=>e.stopPropagation()}>
|
|
|
+ return <ul className={classNames(style['row'],posit,main)} onBlur={(e)=>e.stopPropagation()}>
|
|
|
{ifMainSear?this.getMainData():this.getData()}
|
|
|
</ul>
|
|
|
}
|
zhouna