Forráskód Böngészése

还是符号处理...

Luolei 6 éve
szülő
commit
d13d3006f7
1 módosított fájl, 22 hozzáadás és 20 törlés
  1. 22 20
      src/utils/tools.js

+ 22 - 20
src/utils/tools.js

@@ -479,32 +479,34 @@ function filterDataArr(arrTmp){   //数据处理
     let arr = arrTmp.join('').split('');
     for(let i = 0;i < arr.length;i++){
         if(arr[i] && arr[i].indexOf('undefined') == -1){
-            if(tmpArr[tmpArr.length-1] != ',' && tmpArr[tmpArr.length-1] != ',' ){
+            if(tmpArr[tmpArr.length-1] != ',' && tmpArr[tmpArr.length-1] != ',' && tmpArr[tmpArr.length-1] != '、' && tmpArr[tmpArr.length-1] != '。'){
                 tmpArr.push(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]);
-              }else if(tmpArr[tmpArr.length-2] == '。' && (tmpArr[tmpArr.length-1] == ',' || tmpArr[tmpArr.length-1] == ',')){//前面句号后面逗号 ['。',',']
-                tmpArr.pop();
-                tmpArr.push(arr[i]);
-              }else if(arr[i] == ',' || arr[i] == ','){    //  中英文逗号交替[',',',']
-                tmpArr.pop();
-                tmpArr.push(arr[i]);
-              }else if(arr[i] == '、'){    //前面逗号后面句号 [',','、']
-                tmpArr.pop();
-                tmpArr.push(arr[i]);
-              }else if(tmpArr[tmpArr.length-2] == '、' && (tmpArr[tmpArr.length-1] == ',' || tmpArr[tmpArr.length-1] == ',')){    //前面逗号后面句号 ['、',',']
-                tmpArr.splice(tmpArr.length-2,1);
-                tmpArr.push(arr[i]);
-              }else{
-                tmpArr.push(arr[i]);
+            }else {
+              if(tmpArr[tmpArr.length-1] == '。' && arr[i] != ',' && arr[i] != ',' && arr[i] != '、' && arr[i] != '。'){
+                  tmpArr.push(arr[i]);
+              }else if(tmpArr[tmpArr.length-1] != '。'){
+                if(arr[i] == '。'){
+                  tmpArr.pop();
+                  tmpArr.push(arr[i]);
+                }else if(arr[i] != '。' && tmpArr[tmpArr.length-1] == '、'){    //前面逗号后面顿号 [',','、']
+                  if(arr[i] != ',' && arr[i] != ',' && arr[i] != '、'){
+                    tmpArr.push(arr[i]);
+                  }else{
+                    tmpArr.pop();
+                    tmpArr.push(arr[i]);
+                  }
+                }else if(arr[i] != '。' && tmpArr[tmpArr.length-1] != '、'){
+                  if(arr[i] != ',' && arr[i] != ',' && arr[i] != '、'){
+                    tmpArr.push(arr[i]);
+                  }
+                }
               }
             }
         }
     }
-    return (tmpArr.join('')).replace(/^,+/,"").replace(/,+$/,"").replace(/,+$/,"").replace(/,+$/,"");
+    return (tmpArr.join('')).replace(/^,+/,"").replace(/,+$/,"").replace(/,+$/,"").replace(/,+$/,"").replace(/、+$/,"");
 }
+filterDataArr(['sds','、',',','sds'])
 // 取消默认行为
 function preventDefault(event) {
     if (event.preventDefault) {