搜索结果隐藏bug修改2903

src/common/components/EditableSpan/index.jsx

@@ -54,7 +54,7 @@ class EditableSpan extends Component{
       });
     })
     
-    const {mainSaveText,full,setFocusIndex,i,boxMark,value}= this.props;
+    const {mainSaveText,full,setFocusIndex,i,boxMark,value,handleClear}= this.props;
     let mainText = filterDataArr(mainSaveText);//主诉字数
     if(+boxMark==3||+boxMark==4){         //主诉为空，且第一次聚焦其他史查体时提示且不可输入
       if(!mainText&&full&&(value===''||value===undefined)){
@@ -63,6 +63,7 @@ class EditableSpan extends Component{
         return ;
       }
     }
+    handleClear&&handleClear({boxMark});    //点到其他自由文本标签时关闭搜索下拉
     let text = e.target.innerText || e.target.innerHTML;
     setFocusIndex&&setFocusIndex({i,boxMark,dom:this.$span});
     this.setState({
@@ -341,9 +342,10 @@ class EditableSpan extends Component{
     setSelectArea({i,boxMark,dir:'start'});
   }
   selectEnd(){
-    const {i,setSelectArea,boxMark,select_start}= this.props;
+    const {i,setSelectArea,boxMark,select_start,handleClear}= this.props;
     if(select_start!==i){     //判断不能省，否则无法聚焦
       setSelectArea({i,boxMark,dir:'end'});
+      handleClear&&handleClear({boxMark})
       window.getSelection().empty();
     }
   }

src/utils/tools.js

@@ -1,8 +1,8 @@
 import store from '@store';
-import {CLEAR_MAIN_SUIT} from '@store/types/mainSuit';
-import {CLEAR_CURRENT_ILL} from '@store/types/currentIll';
-import {CLEAROTHERHISTORY} from '@store/types/otherHistory';
-import {CLEARCHECKBODY,SET} from '@store/types/checkBody';
+import {CLEAR_MAIN_SUIT,CLEAR_SEARCH} from '@store/types/mainSuit';
+import {CLEAR_CURRENT_ILL,CURRENT_CLEAR} from '@store/types/currentIll';
+import {CLEAROTHERHISTORY,OTHERHIS_CLEAR} from '@store/types/otherHistory';
+import {CLEARCHECKBODY,SET,CHECKBODY_CLEAR} from '@store/types/checkBody';
 import {clearAssistData,addAssistLabel} from '@store/actions/assistCheck';
 import {clearAllLabel,addLabel} from '@store/actions/inspect';
 import {CLEAR_ALL_DIAG} from '@store/types/diagnosticList';
@@ -18,7 +18,6 @@ import down from '@images/down.png';
 import $ from 'jquery';
 import {CLEAR_SEARCH_PARAM} from "../store/types/print";
 
-
 /***
  * 工具函数
  *
@@ -1628,6 +1627,16 @@ function handleMouseUp(param){
       type:SET_SELECTED_AREA,
       data:{i,boxMark,dir:'end'}
     });
+    //清空搜索结果以关闭搜索弹窗
+    const map = {
+      '1':CLEAR_SEARCH,
+      '2':CURRENT_CLEAR,
+      '3':OTHERHIS_CLEAR,
+      '4':CHECKBODY_CLEAR
+    };
+    store.dispatch({
+      type:map[boxMark]
+    });
     window.getSelection().empty();
   }
 }