diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue index 3c984e56..690decb3 100644 --- a/mayfly_go_web/src/views/ops/db/SqlExec.vue +++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue @@ -2,7 +2,7 @@
- 新建查询 @@ -245,8 +245,8 @@ const nodeClick = async (data: any) => { const nodeKey = data.key; const dataType = data.type; // 点击数据库,修改当前数据库信息 - if (dataType === NodeType.Db || dataType === NodeType.SqlMenu || dataType === NodeType.TableMenu) { - changeSchema({ id: params.id, name: params.name, type: params.type, tagPath: params.tagPath }, params.db); + if (dataType === NodeType.Db || dataType === NodeType.SqlMenu || dataType === NodeType.TableMenu || dataType === NodeType.DbInst) { + changeSchema({ id: params.id, name: params.name, type: params.type, tagPath: params.tagPath, databases: params.database}, params.db); return; } @@ -492,7 +492,7 @@ const registerSqlCompletionItemProvider = () => { const lastToken = tokens[tokens.length - 1].toLowerCase() const secondToken = tokens.length >2 && tokens[tokens.length - 2].toLowerCase() || '' - const dbs = nowTab.params && nowTab.params.dbs; + const dbs = nowTab.params?.dbs?.split(' ') || []; // console.log("光标前文本:=>" + textBeforePointerMulti) // console.log("最后输入的:=>" + lastToken) if (lastToken.indexOf('.') > -1 || secondToken.indexOf('.') > -1) { diff --git a/mayfly_go_web/src/views/ops/db/db.ts b/mayfly_go_web/src/views/ops/db/db.ts index 552bb573..f2099349 100644 --- a/mayfly_go_web/src/views/ops/db/db.ts +++ b/mayfly_go_web/src/views/ops/db/db.ts @@ -30,6 +30,9 @@ export class DbInst { */ dbs: Map = new Map() + /** 数据库schema,多个用空格隔开 */ + databases: string + /** * 默认查询分页数量 */ @@ -124,7 +127,7 @@ export class DbInst { /** * 执行sql - * + * * @param sql sql * @param remark 执行备注 */ @@ -186,7 +189,7 @@ export class DbInst { return `DELETE FROM ${table} WHERE ${primaryKeyColumnName} IN (${ids})`; } - /* + /* * 弹框提示是否执行sql */ promptExeSql = (db: string, sql: string, cancelFunc: any = null, successFunc: any = null) => { @@ -216,6 +219,7 @@ export class DbInst { dbInst.id = inst.id; dbInst.name = inst.name; dbInst.type = inst.type; + dbInst.databases = inst.databases; dbInstCache.set(dbInst.id, dbInst); return dbInst; @@ -283,14 +287,14 @@ export class DbInst { /** * 判断字段类型是否为数字类型 * @param columnType 字段类型 - * @returns + * @returns */ static isNumber(columnType: string) { return columnType.match(/int|double|float|nubmer|decimal|byte|bit/gi); }; /** - * + * * @param str 字符串 * @param tableData 表数据 * @param flag 标志 @@ -483,4 +487,4 @@ export type FieldsMeta = { oldValue: string // 新值 newValue: string -} \ No newline at end of file +}