2133：主诉将模板删空再次聚集显示常见症状

src/common/components/EditableSpan/index.jsx

@@ -189,7 +189,7 @@ class EditableSpan extends Component{
     }
   }  
   handleKeyup(e){
-    const {boxMark,handleKeydown,removeId,handleClear} = this.props;
+    const {boxMark,handleKeydown,removeId,handleClear,removeSpan} = this.props;
     const {preVal,index} = this.state;
     const ev = e||window.event;
     const target = ev.target||ev.srcElement;
@@ -200,7 +200,8 @@ class EditableSpan extends Component{
     }*/
     if(ev.keyCode==46){//delete
       //判断nexObj
-      let nextObj = $(this.$span.current).next();
+      // let nextObj = $(this.$span.current).next();
+      let nextObj = $(this.$span.current);
       if(preVal.trim().length==1&& !innerVal){
         removeId && removeId({boxMark,i:index,text:"",flag:'del'});
         handleClear && handleClear({boxMark});//删除最后一个字时清空搜索结果，避免现病史搜索框不立即消失的情况
@@ -215,7 +216,7 @@ class EditableSpan extends Component{
         if(nextObj && !config.punctuationReg.test(data)){
           handleKeydown&&handleKeydown({boxMark,i:index,text:data,flag:'del'});
           // nextObj.focus();  
-          if(nextObj[0].nodeName !=="DIV"){
+          if(nextObj && nextObj[0] && nextObj[0].nodeName !=="DIV"){
             nextObj.focus();
           }
           /*this.setState({
@@ -265,6 +266,10 @@ class EditableSpan extends Component{
           })
         }
       }
+      // 主诉使用模板删除最后一个空span时移除
+      if(boxMark==1 && index==0 && !innerVal){
+        removeSpan();
+      }
     }
     
   }

src/containers/EditableSpan.js

@@ -1,7 +1,7 @@
 import {connect} from 'react-redux';
 import {EditableSpan} from '@commonComp';
 import {SETCHECKTEXT,SETSEARCHDATA,CHECK_FOCUS_INDEX,CHECKBODY_CLEAR,DEL_CHECKBODY,DEL_CHECKBODY_LABLE} from '@types/checkBody';
-import {SET_SEARCH,MAIN_FOCUS_INDEX,CLEAR_SEARCH,SETMAINTEXT,DEL_MAIN,REMOVE_MAIN_ID,DEL_MAIN_LABLE} from '@types/mainSuit';
+import {SET_SEARCH,MAIN_FOCUS_INDEX,CLEAR_SEARCH,SETMAINTEXT,DEL_MAIN,REMOVE_MAIN_ID,DEL_MAIN_LABLE,MAIN_REMOVE_SPAN} from '@types/mainSuit';
 import {SETOTHERTEXT,SETOTHERSEARCHDATA,OTHER_FOCUS_INDEX,OTHERHIS_CLEAR,DEL_OTHERHIS,REMOVE_OTHER_ID,DEL_OTHERHIS_LABLE} from '@types/otherHistory';
 import {SET_CURRENT_SEARCH,CURRENT_CLEAR,SETCURRENTTEXT,CURRENT_FOCUS_INDEX,DEL_CURRENT,REMOVE_CURR_ID,DEL_CURRENT_LABLE} from '@types/currentIll';
 import {getSearch} from '@store/async-actions/fetchModules';
@@ -282,6 +282,11 @@ function mapDispatchToProps(dispatch,state) {
       dispatch({
         type:ISREAD
       })
+    },
+    removeSpan(){//主诉移除最后一个空span
+      dispatch({
+        type:MAIN_REMOVE_SPAN
+      })
     }
   }
 }

src/store/reducers/mainSuit.js

@@ -2,7 +2,7 @@ import {RECOVER_TAG_MAIN,COMM_SYMPTOMS,CLEAR_COMSYMPTOMS,SHOW_TAIL,INSERT_MAIN,
   SET_SEARCH,CLEAR_SEARCH,GET_BIGDATAPUSH,SET_MAINSUIT,MIX_CONFIRM,NUMBER_SELECT,
   RADIO_SELECT,COMM_CONFIRM,CHANGE_LABELVAL,SAVE_FREE,CLEAR_MAIN_SUIT,SET_DATA,
   INSERT_SEARCH,MAIN_FOCUS_INDEX,SETTEXTMODEVALUE,SETMAINTEXT,MAINADDLABELITEM,SETMAININPUT,DEL_MAIN,CHANGE_LABELVAL_NUMBER,
-  REMOVE_MAIN_ID,MAINSUIT_MUL,DEL_MAIN_LABLE,SET_FEATURE,SET_MS_RADIO_INPUT_VAL,SAVE_CHRONIC} from '../types/mainSuit'
+  REMOVE_MAIN_ID,MAINSUIT_MUL,DEL_MAIN_LABLE,SET_FEATURE,SET_MS_RADIO_INPUT_VAL,SAVE_CHRONIC,MAIN_REMOVE_SPAN} from '../types/mainSuit'
 import {recoveTag,getCommSymptoms,handleTailClick,insertMain,setSearch,getBigSymptom,setMainMoudle,confirm,
   setNumberValue,setRadioValue,commConfirm,changeLabelVal,saveFreeVal,clearMainSuit,insertSearch,setTextModeValue,setCheckText,
   addLabelItem,setInputLabel,backspaceText,changeNumLabelVal,removeId,multipleComfirn,delSingleLable,
@@ -107,6 +107,11 @@ export default function(state=initState,action){
       return res;
     case RECOVER_TAG_MAIN:
       return recoveTag(state,action);
+    case MAIN_REMOVE_SPAN:
+      res.data = [];
+      res.saveText = [];
+      res.editClear = true;
+      return res;
     default:
       return state;
   }

src/store/types/mainSuit.js

@@ -30,3 +30,4 @@ export const SET_FEATURE = 'SET_FEATURE';  //主诉分词
 export const SET_MS_RADIO_INPUT_VAL = 'SET_MS_RADIO_INPUT_VAL';
 export const SAVE_CHRONIC = 'SAVE_CHRONIC'; //储存慢病信息
 export const RECOVER_TAG_MAIN = 'RECOVER_TAG_MAIN';   //恢复已删除标签
+export const MAIN_REMOVE_SPAN = 'MAIN_REMOVE_SPAN';   //删除最后一个空span

src/utils/config.js

@@ -1,8 +1,8 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
-const host='http://192.168.2.236:5050';//后端接口访问地址
+// const host='http://192.168.2.236:5050';//后端接口访问地址
 // const host='http://192.168.2.121:5050';//后端接口访问地址
-// const host='http://192.168.2.241:5050';//后端接口访问地址
+const host='http://192.168.2.241:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚