Browse Source

还原标签多出空标签bug修改2824

zhouna 5 years ago
parent
commit
3e8273e82a
1 changed files with 8 additions and 1 deletions
  1. 8 1
      src/utils/utils.js

+ 8 - 1
src/utils/utils.js

@@ -140,7 +140,7 @@ export const setRadioInputValue = (state,action)=>{
 export function recoveTag(state,action) {
   let res = Object.assign({},state);
   let arr = [...res.data];
-  arr.splice(action.index,0,action.data);
+  //arr.splice(action.index,0,action.data);
   const isArr= !action.data.tagType;
   if(!isArr){
     arr.splice(action.index,0,action.data);
@@ -151,6 +151,13 @@ export function recoveTag(state,action) {
       const sonMInx = arr.findIndex((it)=>it.flag=='3');
       arr.splice(sonMInx,1);
     }
+    console.log([...action.data].reverse()[0],arr[action.index]);
+    const lastReTag = [...action.data].reverse()[0];
+    if(lastReTag.tagType=='8'&&arr[action.index].tagType=='8'){
+      //要恢复的标签组最后为文本标签,插入位置也为文本标签,则将2个合并为一个文本标签
+      arr[action.index]=Object.assign(arr[action.index],lastReTag,{value:lastReTag.value+arr[action.index].value});
+      action.data.length=action.data.length-1;
+    }
     arr.splice(action.index,0,...action.data);
   }
   const dataArr = fullfillText(arr);