聚焦和高亮问题修改

src/common/components/SearchOption/index.jsx

@@ -31,7 +31,6 @@ class SearchOption extends React.Component {
     }
     componentDidMount(){
       this.props.handleChangeValue('');
-      this.textInput.current.focus();
       const {windowHeight,pageTop,height,refreshScroller,searchType} = this.props;
       if(searchType==1){
           this.setState({txt:'细项'})
@@ -43,6 +42,7 @@ class SearchOption extends React.Component {
         //$("#searchOption")[0].scrollIntoView(false);
         refreshScroller()&&refreshScroller().scrollBottom();
       }
+      this.textInput.current.focus();
     }
     setShowInsp(){
         this.setState({

src/components/AddAssistCheck/index.jsx

@@ -33,7 +33,7 @@ class AddAssistCheck extends React.Component {
     $(document).click((event) => {
       let _con = $('#searchWrapAssist');   // 设置目标区域
       let _cons = $('#datePick');   // 设置目标区域
-      // let _conClick = $('#assistCheck');   // 点击的按钮
+      let _conClick = $('#assistCheck');   // 点击的按钮
       let _del = document.getElementById("delBox");   // 删除弹窗
       let _close = document.getElementById("assiClose");   // 删除icon
       let _closeTil = $('#delTit')[0];   // 弹窗标题
@@ -44,12 +44,13 @@ class AddAssistCheck extends React.Component {
             }
             this.setState({show: false});
           }
-          if (!_cons.is(event.target) && _cons.has(event.target).length === 0 || event.target.isEqualNode(_close)) { // Mark 1
+          if (!_cons.is(event.target)&&!_conClick && _cons.has(event.target).length === 0 || event.target.isEqualNode(_close)) { // Mark 1
             this.setState({date: false});
           }
-          if($(event.target).attr("contenteditable")||event.target.textContent == '报告描述或意见'){
+          if($(event.target).attr("contenteditable")||event.target.textContent == '报告描述或意见'||$(event.target).attr('id')=='searchWrapAssist'){
             this.setState({date: false});
           }
+          
         if(_del){
           if($(event.target).attr('id') != 'assiClose' &&!event.target.isEqualNode(_close) && !event.target.isEqualNode(_del)  && event.target.parentNode != _del && !event.target.isEqualNode(_closeTil)){
             this.setState({
@@ -73,6 +74,12 @@ class AddAssistCheck extends React.Component {
     getCurrentDate(1);
   }
 
+  // shouldComponentUpdate(nextProps,nextState){
+  //   console.log(999,nextProps)
+  //       if(nextState.Number == this.state.Number){
+  //         return true
+  //       }
+  // }
   handleDelClick(id,item) {
     this.setState({
       visible: true,

src/components/NewAdvice/index.less

@@ -16,7 +16,7 @@
         line-height: 30px;
         text-align: center;
         position: relative;
-        z-index: 10;
+        z-index: 9;
     }
     .newAdviceTitle {
       border: 0 none;