|
@@ -104,6 +104,34 @@ export default {
|
|
|
return uuid.join('');
|
|
|
},
|
|
|
|
|
|
+ /**
|
|
|
+ * 有空格添加引号
|
|
|
+ * @param {String} val
|
|
|
+ * @returns
|
|
|
+ */
|
|
|
+ AddQuotationMarks(val){
|
|
|
+ var sign = ['and','AND','OR','or','NOT','not']
|
|
|
+ var arr = val.split(/(\s+and|AND|OR|or|NOT|not\s+)/g)
|
|
|
+ var regex = /\s/
|
|
|
+ var regex1 = /^["].*["]$|^['].*[']$|^[“].*[”]$|^[‘].*[’]$/
|
|
|
+ var values = []
|
|
|
+ for(var i = 0;i<arr.length;i++){
|
|
|
+ if(sign.includes(arr[i].trim())){
|
|
|
+ values.push(arr[i])
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if(regex.test(arr[i])){
|
|
|
+ if(!regex1.test(arr[i])){
|
|
|
+ var str = `"${arr[i]}"`
|
|
|
+ values.push(str)
|
|
|
+ }
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ values.push(arr[i])
|
|
|
+ }
|
|
|
+ return values
|
|
|
+ },
|
|
|
+
|
|
|
//object转字符串
|
|
|
objectToString(val) {
|
|
|
var data = []
|
|
@@ -134,10 +162,22 @@ export default {
|
|
|
data.forEach(item => {
|
|
|
var value = ''
|
|
|
if (Array.isArray(item.value)) {
|
|
|
- value = '(' + item.value.join(' OR ') + ')'
|
|
|
+ value = '('
|
|
|
+ item.value.forEach((i,index)=>{
|
|
|
+ if(/\s/.test(i)){
|
|
|
+ value += `"${i}"`
|
|
|
+ }else{
|
|
|
+ value += i
|
|
|
+ }
|
|
|
+ if(index!= item.value.length- 1){
|
|
|
+ value += ' OR '
|
|
|
+ }
|
|
|
+ })
|
|
|
+ value += ')'
|
|
|
} else {
|
|
|
if (item.value) {
|
|
|
- value = item.value
|
|
|
+ var values = this.AddQuotationMarks(item.value)
|
|
|
+ value = values.join('')
|
|
|
} else {
|
|
|
return
|
|
|
}
|