Merge remote-tracking branch 'origin/maindropSearch' into dev/new1

src/components/SpreadDrop/index.jsx

@@ -443,7 +443,8 @@ class ListItems extends Component{
   render (){
     const {handleClear,order,parDiv,boxMark,tagType,show,data} = this.props;
     //推送标签没有推送结果时不显示顺序说明
-    const noPush = tagType===11&&(!data[1].questionDetailList||data[1].questionDetailList.length===0);
+    const pushUl = data.find((it)=>it.controlType===99);
+    const noPush = tagType===11&&(pushUl&&(!pushUl.questionDetailList||pushUl.questionDetailList.length===0));
     return <div className={style["drop-list"]} ref={parDiv} style={this.getStyle()} contentEditable="false" onClick={(e)=>{e.stopPropagation();}}>
       {noPush?'':<p className={style['orderTips']}>按{order?'从左到右从上到下':'点击'}顺序成文</p>}
         {this.getLabels()}