bug2527

src/common/components/EditableSpan/index.jsx

@@ -239,7 +239,6 @@ class EditableSpan extends Component{
       if(innerVal == preVal){
         let data = innerVal.trim();
         if(nextObj && !config.punctuationReg.test(data) || data=='<br>'){
-          
           handleKeydown&&handleKeydown({boxMark,i:index,text:data,flag:'del'});
           if(nextObj && nextObj[0] && nextObj[0].nodeName !=="DIV"){
             // IE浏览器focus光标在最后，其他浏览器在最前
@@ -304,7 +303,7 @@ class EditableSpan extends Component{
         // let pattern = new RegExp(/^\,?$|^\，?$|^\.?$|^\。?$|^\、?$|^\;?$|^\；?$|^\:?$|^\：?$|\s/);
         // if(index!==0 && pattern.test(data)){
         // 后半段是处理IE
-        if(index!==0 && !config.punctuationReg.test(data) || index!==0 && data=='<br>'||indexNum ==0&&preObj[0]&&preObj[0].nodeName=="DIV"){
+        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();
           let obj = preObj[0].nodeName=="DIV"?preObj.prev():preObj;
           handleKeydown&&handleKeydown({boxMark,i:index,text:data,flag:'backsp'});

src/store/actions/mainSuit.js

@@ -685,7 +685,6 @@ 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])
   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){
@@ -696,7 +695,8 @@ export function backspaceText(state,action){
     }
     else{
       handleLocalDelTag(1,delIndex-1,data[delIndex-1]);
-      data.splice(delIndex-1,2);
+      // data.splice(delIndex-1,2);
+      data.splice(delIndex-1,action.text.length>0?1:2);//data不为空不能清除
       res.saveText.splice(delIndex-1,2);
     }
   }else if(flag == 'del'){
@@ -714,6 +714,7 @@ export function backspaceText(state,action){
     else{
       handleLocalDelTag(1,delIndex,data[delIndex+1]);
       data.splice(delIndex,2);
+      // data.splice(delIndex,action.text.length>0?1:2);
       res.saveText.splice(delIndex,2);
     }
   }