gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复搜索组件一系列bug

Browse Source
This commit is contained in:
chenjinsong
2022-06-15 20:41:21 +08:00
parent 70c98f0274
commit 7a2674b7d4
7 changed files with 95 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/advancedSearch/meta/error.js
View File

@@ -1,3 +1,4 @@
import i18n from '@/i18n'
export const errorTypes = {
illegalChar: 'parse.errorTip.illegalChar', // 非法字符
syntaxError: 'parse.errorTip.syntaxError', // 语法错误，此i18n内容有占位符
@@ -15,9 +16,13 @@ export const errorDesc = {
},
typeError: {
str: 'parse.errorTip.typeError.expectString', // Expected parameter type is string
number: 'parse.errorTip.typeError.expectNumber', // Expected parameter type is number
meta: 'parse.errorTip.typeError.expectMetaArray' // Expected parameter type is Meta array
}
}
export function handleErrorTip (error) {
return i18n.global.t(error.type) + ': ' + i18n.global.t(error.desc) + ', at index ' + error.index
}
export default class ParserError {
constructor (index, type, desc) {
this.index = index

2
src/components/advancedSearch/meta/meta.js
View File

@@ -74,7 +74,7 @@ export default class Meta {
if (this.meta === condition) {
return (this.column.type === columnType.fullText)
? !_.isEmpty(this.column.name)
: !_.isEmpty(this.column.name) && !_.isEmpty(this.operator.value) && !_.isEmpty(this.value.value)
: !_.isEmpty(this.column.name) && !_.isEmpty(this.operator.value) && (!_.isEmpty(this.value.value) || (_.isNumber(this.value.value) && !_.isNaN(this.value.value)))
} else if (this.meta === connection) {
return !!this.value
}

30
src/components/advancedSearch/meta/parser.js
View File

@@ -1,6 +1,7 @@
import Meta, { connection, condition, columnType } from './meta'
import Token, { types } from './token'
import ParserError, { errorTypes, errorDesc } from '@/components/advancedSearch/meta/error'
import _ from 'lodash'
const strReg = {
all: /^[\da-zA-Z\s.'><!=-_(),%]$/,
@@ -96,6 +97,13 @@ export default class Parser {
} else {
str += `${meta.column.name}${meta.operator.value}'${meta.value.value}' `
}
} else if (meta.column.type === columnType.number) {
if (_.isNumber(Number(meta.value.value))) {
str += `${meta.column.name}${meta.operator.value}${meta.value.value} `
} else {
this.errorList.push(new ParserError(i, errorTypes.typeError, errorDesc.typeError.number))
return
}
}
}
}
@@ -136,6 +144,10 @@ export default class Parser {
} else {
str += `${meta.column.name}${meta.operator.value}'${meta.value.value}' `
}
} else if (meta.column.type === columnType.number) {
if (_.isNumber(Number(meta.value.value))) {
str += `${meta.column.name}${meta.operator.value}${meta.value.value} `
}
}
}
}
@@ -555,7 +567,6 @@ export default class Parser {
if (isInApostrophe) {
if (meta.column.name) {
meta.value.value = token.value
meta.value.type = columnType.string
meta.column.type = columnType.string
} else {
meta.column.type = columnType.fullText
@@ -589,7 +600,6 @@ export default class Parser {
if (isInApostrophe) {
if (prevToken && prevToken.prevToken && [types.commonOperator, types.letterOperator].indexOf(prevToken.prevToken.type) > -1) {
meta.value.value = token.value
meta.value.type = columnType.string
meta.column.type = columnType.string
} else if (prevToken && (!prevToken.prevToken || prevToken.prevToken.type === types.connection)) {
meta.column.type = columnType.fullText
@@ -606,9 +616,19 @@ export default class Parser {
if (prevToken) {
// 前面是操作符，则是普通value；前面是连接符，是全文搜索
if ([types.commonOperator, types.letterOperator].indexOf(prevToken.type) > -1) {
meta.value.value = token.value
meta.value.type = columnType.string
meta.column.type = columnType.string
// 大于、小于号限制为number
if (['>', '<', '>=', '<='].indexOf(prevToken.value) > -1) {
if (_.isNumber(Number(token.value))) {
meta.column.type = columnType.number
meta.value.value = Number(token.value)
} else {
errorList.push(new ParserError(token.end, errorTypes.typeError, errorDesc.typeError.number))
break
}
} else {
meta.column.type = columnType.string
meta.value.value = token.value
}
} else if (prevToken.type === types.connection) {
meta.column.name = token.value
meta.column.type = columnType.fullText