Sfoglia il codice sorgente

bug修改去掉return防止出现多次模块

Luolei 6 anni fa
parent
commit
1fffcda415

+ 2 - 3
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({

+ 2 - 3
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({

+ 16 - 16
src/components/MainSuit/index.jsx

@@ -140,22 +140,22 @@ class MainSuit extends Component{
     const {getSearchLocation} = this.props;
     let leftL=0;      //用焦点元素的左边距替换鼠标点击的左边距,高度还是鼠标点击的位置
     let num = this.props.datas.length == 0?0:60
-    // if(isIE()){
-    //   leftL = getPageCoordinate(e).boxLeft
-    // }else{
-    //   const ele = document.activeElement;
-    //   leftL = ele.offsetLeft+num
-    // }
-    // getSearchLocation(getPageCoordinate(e).boxTop,leftL)
-    // this.setState({
-    //   tmpScroll: $("#addScrollEvent")[0].scrollTop,
-    //   tmpTop:getPageCoordinate(e).boxTop
-    // });
-    // windowEventHandler('scroll',()=>{      //弹窗跟随滚动条滚动或者关闭弹窗
-    //   let scrollYs = $("#addScrollEvent")[0].scrollTop;
-    //   let boxTop = this.state.tmpTop - scrollYs + this.state.tmpScroll
-    //   getSearchLocation(boxTop,this.state.boxLeft)
-    // },$("#addScrollEvent")[0])
+    if(isIE()){
+      leftL = getPageCoordinate(e).boxLeft
+    }else{
+      const ele = document.activeElement;
+      leftL = ele.offsetLeft+num
+    }
+    getSearchLocation(getPageCoordinate(e).boxTop,leftL)
+    this.setState({
+      tmpScroll: $("#addScrollEvent")[0].scrollTop,
+      tmpTop:getPageCoordinate(e).boxTop
+    });
+    windowEventHandler('scroll',()=>{      //弹窗跟随滚动条滚动或者关闭弹窗
+      let scrollYs = $("#addScrollEvent")[0].scrollTop;
+      let boxTop = this.state.tmpTop - scrollYs + this.state.tmpScroll
+      getSearchLocation(boxTop,this.state.boxLeft)
+    },$("#addScrollEvent")[0])
   }
 
   handleChange(e){

+ 2 - 3
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({