fix: 增加搜索表达式错误提示,修复历史记录sql问题
This commit is contained in:
@@ -20,6 +20,7 @@
|
||||
@changeMode="changeMode"
|
||||
@search="search"
|
||||
></tag-mode>
|
||||
<!-- <div class="search-tip--error">something error...</div>-->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -29,7 +30,8 @@ import TextMode from '@/components/advancedSearch/TextMode'
|
||||
import { defaultOperatorList, defaultConnectionList } from '@/components/advancedSearch/meta/meta'
|
||||
import _ from 'lodash'
|
||||
import { ref } from 'vue'
|
||||
import SqlParser from "@/components/advancedSearch/meta/sql-parser";
|
||||
import SqlParser from '@/components/advancedSearch/meta/sql-parser'
|
||||
import { ElMessage } from 'element-plus'
|
||||
export default {
|
||||
name: 'Index',
|
||||
components: {
|
||||
@@ -85,6 +87,8 @@ export default {
|
||||
if (this.$_.isEmpty(errorList)) {
|
||||
const { metaList } = parser.formatSql()
|
||||
this.metaList = metaList
|
||||
} else {
|
||||
ElMessage.error(this.$t('tip.invalidExpression'))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ import SqlParser, { stringInQuot } from '@/components/advancedSearch/meta/sql-pa
|
||||
import CodeMirror from 'codemirror'
|
||||
import { toRaw } from 'vue'
|
||||
import { columnType } from '@/components/advancedSearch/meta/meta'
|
||||
import { ElMessage } from 'element-plus'
|
||||
|
||||
export default {
|
||||
name: 'TextMode',
|
||||
@@ -51,7 +52,6 @@ export default {
|
||||
},
|
||||
search () {
|
||||
let originalSql = this.codeMirror.getValue()
|
||||
console.info(originalSql)
|
||||
if (originalSql) {
|
||||
originalSql = originalSql.replace(/"/g, '')
|
||||
const parser = new SqlParser(originalSql, this.columnList)
|
||||
@@ -61,7 +61,7 @@ export default {
|
||||
toRaw(this.codeMirror).setValue(formatSql)
|
||||
this.$emit('search', metaList, formatSql)
|
||||
} else {
|
||||
console.info(errorList)
|
||||
ElMessage.error(this.$t('tip.invalidExpression'))
|
||||
}
|
||||
} else {
|
||||
this.$emit('search')
|
||||
|
||||
Reference in New Issue
Block a user