fix: 修复unknown和app_risk查询bug

This commit is contained in:
chenjinsong
2022-02-14 16:04:08 +08:00
parent 7bdcd1c598
commit 37b5d3f7a5
4 changed files with 61 additions and 22 deletions

View File

@@ -88,7 +88,7 @@ export default class SqlParser extends SqlParserVisitor {
if (isFullText) {
if (meta.meta === condition) {
if (meta.column.type !== columnType.fullText) {
sql += `${meta.column.name}${meta.operator.value}${valueHandle(meta.value.value, meta.column.name)} `
sql += `${meta.column.name}${meta.operator.value}${meta.value.value} `
} else {
sql += "QUERY('"
this.columnList.forEach(column => {
@@ -101,7 +101,7 @@ export default class SqlParser extends SqlParserVisitor {
if (meta.meta === condition) {
sql += (meta.column.name)
if (meta.column.type !== columnType.fullText) {
sql += `${meta.operator.value}${valueHandle(meta.value.value, meta.column.name)} `
sql += `${meta.operator.value}${meta.value.value} `
} else {
sql += ' '
}
@@ -242,7 +242,7 @@ function handleType (value) {
// 使用单引号包裹
export function stringInQuot (value) {
const match = value.match(/^'.+?'$/)
const match = `${value}`.match(/^'.+?'$/)
return match ? value : `'${value}'`
}
function handleInOrLike (value, type) {
@@ -284,7 +284,7 @@ function valueHandle (value, columnName) {
if (columnName) {
if (columnName === 'app_risk') {
const m = riskLevelMapping.find(mapping => {
return `'${mapping.name}'` === value || `'${mapping.value}'` === value
return `'${mapping.name}'`.toLowerCase() === value.toLowerCase() || `'${mapping.value}'` === value
})
return (m && m.value) || value
}

View File

@@ -45,6 +45,8 @@
</template>
<script>
import { riskLevelMapping } from '@/utils/constants'
export default {
props: {
loading: Boolean
@@ -60,11 +62,6 @@ export default {
entityTopTenData: []
}
},
created () {
},
watch: {
},
methods: {
// 悬浮点击空白隐藏
esc () {
@@ -81,7 +78,7 @@ export default {
this.entityTopTenData = data.map(d => {
return {
...d,
name: d.name || 'unknown',
name: this.valueHandle(d.name, this.item.topColumn) || 'unknown',
percent: (parseFloat(d.count / totalCount) * 100).toFixed(2)
}
})
@@ -92,6 +89,15 @@ export default {
indexMethod (index) {
return index + 1
},
valueHandle (value, columnName) {
if (columnName === 'app_risk') {
const m = riskLevelMapping.find(mapping => {
return mapping.value === value
})
return (m && m.name) || value
}
return value
},
tableHeaderCellStyle ({ row, column, rowIndex, columnIndex }) {
if (rowIndex === 0) {
return 'padding-bottom:5px;padding-top:14px;'