Browse Source

先注释

luolei 5 years ago
parent
commit
0cf7052713
2 changed files with 40 additions and 38 deletions
  1. 39 37
      src/common/components/EditableSpan/index.jsx
  2. 1 1
      src/store/actions/mainSuit.js

+ 39 - 37
src/common/components/EditableSpan/index.jsx

@@ -181,23 +181,24 @@ class EditableSpan extends Component{
     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(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&& i!=0){//向左
+    if(ev.keyCode==37){//向左
       let preObj = $(this.$span.current).prev();
       let obj = preObj[0]&&preObj[0].nodeName=="DIV"?preObj.prev():preObj;
-      if(indexNum == 0){
+      if(textIndex == 0){
         if(ev.preventDefault){//阻止默认事件
           ev.preventDefault();
         }else{
@@ -207,31 +208,28 @@ class EditableSpan extends Component{
           this.moveEnd(obj[0]);
         }
       }
-      let range = window.getSelection();
-      indexNum = range.focusNode.length;
-      console.log('光标位置:'+range.focusOffset,range.anchorOffset)
+      // indexNum = textIndex;
     }
     if(ev.keyCode==39){//向右
       let curObj = $(this.$span.current)
       let nextObj = $(this.$span.current).next();
       let obj = nextObj[0]&&nextObj[0].nodeName=="DIV"?nextObj.next():nextObj;
-      if(indexNum == textLength || textLength==undefined || (indexNum == 0 && textLength==1)){
+      if(textIndex == textLength || textLength==undefined || (textIndex == 0 && textLength==1)){
         if(ev.preventDefault){//阻止默认事件
           ev.preventDefault();
         }else{
           ev.returnValue=false;
         }
         if(obj){
-          // obj.focus();
+          obj.focus();
           console.log(90909)
-          this.moveEnd(obj[0],1)
+          // this.moveEnd(obj[0],1)
           
         }
       }
-      let range = window.getSelection();
-      indexNum = range&&range.focusNode.length||indexNum;
+      // indexNum = textIndex;
     }
-    console.log('光标位置最后为:'+indexNum)
+    // console.log('光标位置最后为:'+indexNum)
   }
   handleKeyup(e){
     const {boxMark,handleKeydown,removeId,handleClear,removeSpan,handleChange} = this.props;
@@ -268,7 +266,6 @@ class EditableSpan extends Component{
       //action里往后删除
       if(innerVal == preVal){
         let data = innerVal.trim();
-        console.log(!!nextObj , !config.punctuationReg.test(','),data)
         if(nextObj && !config.punctuationReg.test(data) || data=='<br>'){
           // console.log(nextObj,nexObj,neObj)
           // nextObj.focus();
@@ -287,9 +284,16 @@ class EditableSpan extends Component{
           handleKeydown&&handleKeydown({boxMark,i:index+1,text:data,flag:'del'});
           this.moveEnd(nextObj[0]);
         }else if(nexObj[0]&&nexObj[0].nodeName=="SPAN"){
-          console.log((nexVal))
-          if(nexVal == ''||!config.punctuationReg.test(nexVal)){
+          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)
+            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]);
         }
@@ -301,7 +305,7 @@ class EditableSpan extends Component{
       // 前面是标签,内容为空时再删一次才移除标签;前面是文本,则直接移除;
       let preObj = $(this.$span.current).prev();
       if(index!==0&&preVal.trim().length==1&& !innerVal){
-        console.log(77)
+        console.log('前面是标签,内容为空时再删一次才移除标签;前面是文本,则直接移除')
         removeId && removeId({boxMark,i:index,text:""});
         handleClear && handleClear({boxMark});//删除最后一个字时清空搜索结果,避免现病史搜索框不立即消失的情况
         if(preObj[0].nodeName !=="DIV"){
@@ -311,15 +315,8 @@ class EditableSpan extends Component{
 
       let range = window.getSelection();
       let textIndex = range.focusOffset;
-      console.log(textIndex,11111111111)
       if(innerVal !== preVal){
-        //   let nextObj = $(this.$span.current);
-        //   let data = innerVal.trim();
-        //   let tmpVal = data.substr(0,data.length-1)
-        //   handleChange&&handleChange({text1:tmpVal,boxMark,i:index});
-        //   console.log(nextObj,tmpVal,indexNum,textIndex)
-        //   nextObj.html(tmpVal)
-        //   this.moveEnd(nextObj[0])
+        
       }else{
         // 中英文数字和下划线--单独删除标签
         /*const reg = new RegExp("([\u4E00-\uFA29]|[\uE7C7-\uE7F3]|[a-zA-Z0-9_])");
@@ -338,15 +335,20 @@ 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(111)
+          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]);
           this.setState({
             index: null
           })
-        }else if(indexNum == 0&&preObj[0]&&preObj[0].nodeName=="SPAN"){
-          console.log(3333)
+        }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])
         }
       }
       // 主诉使用模板删除最后一个空span时移除

+ 1 - 1
src/store/actions/mainSuit.js

@@ -712,7 +712,7 @@ export function backspaceText(state,action){
   let res = Object.assign({},state);
   const {delIndex,flag} = action;
   const data = res.data;
-  console.log(action,data,data[delIndex+1])
+  // console.log(action,data,data[delIndex+1])
   if(flag == 'backsp'){
     if(data[delIndex-1].flag&&data[delIndex-1].flag==3){
     // if(data[delIndex-1].tagType==8 ||data[delIndex-1].flag&&data[delIndex-1].flag==3){