Merge remote-tracking branch 'origin/optimize' into optimize

src/components/CurrentIll/index.jsx

@@ -52,7 +52,7 @@ class CurrentIll extends Component{
       })
     }else if(!text) {//现病史框里没有内容时才设置模板
       let num = moduleNum.num;//主诉使用了几个模板
-      if(data.length==0 && !isChronic || !isChronic.name ){
+      if(data.length==0 && (!isChronic || JSON.stringify(isChronic)=='{}') ){
         clearTimeout(setDataTimer);
         setDataTimer = setTimeout(function(){//延时，等待主诉失焦数据返回
             setData && setData({num,mainData,mainIds,symptomFeature:symptomFeature.featureData,isChronic,mainTailIds});   

src/components/RadioInpDrop/index.jsx

@@ -216,6 +216,7 @@ class InputComp extends Component{
     return editable?<span contentEditable={true}
                  className={style['inner-inp']}
                  onClick={(e)=>{e.stopPropagation()}}
+                 onFocus={(e)=>{e.stopPropagation()}}
                  onBlur={this.handleBlur}>{value}</span>:<span>{value}</span>
   }
 }