Przeglądaj źródła

saveText火狐拿不到

Luolei 6 lat temu
rodzic
commit
bc106beef3

+ 5 - 7
src/common/components/EditableSpan/index.jsx

@@ -49,7 +49,7 @@ class EditableSpan extends Component{
         return ;
       }
     }
-    let text = e.target.innerText;
+    let text = e.target.innerText || e.target.innerHTML;
     setFocusIndex&&setFocusIndex({i,boxMark,dom:this.$span});
     this.setState({
       labelVal:text,
@@ -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? e.target.innerText : e.target.innerHTML;
+    const text1 = e.target.innerText || e.target.innerHTML;
     let mainText = filterDataArr(mainSaveText);//主诉字数
     if(+boxMark==1){
       if(mainText.length >= config.limited){
@@ -89,7 +89,7 @@ class EditableSpan extends Component{
     //延迟搜索
     clearTimeout(this.state.timer);
     const timer = setTimeout(function(){
-      let newText = e.target.innerText;
+      let newText = e.target.innerText || e.target.innerHTML;
       let temp = '',isEnd=false;
       let search='';
       clearTimeout(that.state.timer);
@@ -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? target.innerText : target.innerHTML;
+    let innerVal = target.innerText || target.innerHTML;
     if(ev.keyCode==8){
       // 主诉现病史去重:删除最后一个字的时候移除该数据(将name、id和value替换成空)并移除id
       // 前面是标签,内容为空时再删一次才移除标签;前面是文本,则直接移除;
@@ -208,15 +208,13 @@ 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?(this.$span.current.innerText = next.value||''):(this.$span.current.innerHTML = 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?(this.$span.current.innerText = value||''):(this.$span.current.innerHTML = value||'');
-      // this.$span.current.innerText = value||''
     }
     if(isIE()){
       $(this.$span.current).onIe8Input(function(e){

+ 1 - 1
src/common/components/InlineTag/index.jsx

@@ -46,7 +46,7 @@ class InlineTag extends Component {
     });
   }
   handleInput(e){       //输入时保存临时值,在修改灰显为黑色时判断用
-    const text = e.target.innerText;console.log(text)
+    const text = e.target.innerText || e.target.innerHTML;console.log(text)
     this.setState({
       value:text
     });