manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sql执行器页面优化

Browse Source 
已知问题修复
This commit is contained in:
diantu
2023-02-24 18:12:04 +08:00
parent fdd9683a7f
commit 32259be29f
7 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbSqlExecutorController.java
View File

@@ -2,8 +2,6 @@ package com.zyplayer.doc.db.controller;
import com.alibaba.druid.DbType;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.statement.SQLSelect;
import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
import com.alibaba.druid.sql.parser.SQLStatementParser;
import com.alibaba.fastjson.JSON;
@@ -18,7 +16,6 @@ import com.zyplayer.doc.data.repository.support.consts.DocSysModuleType;
import com.zyplayer.doc.data.repository.support.consts.DocSysType;
import com.zyplayer.doc.data.service.manage.DbFavoriteService;
import com.zyplayer.doc.data.service.manage.DbHistoryService;
import com.zyplayer.doc.db.controller.param.DataViewParam;
import com.zyplayer.doc.db.framework.consts.DbAuthType;
import com.zyplayer.doc.db.framework.db.mapper.base.*;
import com.zyplayer.doc.db.framework.db.transfer.SqlParseUtil;

2
zyplayer-doc-db/src/main/resources/dist/css/index.0ed31336.css → zyplayer-doc-db/src/main/resources/dist/css/index.b81f44bc.css vendored
View File

File diff suppressed because one or more lines are too long

2
zyplayer-doc-db/src/main/resources/dist/doc-db.html vendored
View File

@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon-db.png"><title>数据库文档管理</title><link href="css/chunk-vendors.140b583e.css" rel="preload" as="style"><link href="css/index.0ed31336.css" rel="preload" as="style"><link href="js/chunk-vendors.3dc94571.js" rel="preload" as="script"><link href="js/index.f8a69857.js" rel="preload" as="script"><link href="css/chunk-vendors.140b583e.css" rel="stylesheet"><link href="css/index.0ed31336.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but zyplayer-db-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.3dc94571.js"></script><script src="js/index.f8a69857.js"></script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon-db.png"><title>数据库文档管理</title><link href="css/chunk-vendors.140b583e.css" rel="preload" as="style"><link href="css/index.b81f44bc.css" rel="preload" as="style"><link href="js/chunk-vendors.31333e1f.js" rel="preload" as="script"><link href="js/index.58fb8d7f.js" rel="preload" as="script"><link href="css/chunk-vendors.140b583e.css" rel="stylesheet"><link href="css/index.b81f44bc.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but zyplayer-db-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.31333e1f.js"></script><script src="js/index.58fb8d7f.js"></script></body></html>

4
zyplayer-doc-db/src/main/resources/dist/js/chunk-vendors.3dc94571.js → zyplayer-doc-db/src/main/resources/dist/js/chunk-vendors.31333e1f.js vendored
View File

File diff suppressed because one or more lines are too long

1
zyplayer-doc-db/src/main/resources/dist/js/index.58fb8d7f.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
zyplayer-doc-db/src/main/resources/dist/js/index.f8a69857.js vendored
View File

File diff suppressed because one or more lines are too long

25
zyplayer-doc-ui/db-ui/src/views/data/Executor.vue
View File

@@ -324,7 +324,7 @@ export default {
this.sqlExecutorEditor.insert(dataSql);
}
},
doExecutorSql() {
doExecutorSql(init) {
if (!this.choiceDatasourceId) {
this.$message.error("请先选择数据源");
return;
@@ -355,6 +355,11 @@ export default {
params: JSON.stringify(sqlParamObj),
}).then(response => {
this.sqlExecuting = false;
if (response.errCode != 200) {
this.executeShowTable = 'tabError';
this.executeError = response.errMsg;
return;
}
let resIndex = 1;
let executeResultList = [];
let resData = response.data || [];
@@ -407,8 +412,17 @@ export default {
dataList: dataListRes
});
resIndex++;
//动态设置表格高度,尽量避免出现滚动条
if(result.selectCount){
this.height = 235;
}else{
this.height = 270;
}
});
this.executeShowTable = (resIndex === 1) ? "tabInfo" : "result_1";
//多个结果情况下,且点击分页
if(init!=1){
this.executeShowTable = (resIndex === 1) ? "tabInfo" : "result_1";
}
this.executeResultInfo = executeResultInfo;
this.executeResultList = executeResultList;
this.loadHistoryList();
@@ -416,7 +430,8 @@ export default {
},
handleCurrentChange(to) {
this.currentPage = to;
this.doExecutorSql();
let init = 1;
this.doExecutorSql(init);
},
loadDatasourceList() {
datasourceApi.datasourceList({}).then(json => {
@@ -519,9 +534,7 @@ export default {
this.$set(this.choiceResultObj, this.executeShowTable, val);
},
tabHandleClick(t){
if(this.executeShowTable.includes("result")){
this.currentPage = 1;
}
},
doCopyCheckLineUpdate() {
let choiceData = this.choiceResultObj[this.executeShowTable] || [];