Merge branch 'dev/new1' into optimize

src/common/components/WrapModalContainer/index.jsx

@@ -18,7 +18,7 @@ class WrapModalContainer extends React.Component {
       <div className={style['shade']} onClick={onClose}></div>
       <div className={style['modal']} id="previewWrapper" style={{width:width+'px',marginLeft:(-width/2)+'px',height:height,marginTop:(-height/2)+'px'}}>
         <div id="previewStatic" className={`${style['close']} drag-title`}>{title}</div>
-        <img src={close} onClick={onClose} />
+        <img className={style['img']} src={close} onClick={onClose} />
         {children}
       </div>
     </div>,domNode)

src/common/components/WrapModalContainer/index.less

@@ -39,7 +39,7 @@
     background-color: #fff;
     z-index: 10;
   }
-  img{
+  .img{
     cursor: pointer;
     position: absolute;
     top: 10px;

src/components/CheckBody/index.jsx

@@ -70,10 +70,9 @@ class CheckBody extends Component{
       leftL = getPageCoordinate(e).boxLeft
     }else{
       const ele = document.activeElement;
-      if(ele.toString().indexOf('HTMLSpanElement') == -1){     //点击的不是span无法聚焦就不再设置位置
-        return;
+      if(ele.toString().indexOf('HTMLSpanElement') != -1){     //点击的不是span无法聚焦就不再设置位置
+        leftL = ele.offsetLeft+90
       }
-      leftL = ele.offsetLeft+90
     }
     getSearchLocation(getPageCoordinate(e).boxTop,leftL);
     this.setState({

src/components/CurrentIll/index.jsx

@@ -85,10 +85,9 @@ class CurrentIll extends Component{
       leftL = getPageCoordinate(e).boxLeft
     }else{
       const ele = document.activeElement;
-      if(ele.toString().indexOf('HTMLSpanElement') == -1){     //点击的不是span无法聚焦就不再设置位置
-        return;
+      if(ele.toString().indexOf('HTMLSpanElement') != -1){     //点击的不是span无法聚焦就不再设置位置
+        leftL = ele.offsetLeft+90
       }
-      leftL = ele.offsetLeft+90
     }
     getSearchLocation(getPageCoordinate(e).boxTop,leftL)
     this.setState({

src/components/OtherHistory/index.jsx

@@ -56,10 +56,9 @@ class OtherHistory extends Component{
       leftL = getPageCoordinate(e).boxLeft
     }else{
       const ele = document.activeElement;
-      if(ele.toString().indexOf('HTMLSpanElement') == -1){     //点击的不是span无法聚焦就不再设置位置
-        return;
+      if(ele.toString().indexOf('HTMLSpanElement') != -1){     //点击的不是span无法聚焦就不再设置位置
+        leftL = ele.offsetLeft+90
       }
-      leftL = ele.offsetLeft+90
     }
     getSearchLocation(getPageCoordinate(e).boxTop,leftL)
     this.setState({