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

修复oracle数据库字段大小混写导致表数据结果页面报错问题

Browse Source 
db模块全局滚动条美化
This commit is contained in:
diant
2023-05-12 15:08:48 +08:00
parent 41b1426132
commit 114d224cbf
12 changed files with 122 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/OracleServiceImpl.java
View File

@@ -14,6 +14,7 @@ import java.sql.Clob;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
/** /**
* Oracle数据查询服务实现类 * Oracle数据查询服务实现类
@@ -48,13 +49,26 @@ public class OracleServiceImpl extends DbBaseService {
@Override @Override
public String getQueryPageSql(DataViewParam dataViewParam) { public String getQueryPageSql(DataViewParam dataViewParam) {
String queryColumns = StringUtils.defaultIfBlank(dataViewParam.getRetainColumn(), "*"); String queryColumns = StringUtils.defaultIfBlank(dataViewParam.getRetainColumn(), "*");
if(!Objects.equals(queryColumns, "*")){
String[] queryColumnsArray = queryColumns.split(",");
String resultString = "";
for(int i=0;i<queryColumnsArray.length;i++){
queryColumnsArray[i] = "\""+queryColumnsArray[i]+"\"";
if(i < queryColumnsArray.length-1){
resultString +=queryColumnsArray[i] + ",";
}else{
resultString +=queryColumnsArray[i];
}
}
queryColumns = resultString;
}
StringBuilder sqlSb = new StringBuilder(); StringBuilder sqlSb = new StringBuilder();
sqlSb.append(String.format("select %s from %s.%s", queryColumns, dataViewParam.getDbName(), dataViewParam.getTableName())); sqlSb.append(String.format("select %s from %s.%s", queryColumns, dataViewParam.getDbName(), dataViewParam.getTableName()));
if (StringUtils.isNotBlank(dataViewParam.getCondition())) { if (StringUtils.isNotBlank(dataViewParam.getCondition())) {
sqlSb.append(String.format(" where %s", dataViewParam.getCondition())); sqlSb.append(String.format(" where %s", dataViewParam.getCondition()));
} }
if (StringUtils.isNotBlank(dataViewParam.getOrderColumn()) && StringUtils.isNotBlank(dataViewParam.getOrderType())) { if (StringUtils.isNotBlank(dataViewParam.getOrderColumn()) && StringUtils.isNotBlank(dataViewParam.getOrderType())) {
sqlSb.append(String.format(" order by %s %s", dataViewParam.getOrderColumn(), dataViewParam.getOrderType())); sqlSb.append(String.format(" order by %s %s", "\""+dataViewParam.getOrderColumn()+"\"", dataViewParam.getOrderType()));
} }
StringBuilder sqlSbFinal = new StringBuilder(); StringBuilder sqlSbFinal = new StringBuilder();
Integer pageSize = dataViewParam.getPageSize() * dataViewParam.getPageNum(); Integer pageSize = dataViewParam.getPageSize() * dataViewParam.getPageNum();

1
zyplayer-doc-db/src/main/resources/dist/css/chunk-vendors.2fa4c9b3.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
zyplayer-doc-db/src/main/resources/dist/css/chunk-vendors.9d3aebdb.css vendored
View File

File diff suppressed because one or more lines are too long

1
zyplayer-doc-db/src/main/resources/dist/css/index.a2331d15.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
zyplayer-doc-db/src/main/resources/dist/css/index.e4fdb84a.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.9d3aebdb.css rel=preload as=style><link href=css/index.e4fdb84a.css rel=preload as=style><link href=js/chunk-vendors.4e7ca143.js rel=preload as=script><link href=js/index.026ff33c.js rel=preload as=script><link href=css/chunk-vendors.9d3aebdb.css rel=stylesheet><link href=css/index.e4fdb84a.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.4e7ca143.js></script><script src=js/index.026ff33c.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.2fa4c9b3.css" rel="preload" as="style"><link href="css/index.a2331d15.css" rel="preload" as="style"><link href="js/chunk-vendors.e736cdfe.js" rel="preload" as="script"><link href="js/index.4824fa04.js" rel="preload" as="script"><link href="css/chunk-vendors.2fa4c9b3.css" rel="stylesheet"><link href="css/index.a2331d15.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.e736cdfe.js"></script><script src="js/index.4824fa04.js"></script></body></html>

107
zyplayer-doc-db/src/main/resources/dist/js/chunk-vendors.4e7ca143.js vendored
View File

File diff suppressed because one or more lines are too long

77
zyplayer-doc-db/src/main/resources/dist/js/chunk-vendors.e736cdfe.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.026ff33c.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.4824fa04.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

17
zyplayer-doc-ui/db-ui/src/App.vue
View File

@@ -348,4 +348,21 @@
background: #ccc; background: #ccc;
color: #888; color: #888;
} }
::-webkit-scrollbar-track {
background: rgba(0, 0, 0, 0.1);
border-radius: 10px;
}
::-webkit-scrollbar {
-webkit-appearance: none;
width: 10px;
height: 10px;
}
::-webkit-scrollbar-thumb {
cursor: pointer;
border-radius: 5px;
background: rgba(0, 0, 0, 0.15);
transition: color 0.2s ease;
}
</style> </style>

10
zyplayer-doc-ui/db-ui/src/views/data/DataPreview.vue
View File

@@ -60,7 +60,7 @@
</div> </div>
<el-tabs v-model="executeShowTable"> <el-tabs v-model="executeShowTable">
<el-tab-pane label="信息" name="table0"> <el-tab-pane label="信息" name="table0">
<pre>{{ executeResultInfo }}</pre> <pre class="xxpre">{{ executeResultInfo }}</pre>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="'结果'+resultItem.index" :name="resultItem.name" <el-tab-pane :label="'结果'+resultItem.index" :name="resultItem.name"
v-for="resultItem in executeResultList" v-if="!!resultItem.index"> v-for="resultItem in executeResultList" v-if="!!resultItem.index">
@@ -662,4 +662,12 @@ export default {
/deep/ .elx-table .elx-header--column.col--ellipsis { /deep/ .elx-table .elx-header--column.col--ellipsis {
height: 38px; height: 38px;
} }
.xxpre{
overflow: auto;
}
.el-textarea__inner::-webkit-scrollbar {
display: none;
}
</style> </style>