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

src/components/ChronicInfo/index.jsx

@@ -520,8 +520,8 @@ class ChronicInfo extends React.Component{
                                 handleConfirm={this.comfirnTable}/>;
     if(data&&data.length>0){
       return <div className={style["tips"]} style={{marginBottom:'15px'}}>
-        <div className={`${style["tips-title"]} ${style["chronic"]}`}>
-          <div className={style["tips-name"]} onClick={this.slideToggle}>
+        <div className={`${style["tips-title"]} ${style["chronic"]}`} onClick={this.slideToggle}>
+          <div className={style["tips-name"]}>
             <img src={chronicPic} />
             <h2>{chronicMagItem&&chronicMagItem.name||chronicDesease&&chronicDesease.name||'病情提示'}<span className={style["redTips"]}>(页面信息有更新可能影响评估结果)</span></h2>
           </div>

src/components/RadioInpDrop/index.jsx

@@ -251,7 +251,7 @@ class InputComp extends Component{
                  className={style['inner-inp']}
                  onClick={(e)=>{e.stopPropagation()}}
                  onFocus={(e)=>{e.stopPropagation()}}
-                 onBlur={this.handleBlur}>{value}</span>:<span>{value}</span>
+                 onBlur={this.handleBlur}>&nbsp;{value}</span>:<span>&nbsp;{value}</span>
   }
 }
 

src/store/actions/mainSuit.js

@@ -413,6 +413,7 @@ export const insertSearch = (state,action)=>{
         res.data.splice(focusIndex+1,0,nText);
         res.saveText.splice(focusIndex+1,0,searchData);
         res.data[focusIndex].value = value;
+        res.saveText[focusIndex] = value;
       }
       span.current.innerText?(span.current.innerText = value):(span.current.innerHTML=value);
     }