Ver código fonte

bug2527四个模块都有问题,统一处理

luolei 5 anos atrás
pai
commit
fa87b58bb4

+ 2 - 2
src/containers/EditableSpan.js

@@ -229,10 +229,10 @@ function mapDispatchToProps(dispatch,state) {
           dispatch({type:DEL_CURRENT,delIndex:obj.i,text:obj.text,flag:obj.flag});
           break;
         case 3:
-          dispatch({type:DEL_OTHERHIS,delIndex:obj.i,flag:obj.flag});
+          dispatch({type:DEL_OTHERHIS,delIndex:obj.i,flag:obj.flag,text:obj.text});
           break;
         case 4:
-          dispatch({type:DEL_CHECKBODY,delIndex:obj.i,flag:obj.flag});
+          dispatch({type:DEL_CHECKBODY,delIndex:obj.i,flag:obj.flag,text:obj.text});
           break;
         default:
           break;

+ 3 - 3
src/store/actions/checkBody.js

@@ -245,9 +245,9 @@ export function backspaceText(state,action){
     }
     else{
       handleLocalDelTag(4,delIndex-1,data[delIndex-1]);
-      data.splice(delIndex-1,2);
-      res.selecteds.splice(delIndex-1,2); 
-      res.saveText.splice(delIndex-1,2);
+      data.splice(delIndex-1,action.text.length>0?1:2);
+      res.selecteds.splice(delIndex-1,action.text.length>0?1:2); 
+      res.saveText.splice(delIndex-1,action.text.length>0?1:2);
     }
   }else if(flag == 'del'){
     if(data[delIndex+1] && data[delIndex+1].flag&&data[delIndex+1].flag==3){//子模板不删  

+ 2 - 2
src/store/actions/currentIll.js

@@ -659,8 +659,8 @@ export function backspaceText(state,action){
     }
     else{
       handleLocalDelTag(2,delIndex-1,data[delIndex-1]);
-      data.splice(delIndex-1,2);
-      res.selecteds.splice(delIndex-1,2); 
+      data.splice(delIndex-1,action.text.length>0?1:2);
+      res.selecteds.splice(delIndex-1,action.text.length>0?1:2); 
       res.saveText.splice(delIndex-1,2);
     }
   }else if(flag == 'del'){

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

@@ -697,7 +697,7 @@ export function backspaceText(state,action){
       handleLocalDelTag(1,delIndex-1,data[delIndex-1]);
       // data.splice(delIndex-1,2);
       data.splice(delIndex-1,action.text.length>0?1:2);//data不为空不能清除
-      res.saveText.splice(delIndex-1,2);
+      res.saveText.splice(delIndex-1,action.text.length>0?1:2);
     }
   }else if(flag == 'del'){
     if(data[delIndex+1] && data[delIndex+1].flag&&data[delIndex+1].flag==3){

+ 3 - 3
src/store/actions/otherHistory.js

@@ -282,9 +282,9 @@ export function backspaceText(state,action){
         res[data[delIndex-1].formulaCode]=undefined;
       }
       handleLocalDelTag(3,delIndex-1,data[delIndex-1]);      //记录被删除的标签
-      data.splice(delIndex-1,2);
-      res.selecteds.splice(delIndex-1,2);      //杂音类样式选中状态对应
-      res.saveText.splice(delIndex-1,2);
+      data.splice(delIndex-1,action.text.length>0?1:2);
+      res.selecteds.splice(delIndex-1,action.text.length>0?1:2);      //杂音类样式选中状态对应
+      res.saveText.splice(delIndex-1,action.text.length>0?1:2);
     }
   }else if(flag == 'del'){
     if(data[delIndex+1] && data[delIndex+1].flag&&data[delIndex+1].flag==3){//子模板不删