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

修复样式污染导致的表数据页面无法正常显示数据问题

Browse Source
This commit is contained in:
diant
2023-06-02 15:17:52 +08:00
parent 9dfabe54ce
commit 5699d614df
8 changed files with 179 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
zyplayer-doc-db/src/main/resources/dist/css/index.0b546ad4.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.78fcebbe.css vendored Normal file
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.2fa4c9b3.css" rel="preload" as="style"><link href="css/index.0b546ad4.css" rel="preload" as="style"><link href="js/chunk-vendors.6270548d.js" rel="preload" as="script"><link href="js/index.76574511.js" rel="preload" as="script"><link href="css/chunk-vendors.2fa4c9b3.css" rel="stylesheet"><link href="css/index.0b546ad4.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.6270548d.js"></script><script src="js/index.76574511.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.78fcebbe.css" rel="preload" as="style"><link href="js/chunk-vendors.6270548d.js" rel="preload" as="script"><link href="js/index.b43b64d2.js" rel="preload" as="script"><link href="css/chunk-vendors.2fa4c9b3.css" rel="stylesheet"><link href="css/index.78fcebbe.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.6270548d.js"></script><script src="js/index.b43b64d2.js"></script></body></html>

1
zyplayer-doc-db/src/main/resources/dist/js/index.76574511.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.b43b64d2.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
zyplayer-doc-ui/db-ui/src/common/lib/ace-editor/index.js
View File

@@ -52,6 +52,8 @@ export default {
height: function () { height: function () {
this.$nextTick(function () { this.$nextTick(function () {
this.editor.resize() this.editor.resize()
//设置字体大小
this.editor.setFontSize(14);
//更新编辑器高度 //更新编辑器高度
document.getElementById("aceEditorId").style.height = this.height + "px";; document.getElementById("aceEditorId").style.height = this.height + "px";;
}) })

17
zyplayer-doc-ui/db-ui/src/components/layouts/PageTableView.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-tabs v-model="activePage" type="card" closable @tab-click="changePage" @tab-remove="removePageTab" <el-tabs v-model="activePage" type="card" closable @tab-click="changePage" @tab-remove="removePageTab"
@contextmenu.prevent.native="openContextMenu($event)" style="padding: 5px 10px 0;"> @contextmenu.prevent.native="openContextMenu($event)" style="padding: 5px 10px 0;height: 30px;font-size: 12px;margin: 0 0 5px;">
<el-tab-pane :label="pageTabNameMap[item.fullPath]||item.name" :name="getRouteRealPath(item)" <el-tab-pane :label="pageTabNameMap[item.fullPath]||item.name" :name="getRouteRealPath(item)"
:fullPath="item.fullPath" :key="item.fullPath" v-for="item in pageList"/> :fullPath="item.fullPath" :key="item.fullPath" v-for="item in pageList"/>
</el-tabs> </el-tabs>
@@ -300,11 +300,6 @@ export default {
</script> </script>
<style scoped> <style scoped>
/deep/ .el-tabs, .el-tabs--card, .el-tabs--top{
height: 30px;
font-size: 12px;
margin: 0 0 5px;
}
/deep/ .el-tabs--card > .el-tabs__header .el-tabs__item { /deep/ .el-tabs--card > .el-tabs__header .el-tabs__item {
height: 30px; height: 30px;
@@ -312,6 +307,16 @@ export default {
font-size: 12px; font-size: 12px;
} }
/deep/ .el-tabs__nav-next {
line-height: 33px;
font-size: 20px;
}
/deep/ .el-tabs__nav-prev {
line-height: 33px;
font-size: 20px;
}
.contextmenu { .contextmenu {
width: 100px; width: 100px;
margin: 0; margin: 0;

14
zyplayer-doc-ui/db-ui/src/views/data/DatasourceManage.vue
View File

@@ -1,5 +1,6 @@
<template> <template>
<div style="padding: 0 10px;"> <div style="padding: 0 10px;">
<el-card>
<el-form :inline="true"> <el-form :inline="true">
<el-form-item label="名字"> <el-form-item label="名字">
<el-input v-model="searchParam.name" placeholder="名字"></el-input> <el-input v-model="searchParam.name" placeholder="名字"></el-input>
@@ -48,7 +49,8 @@
<el-select v-model="newDatasource.groupName" placeholder="请选择或输入新的分组名字" <el-select v-model="newDatasource.groupName" placeholder="请选择或输入新的分组名字"
style="width: 100%" filterable allow-create> style="width: 100%" filterable allow-create>
<el-option value="">未分组</el-option> <el-option value="">未分组</el-option>
<el-option :value="item" v-for="(item,index) in datasourceGroupList" :key="index"></el-option> <el-option :value="item" v-for="(item,index) in datasourceGroupList"
:key="index"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="数据源名称："> <el-form-item label="数据源名称：">
@@ -62,10 +64,12 @@
value="net.sourceforge.jtds.jdbc.Driver"></el-option> value="net.sourceforge.jtds.jdbc.Driver"></el-option>
<el-option label="ORACLE: oracle.jdbc.driver.OracleDriver" <el-option label="ORACLE: oracle.jdbc.driver.OracleDriver"
value="oracle.jdbc.driver.OracleDriver"></el-option> value="oracle.jdbc.driver.OracleDriver"></el-option>
<el-option label="POSTGRESQL: org.postgresql.Driver" value="org.postgresql.Driver"></el-option> <el-option label="POSTGRESQL: org.postgresql.Driver"
value="org.postgresql.Driver"></el-option>
<el-option label="HIVE: org.apache.hive.jdbc.HiveDriver" <el-option label="HIVE: org.apache.hive.jdbc.HiveDriver"
value="org.apache.hive.jdbc.HiveDriver"></el-option> value="org.apache.hive.jdbc.HiveDriver"></el-option>
<el-option label="达梦: dm.jdbc.driver.DmDriver" value="dm.jdbc.driver.DmDriver"></el-option> <el-option label="达梦: dm.jdbc.driver.DmDriver"
value="dm.jdbc.driver.DmDriver"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="数据源URL："> <el-form-item label="数据源URL：">
@@ -100,7 +104,8 @@
<span style="margin-left: 10px;color: #999;font-size: 12px;"><i class="el-icon-info"></i> 添加、删除或编辑之后记得点击保存哦~</span> <span style="margin-left: 10px;color: #999;font-size: 12px;"><i class="el-icon-info"></i> 添加、删除或编辑之后记得点击保存哦~</span>
</span> </span>
<el-row> <el-row>
<el-select v-model="dbSourceAuthNewUser" filterable remote reserve-keyword autoComplete="new-password" <el-select v-model="dbSourceAuthNewUser" filterable remote reserve-keyword
autoComplete="new-password"
placeholder="请输入名字、邮箱、账号搜索用户" :remote-method="getSearchUserList" placeholder="请输入名字、邮箱、账号搜索用户" :remote-method="getSearchUserList"
:loading="dbSourceAuthUserLoading" style="width: 750px;margin-right: 10px;"> :loading="dbSourceAuthUserLoading" style="width: 750px;margin-right: 10px;">
<el-option v-for="item in searchUserList" :key="item.id" :label="item.userName" <el-option v-for="item in searchUserList" :key="item.id" :label="item.userName"
@@ -182,6 +187,7 @@
<el-button type="primary" @click="autoFill('autoFillForm')">确 定</el-button> <el-button type="primary" @click="autoFill('autoFillForm')">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</el-card>
</div> </div>
</template> </template>