This commit is contained in:
2019-04-10 18:08:50 +08:00
parent 9623b70875
commit 6e7388ddf4
9 changed files with 71 additions and 81 deletions

12
root/api/db.js Normal file
View File

@@ -0,0 +1,12 @@
const db = {
catalogList({dbAccount, dbPlatId}) { // database列表
console.log(dbAccount)
return red.postX('/_db/catalog_list', {dbAccount: JSON.stringify(dbAccount), dbPlatId})
},
tableList({dbPlatId, catalog}) { // 数据库表列表
return red.postX('/_db/table_list', {dbPlatId, catalog})
},
tableInfo({dbPlatId, catalog, tableName}) {
return red.postX('/_db/table_info', {dbPlatId, catalog, tableName})
}
}

View File

@@ -1,50 +1,5 @@
/*import red from '../res/js/red'*/
/*const getPlats = (callback) => {
red.getJSON("/meta/plat_list", {}, json => callback(json));
}
const getTableList = (callback) => {
red.getJSON("/meta/tablelist",{}, function (json) {
callback(json);
});
}
const getTableDetail = ({name}, callback) => {
red.getJSON("/meta/tableinfo",{name}, function (json) {
callback(json);
});
}
const getServiceList = (callback) => {
red.getJSON("/meta/service_list",{}, function (json) {
json = red.replacePoint(json);
callback(json);
});
}
const getServiceInfo = ({name}, callback) => {
red.getJSON("/meta/service_info",{name}, res => {
let row = red.replacePoint(res);
row.shows = row.shows || [];
row.exports = row.exports || [];
row.imports = row.imports || [];
row.filters = row.filters || [];
callback(row);
});
}
function getServiceDetail({name}, callback) {
red.getJSON("/meta/service_detail",{name}, function (json) {
json = red.replacePoint(json)
callback(json);
});
}*/
const meta = {
/*getPlats: (callback) => {
red.getJSON("/meta/plat_list", {}, json => callback(json));
},*/
getTableList(callback) {
red.getJSON("/meta/tablelist",{}, json => callback(json));
},
@@ -82,10 +37,9 @@ const meta = {
callback(json);
});
},
getCfg({name}, callback) {
red.getJSON("/meta/cfg",{name}, json => {
json = red.replacePoint(json)
callback(json);
getCfg({name}) {
return red.postX("/meta/cfg",{name}, res => {
return red.replacePoint(res)
});
},
getDataList({name, filters, orders, limit}, callback) {
@@ -95,13 +49,3 @@ const meta = {
})
}
}
/*
export {
getTableList,
getPlats,
getServiceDetail,
getServiceInfo,
getServiceList,
getTableDetail
}*/

View File

@@ -15,8 +15,5 @@ const plat = {
dbSave({plat}) {
return red.postX('/plat/db_save', {plat})
},
catalogList({dbAccount, dbPlatId}) { // database列表
console.log(dbAccount)
return red.postX('/_db/catalog_list', {dbAccount: JSON.stringify(dbAccount), dbPlatId})
}
}

View File

@@ -6,7 +6,7 @@ const login = ({username, pwd}) => {
const logout = () => {
red.getJSON("/user/logout",{}, function () {
red.showMsg({msg:"退出成功"});
red.showOk('退出成功')
setTimeout(() => {
location.href = "/user/login.html";
}, 2000)

View File

@@ -92,6 +92,7 @@
<script src="./api/meta.js" defer></script>
<script src="./api/plat.js" defer></script>
<script src="./api/qtask.js" defer></script>
<script src="./api/db.js" defer></script>
<script src="./res/zui/lib/sortable/zui.sortable.js" defer></script>
<script src="./res/zui/lib/uploader/zui.uploader.min.js" defer></script>
<!--<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>-->

View File

@@ -228,9 +228,7 @@
});
},
loadCfg() {
getCfg({name: this.service}, json => {
vm.cfg = json;
});
getCfg({name: this.service}).then(res => this.cfg = res);
},
dealField(bean, field) {
var str = "";

View File

@@ -56,12 +56,12 @@
</div>
<ul class="nav nav-tabs">
<li class="active"><a href="###" data-target="#tab2Content1" data-toggle="tab">从本地上传</a></li>
<li><a href="###" data-target="#tab2Content2" data-toggle="tab">从数据源导入</a></li>
<li><a href="###" data-target="#tab2Content1" data-toggle="tab">从本地上传</a></li>
<li class="active"><a href="###" data-target="#tab2Content2" data-toggle="tab">从数据源导入</a></li>
<li><a href="###" data-target="#tab2Content3" data-toggle="tab">其他</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane fade active in" id="tab2Content1">
<div class="tab-pane fade" id="tab2Content1">
<div id="tableUploader" class="uploader">
<!--<div class="uploader-message text-center">
<div class="content"></div>
@@ -176,13 +176,18 @@
</div>
</div>
</div>
<div class="tab-pane fade" id="tab2Content2">
<div class="tab-pane fade active in" id="tab2Content2">
<div class="form-group">
<label class="col-sm-1">数据源</label>
<div class="col-md-2 col-sm-10">
<select class="form-control">
<option v-for="item in dbPlats" :value="item" v-text="item.field"></option>
<label class="col-md-1 col-sm-1" style="padding-bottom: 10px;padding-top: 5px;">数据源选择</label>
<div class="col-md-2 col-sm-10" style="padding-bottom: 10px">
<select class="form-control" v-model="dbPlat">
<option v-for="item in dbPlats" :value="item" v-text="item.name"></option>
</select>
</div>
<div class="col-md-2 col-sm-10" style="padding-bottom: 10px">
<select class="form-control" v-model="catalog">
<option v-for="item in catalogs" :value="item" v-text="item"></option>
</select>
</div>
</div>
@@ -207,13 +212,14 @@
<script>
let {dbList} = plat
let {catalogList, tableList, tableInfo} = db
var vm = new Vue({
el: ".importDev",
data: {
filePath: '',
importStatus: false,
sheetData: {}, // {name1: {}}
sheetData: {}, // 所有的完整数据 {name1: {}}
sheetArr: [], // [name1,name2,]
sheet: '',
ck: [],
@@ -221,8 +227,12 @@
// 从数据源导入实体
dbPlats: red.getData('dbPlats'),
catalogs: [],
dbPlat: {},
dbPlatId: '',
catalog: '',
table: '',
tableInfo: {},
cache: {
local: {
@@ -237,7 +247,7 @@
},
watch: {
sheetData: function (v) {
sheetData: function (v) { // 查询sheet列表数据
var arr = [];
var ck = [];
for (k in v) {
@@ -255,12 +265,22 @@
this.sheet = "";
}
},
sheet: function (v) {
sheet: function (v) { // 查询sheet详情
this.metaTable = this.sheetData[v];
console.log(this.metaTable)
if (this.metaTable['load'] != 1) {
this.loadSheetData();
}
},
dbPlat(v) {
this.dbPlatId = v['key']
this.catalogs = v['catalogs']
},
catalog() {
this.loadTables();
},
table() {
this.loadTableData();
}
},
methods: {
@@ -305,6 +325,17 @@
},
showInfo() {
$('#f-info').modal({moveable: true})
},
//------从mysql导入使用的相关方法-------
loadTables() { // 查询table列表
},
loadTableData() { // 查询表信息
},
saveTable() { // 保存数据
}
},
mounted: function () {

View File

@@ -137,7 +137,8 @@
<script>
let {showOk} = red
let {dbList, dbSave, catalogList} = plat
let {dbList, dbSave} = plat
let {catalogList} = db
var vm = new Vue({
el: ".plat",

View File

@@ -19,4 +19,10 @@ public class _QtaskService extends BaseService{
return JBean.by(0, "", page);
}
@Comment("qtask保存")
public JBean save() {
return JBean.by(0, "");
}
}