Luolei 6 rokov pred
rodič
commit
7badd324c9

+ 6 - 4
src/common/components/EditableSpan/index.jsx

@@ -61,7 +61,7 @@ class EditableSpan extends Component{
     e.stopPropagation();
     const {handleChange,boxMark,i,handleSearch,value,mainSaveText,mainIds,handleClear} = this.props;
     const {labelVal,searchPre} = this.state;
-    const text1 =e.target.innerText;
+    const text1 =e.target.innerText? e.target.innerText : e.target.innerHTML;
     let mainText = filterDataArr(mainSaveText);//主诉字数
     if(+boxMark==1){
       if(mainText.length >= config.limited){
@@ -163,7 +163,7 @@ class EditableSpan extends Component{
     const {preVal,index} = this.state;
     const ev = e||window.event;
     const target = ev.target||ev.srcElement;
-    let innerVal = target.innerText;
+    let innerVal = target.innerText? target.innerText : target.innerHTML;
     if(ev.keyCode==8){
       // 主诉现病史去重:删除最后一个字的时候移除该数据(将name、id和value替换成空)并移除id
       // 前面是标签,内容为空时再删一次才移除标签;前面是文本,则直接移除;
@@ -208,13 +208,15 @@ class EditableSpan extends Component{
   componentWillReceiveProps(next){
     const isRead = this.props.isRead;
     if(next.isRead != isRead){
-      this.$span.current.innerText = next.value||'';
+      this.$span.current.innerText = next.value||''
+      // this.$span.current.innerText?(this.$span.current.innerText = next.value||''):(this.$span.current.innerHTML = next.value||'');
     }
   }
   componentDidMount(){
     const {value} = this.props;
     if(value){
-      this.$span.current.innerText = value||'';
+      this.$span.current.innerText?(this.$span.current.innerText = value||''):(this.$span.current.innerHTML = value||'');
+      // this.$span.current.innerText = value||''
     }
     if(isIE()){
       $(this.$span.current).onIe8Input(function(e){

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

@@ -66,7 +66,7 @@ class MainSuit extends Component{
   handleFocus(e){
     e.stopPropagation();
     const {getCommonSymptoms,datas,clearDiagnose} = this.props;
-    let innerText = e.target.innerText.trim || e.target.innerHTML;//兼容火狐43
+    let innerText = e.target.innerText || e.target.innerHTML;//兼容火狐43
     clearDiagnose&&clearDiagnose();//清除复诊数据
     if(!isIE()){//IE会触发onfocus和onblur事件
       if(!innerText.trim()){//有内容就走搜索接口
@@ -189,7 +189,7 @@ class MainSuit extends Component{
       }
       ev.target.innerText = data.substr(0,config.limited);  //输入法内输入多个字再按enter的情况
       ev.target.blur();
-
+      
       this.setState({
         inpText:data.substr(0,config.limited),
         overFlag:true