TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-04 00:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复字段粘连无法提示的问题

Browse Source
This commit is contained in:
刘宗洋
2023-07-06 11:06:51 +08:00
parent dc9a2985f3
commit aa5c08d564
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mayfly_go_web/src/views/ops/db/SqlExec.vue
View File

@@ -491,7 +491,7 @@ const registerSqlCompletionItemProvider = () => {
// // const nextTokens = textAfterPointer.trim().split(/\s+/) // // const nextTokens = textAfterPointer.trim().split(/\s+/)
// // const nextToken = nextTokens[0].toLowerCase() // // const nextToken = nextTokens[0].toLowerCase()
const tokens = textBeforePointer.trim().split(/\s+/) const tokens = textBeforePointer.trim().split(/\s+/)
const lastToken = tokens[tokens.length - 1].toLowerCase() let lastToken = tokens[tokens.length - 1].toLowerCase()
const secondToken = tokens.length > 2 && tokens[tokens.length - 2].toLowerCase() || '' const secondToken = tokens.length > 2 && tokens[tokens.length - 2].toLowerCase() || ''
// const dbs = nowTab.params?.dbs?.split(' ') || []; // const dbs = nowTab.params?.dbs?.split(' ') || [];
@@ -531,7 +531,15 @@ const registerSqlCompletionItemProvider = () => {
if (lastToken.trim().startsWith('.')) { if (lastToken.trim().startsWith('.')) {
str = secondToken str = secondToken
} }
// 如果字符串粘连起了如:'a.creator,a.',需要重新取出别名
let aliasArr = lastToken.split(',');
if (aliasArr.length > 1){
lastToken = aliasArr[aliasArr.length-1];
str = lastToken.substring(0, lastToken.lastIndexOf('.'))
if (lastToken.trim().startsWith('.')) {
str = secondToken
}
}
// 库.表名联想 // 库.表名联想
if (dbs && dbs.filter((a: any) => a === str)?.length > 0) { if (dbs && dbs.filter((a: any) => a === str)?.length > 0) {
let tables = await dbInst.loadTables(str) let tables = await dbInst.loadTables(str)