Merge remote-tracking branch 'origin/dev5.3.1' into dev/new1

src/components/MainSuit/index.jsx

@@ -158,12 +158,13 @@ class MainSuit extends Component{
         ev.target.blur();
         return
       }
-      ev.target.innerText?(ev.target.innerText = data.substr(0,config.limited)):(ev.target.innerHTML = data.substr(0,config.limited));  //输入法内输入多个字再按enter的情况
       ev.target.blur();
-      
+      ev.target.innerText?(ev.target.innerText = data.substr(0,config.limited)):(ev.target.innerHTML = data.substr(0,config.limited));  //输入法内输入多个字再按enter的情况
+      // ev.target.blur();
       this.setState({
         inpText:data.substr(0,config.limited),
-        overFlag:true
+        overFlag:true,
+        symptom:false
       })
       return false;
     }

src/store/reducers/mainSuit.js

@@ -110,10 +110,13 @@ export default function(state=initState,action){
     case RECOVER_TAG_MAIN:
       return recoveTag(state,action);
     case MAIN_REMOVE_SPAN:
-      res.data = [];
-      res.saveText = [];
-      res.mainIds = [];
-      res.editClear = true;
+      // 只剩最后一个空标签时才移除
+      if(res.data.length == 1){
+        res.data = [];
+        res.saveText = [];
+        res.mainIds = [];
+        res.editClear = true;
+      }
       return res;
     default:
       return state;