ll

src/common/components/EditableSpan/index.jsx

@@ -180,21 +180,6 @@ class EditableSpan extends Component{
     let textIndex = range.focusOffset;
     let textLength = range.anchorNode.length;
     let preObj = $(this.$span.current).prev();
-    let nexObj = $(this.$span.current).next();
-
-    // console.log(indexNum , innerVal.length,'***')
-    // if(preObj &&preObj[0] && preObj[0].nodeName !="DIV"&&indexNum == 0&&innerVal.length>0&&ev.keyCode==8){//在span的第一位
-    //   console.log(textIndex,'span第一位')
-    //   if(textIndex != indexNum){return}
-    //   let obj = preObj[0]&&preObj[0].nodeName=="DIV"?preObj.prev():preObj;
-    //   this.moveEnd(obj[0]);
-    // }else if(nexObj &&nexObj[0] && nexObj[0].nodeName !="DIV"&&indexNum == innerVal.length&&innerVal.length>0&&ev.keyCode==46){//最后一位
-    //   console.log(textIndex,'span最后一位')
-    //   if(textIndex != indexNum){return}
-    //   let obj = nexObj[0]&&nexObj[0].nodeName=="DIV"?nexObj.next():nexObj;
-    //   this.moveEnd(obj[0],true);
-    // }
-
     if(ev.keyCode==37){//向左
       let preObj = $(this.$span.current).prev();
       let obj = preObj[0]&&preObj[0].nodeName=="DIV"?preObj.prev():preObj;
@@ -205,10 +190,9 @@ class EditableSpan extends Component{
           ev.returnValue=false;
         }
         if(obj){
-          this.moveEnd(obj[0]);
+          obj[0]&&this.moveEnd(obj[0]);
         }
       }
-      // indexNum = textIndex;
     }
     if(ev.keyCode==39){//向右
       let curObj = $(this.$span.current)
@@ -221,15 +205,10 @@ class EditableSpan extends Component{
           ev.returnValue=false;
         }
         if(obj){
-          obj.focus();
-          console.log(90909)
-          // this.moveEnd(obj[0],1)
-          
+          obj[0]&&obj.focus();
         }
       }
-      // indexNum = textIndex;
     }
-    // console.log('光标位置最后为：'+indexNum)
   }
   handleKeyup(e){
     const {boxMark,handleKeydown,removeId,handleClear,removeSpan,handleChange} = this.props;
@@ -253,6 +232,7 @@ class EditableSpan extends Component{
       let preObj = $(this.$span.current).prev();
       let nexVal = nexObj[0]&&nexObj[0].innerText || nexObj[0]&&nexObj[0].innerHTML; 
       if(preVal.trim().length==1&& !innerVal){
+        console.log('delete前面是标签，内容为空时再删一次才移除标签；前面是文本，则直接移除')
         removeId && removeId({boxMark,i:index,text:"",flag:'del'});
         handleClear && handleClear({boxMark});//删除最后一个字时清空搜索结果，避免现病史搜索框不立即消失的情况
         //如果后一个不是标签，则光标移到最前
@@ -267,9 +247,6 @@ class EditableSpan extends Component{
       if(innerVal == preVal){
         let data = innerVal.trim();
         if(nextObj && !config.punctuationReg.test(data) || data=='<br>'){
-          // console.log(nextObj,nexObj,neObj)
-          // nextObj.focus();
-          console.log(9)
           handleKeydown&&handleKeydown({boxMark,i:index,text:data,flag:'del'});
           if(nextObj && nextObj[0] && nextObj[0].nodeName !=="DIV"){
             // IE浏览器focus光标在最后，其他浏览器在最前
@@ -279,23 +256,24 @@ class EditableSpan extends Component{
           /*this.setState({
             index: null
           })*/
-        }else if(indexNum ==innerVal.length&&nexObj[0]&&nexObj[0].nodeName=="DIV"){
+        }else if(indexNum ==innerVal.length&&nexObj[0]&&nexObj[0].nodeName=="DIV"){//span最后一位后面为div标签
           console.log(99)
           handleKeydown&&handleKeydown({boxMark,i:index+1,text:data,flag:'del'});
           this.moveEnd(nextObj[0]);
         }else if(nexObj[0]&&nexObj[0].nodeName=="SPAN"){
-          console.log('delete text'+config.punctuationReg.test('sdsd'))
-          if(nexVal == ''){
-            handleKeydown&&handleKeydown({boxMark,i:index+1,text:'',flag:'del'});
-          }else if(innerVal.length == textIndex||!config.punctuationReg.test(nexVal)){
-            console.log('delete555555:'+indexNum,textIndex,innerVal)
+          console.log('delete text: '+config.punctuationReg.test(nexVal),nexVal,textIndex,innerVal)
+          if(nexVal.length <= 1){//为空或者一个字delete时候
+            console.log(8988998)
+            handleChange&&handleChange({text1:'',boxMark,i:index+1});
+            // removeId && removeId({boxMark,i:index+1,text:"",flag:'del'});
+            handleClear && handleClear({boxMark});
+            this.moveEnd(nextObj[0])
+          }else if(nexVal.length > 1){
             let tmpVal = nexVal.substr(1,data.length)
-            console.log(nexVal,tmpVal)
             handleChange&&handleChange({text1:tmpVal,boxMark,i:index+1});
             nexObj.html(tmpVal)
             this.moveEnd(nexObj[0],1)
           }
-          this.moveEnd(nextObj[0]);
         }
       }
     }
@@ -304,8 +282,9 @@ class EditableSpan extends Component{
       // 主诉现病史去重：删除最后一个字的时候移除该数据（将name、id和value替换成空）并移除id
       // 前面是标签，内容为空时再删一次才移除标签；前面是文本，则直接移除；
       let preObj = $(this.$span.current).prev();
+      let curObj = $(this.$span.current);
       if(index!==0&&preVal.trim().length==1&& !innerVal){
-        console.log('前面是标签，内容为空时再删一次才移除标签；前面是文本，则直接移除')
+        console.log('backspace前面是标签，内容为空时再删一次才移除标签；前面是文本，则直接移除')
         removeId && removeId({boxMark,i:index,text:""});
         handleClear && handleClear({boxMark});//删除最后一个字时清空搜索结果，避免现病史搜索框不立即消失的情况
         if(preObj[0].nodeName !=="DIV"){
@@ -335,7 +314,7 @@ class EditableSpan extends Component{
         // 后半段是处理IE
         if(index!==0 && !config.punctuationReg.test(data) || index!==0 && data=='<br>'||indexNum ==0&&preObj[0]&&preObj[0].nodeName=="DIV"){
           // let preObj = $(this.$span.current).prev();
-          console.log('向前删除，前面是div')
+          // console.log('向前删除，前面是div')
           let obj = preObj[0].nodeName=="DIV"?preObj.prev():preObj;
           handleKeydown&&handleKeydown({boxMark,i:index,text:data,flag:'backsp'});
           this.moveEnd(obj[0]);
@@ -343,12 +322,26 @@ class EditableSpan extends Component{
             index: null
           })
         }else if(textIndex == 0&&preObj[0]&&preObj[0].nodeName=="SPAN"){
-          console.log('向前删除，光标首位，前面是span')
           let data = preObj[0].innerText || preObj[0].innerHTML;
-          let tmpVal = data.substr(0,data.length-1)
-          handleChange&&handleChange({text1:tmpVal,boxMark,i:index});
-          preObj.html(tmpVal)
-          this.moveEnd(preObj[0])
+          // console.log('向前删除，光标首位，前面是span',preObj[0],boxMark)
+          if(data.length == 1){//span只有一个文本，删除后移除检索
+            removeId && removeId({boxMark,i:index-1,text:""});
+            handleClear && handleClear({boxMark});
+            if(preObj[0].nodeName !=="DIV"){
+              if(boxMark==2){
+                this.moveEnd(preObj[0],1);
+              }else{
+                this.moveEnd(preObj[0]);
+              }
+            }
+          }else{
+            let tmpVal = data.substr(0,data.length-1)
+            handleChange&&handleChange({text1:tmpVal,boxMark,i:index});
+            preObj.html(tmpVal)
+            if(preObj[0].nodeName !=="DIV"){
+              this.moveEnd(preObj[0]);
+            }
+          }
         }
       }
       // 主诉使用模板删除最后一个空span时移除