Merge remote-tracking branch 'origin/dev/byll' into dev/new1

src/components/PushContainer/index.jsx

@@ -191,7 +191,7 @@ class PushContainer extends Component {
         }else if(this.state.type == 3){
             if(this.state.title == this.state.obj.text){
                 store.dispatch(changeVisible(false))
-                Notify.info('该模板名已存在');
+                Notify.info('标题修改成功');
                 return;
             }
             let tempObj = {

src/utils/tools.js

@@ -478,10 +478,9 @@ function filterDataArr(arr){   //数据处理
     let tmpArr = [];
     for(let i = 0;i < arr.length;i++){
         if(arr[i] && arr[i].indexOf('undefined') == -1){
-            if(tmpArr[tmpArr.length-1] != '，' ){
+            if(tmpArr[tmpArr.length-1] != '，' && tmpArr[tmpArr.length-1] != ',' ){
                 tmpArr.push(arr[i])
-            }
-            else if(tmpArr[tmpArr.length-1] == '，' && arr[i] != '，') {
+            }else if((tmpArr[tmpArr.length-1] == '，' && (arr[i] != '，' || arr[i] != ',')) || (tmpArr[tmpArr.length-1] == ',' && (arr[i] != ',' || arr[i] != ','))) {
               if(arr[i] == '。'){
                 tmpArr.pop();
                 tmpArr.push(arr[i]);