Skip to content

Commit 4a1e6a8

Browse files
committed
增加 Oracle Driver
1 parent cbcecef commit 4a1e6a8

File tree

2 files changed

+29
-25
lines changed

2 files changed

+29
-25
lines changed

src/views/infra/codegen/importTable.vue

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
<template>
22
<!-- 导入表 -->
33
<el-dialog title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
4-
<el-form :model="queryParams" ref="queryForm" :inline="true">
4+
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
5+
<el-form-item label="数据源" prop="dataSourceConfigId">
6+
<el-select v-model="queryParams.dataSourceConfigId" placeholder="请选择数据源" clearable>
7+
<el-option v-for="config in dataSourceConfigs"
8+
:key="config.id" :label="config.name" :value="config.id"/>
9+
</el-select>
10+
</el-form-item>
511
<el-form-item label="表名称" prop="tableName">
6-
<el-input
7-
v-model="queryParams.tableName"
8-
placeholder="请输入表名称"
9-
clearable
10-
size="small"
11-
@keyup.enter.native="handleQuery"
12-
/>
12+
<el-input v-model="queryParams.tableName" placeholder="请输入表名称" clearable @keyup.enter.native="handleQuery" />
1313
</el-form-item>
1414
<el-form-item label="表描述" prop="tableComment">
15-
<el-input
16-
v-model="queryParams.tableComment"
17-
placeholder="请输入表描述"
18-
clearable
19-
size="small"
20-
@keyup.enter.native="handleQuery"
21-
/>
15+
<el-input v-model="queryParams.tableComment" placeholder="请输入表描述" clearable @keyup.enter.native="handleQuery"/>
2216
</el-form-item>
2317
<el-form-item>
2418
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -27,10 +21,9 @@
2721
</el-form>
2822
<el-row>
2923
<el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
30-
<el-table-column type="selection" width="55"></el-table-column>
31-
<el-table-column prop="tableSchema" label="数据库" :show-overflow-tooltip="true"></el-table-column>
32-
<el-table-column prop="tableName" label="表名称" :show-overflow-tooltip="true"></el-table-column>
33-
<el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true"></el-table-column>
24+
<el-table-column type="selection" width="55" />
25+
<el-table-column prop="tableName" label="表名称" :show-overflow-tooltip="true" />
26+
<el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true" />
3427
<el-table-column prop="createTime" label="创建时间">
3528
<template slot-scope="scope">
3629
<span>{{ parseTime(scope.row.createTime) }}</span>
@@ -47,6 +40,7 @@
4740

4841
<script>
4942
import { getSchemaTableList, createCodegenListFromDB } from "@/api/infra/codegen";
43+
import {getDataSourceConfigList} from "@/api/infra/dataSourceConfig";
5044
export default {
5145
data() {
5246
return {
@@ -60,16 +54,25 @@ export default {
6054
dbTableList: [],
6155
// 查询参数
6256
queryParams: {
57+
dataSourceConfigId: undefined,
6358
tableName: undefined,
64-
tableComment: undefined
65-
}
59+
tableComment: undefined,
60+
},
61+
// 数据源列表
62+
dataSourceConfigs: [],
6663
};
6764
},
6865
methods: {
6966
// 显示弹框
7067
show() {
71-
this.getList();
7268
this.visible = true;
69+
// 加载数据源
70+
getDataSourceConfigList().then(response => {
71+
this.dataSourceConfigs = response.data;
72+
this.queryParams.dataSourceConfigId = this.dataSourceConfigs[0].id;
73+
// 加载表列表
74+
this.getList();
75+
});
7376
},
7477
clickRow(row) {
7578
this.$refs.table.toggleRowSelection(row);
@@ -91,6 +94,7 @@ export default {
9194
/** 重置按钮操作 */
9295
resetQuery() {
9396
this.resetForm("queryForm");
97+
this.queryParams.dataSourceConfigId = this.dataSourceConfigs[0].id;
9498
this.handleQuery();
9599
},
96100
/** 导入按钮操作 */

src/views/infra/dataSourceConfig/index.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!-- 列表 -->
1212
<el-table v-loading="loading" :data="list">
1313
<el-table-column label="主键编号" align="center" prop="id" />
14-
<el-table-column label="参数名称" align="center" prop="name" />
14+
<el-table-column label="数据源名称" align="center" prop="name" />
1515
<el-table-column label="数据源连接" align="center" prop="url" />
1616
<el-table-column label="用户名" align="center" prop="username" />
1717
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -32,7 +32,7 @@
3232
<!-- 对话框(添加 / 修改) -->
3333
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
3434
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
35-
<el-form-item label="参数名称" prop="name">
35+
<el-form-item label="数据源名称" prop="name">
3636
<el-input v-model="form.name" placeholder="请输入参数名称" />
3737
</el-form-item>
3838
<el-form-item label="数据源连接" prop="url">
@@ -76,7 +76,7 @@ export default {
7676
form: {},
7777
// 表单校验
7878
rules: {
79-
name: [{ required: true, message: "参数名称不能为空", trigger: "blur" }],
79+
name: [{ required: true, message: "数据源名称不能为空", trigger: "blur" }],
8080
url: [{ required: true, message: "数据源连接不能为空", trigger: "blur" }],
8181
username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
8282
password: [{ required: true, message: "密码不能为空", trigger: "blur" }],

0 commit comments

Comments
 (0)