Former-commit-id: f17924da71473e360cf5bcc4be5af0c8cb651211
master
wangbing 5 years ago
parent 15a6d6d6bf
commit 984938b7b7

@ -143,24 +143,23 @@
<!-- 项目名称 -->
<finalName>dbtool</finalName>
<!-- 默认的主代码目录 -->
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
<sourceDirectory>src/main/java</sourceDirectory>
<!-- 默认的测试代码目录 -->
<testSourceDirectory>src/test</testSourceDirectory>
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>static/node_modules/*</exclude>
</excludes>
</resource>
<!-- 包含java下的xml文件 -->
<resource>
<directory>${basedir}/src/main/java</directory>
<includes>
<include>**/mpr/*.xml</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>*.bat</include>
</includes>
<targetPath>${project.basedir}/target</targetPath>
</resource>
<!-- 包含lib中所有jar包 -->
<resource>
<directory>${basedir}/src/main/resources/lib</directory>
@ -169,6 +168,14 @@
<include>*.jar</include>
</includes>
</resource>
<!-- 启动bat -->
<resource>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>*.bat</include>
</includes>
<targetPath>${project.basedir}/target</targetPath>
</resource>
</resources>
<plugins>
<plugin>

File diff suppressed because one or more lines are too long

@ -98,7 +98,7 @@
// 正则匹配文件名
var fileName = dis.match(/filename="(.*\..*)"/)[1];
// 模拟下载
utils.downBlob(decodeURIComponent(fileName),new Blob([response.data]))
utils.blobtoDown(decodeURIComponent(fileName),new Blob([response.data]))
return Promise.resolve({errors: []});
}
}, function (error) {
@ -129,8 +129,8 @@
nav.e(rsp.errors[0].message)
} else {
nav.barFinish();
var bytes = utils.base64toBytes(rsp.base64);
utils.downBlob(rsp.name,new Blob([bytes]))
var blob = utils.base64toBlob(rsp.base64);
utils.blobtoDown(rsp.name,blob);
}
});
reader.readAsText(response.data, "utf-8");
@ -142,7 +142,7 @@
// 正则匹配文件名
var fileName = dis.match(/filename="(.*\..*)"/)[1];
// 模拟下载
utils.downBlob(decodeURIComponent(fileName),new Blob([response.data]))
utils.blobtoDown(decodeURIComponent(fileName),new Blob([response.data]))
return Promise.resolve({errors: []});
}
}, function (response) {
@ -395,16 +395,13 @@
onSelectionChange: function (select) {
this.select = select;
},
selectExcel: function () {
this.$refs['excel'].dispatchEvent(new MouseEvent('click'))
},
onTemplate: function () {
this.$ajax.template(this.module, this.target, {});
},
onImport: function (item) {
const file = item.target.files[0];
this.$ajax.imports(this.module, this.target, file);
this.$refs['excel'].value = ''
utils.selectFile(function (files) {
this.$ajax.imports(this.module, this.target, files[0]);
}.bind(this))
},
onExport: function () {
this.$ajax.exports(this.module, this.target, this.vm);

@ -158,11 +158,7 @@
</el-tooltip>
<el-tooltip effect="dark" content="Excel导入" placement="bottom">
<el-button size="small" @click="selectExcel">
<i class="el-icon-upload2">
<input type="file" style="display: none" @change="onImport($event)" ref="excel">
</i>
</el-button>
<el-button size="small" class="el-icon-upload2" @click="onImport"></el-button>
</el-tooltip>
<el-tooltip effect="dark" content="批量删除" placement="bottom">

@ -65,11 +65,7 @@
</el-tooltip>
<el-tooltip effect="dark" content="Excel导入" placement="bottom">
<el-button size="small" @click="selectExcel">
<i class="el-icon-upload2">
<input type="file" style="display: none" @change="onImport($event)" ref="excel">
</i>
</el-button>
<el-button size="small" class="el-icon-upload2" @click="onImport"></el-button>
</el-tooltip>
<el-tooltip effect="dark" content="批量删除" placement="bottom">

@ -64,11 +64,7 @@
</el-tooltip>
<el-tooltip effect="dark" content="Excel导入" placement="bottom">
<el-button size="small" @click="selectExcel">
<i class="el-icon-upload2">
<input type="file" style="display: none" @change="onImport($event)" ref="excel">
</i>
</el-button>
<el-button size="small" class="el-icon-upload2" @click="onImport"></el-button>
</el-tooltip>
<el-tooltip effect="dark" content="批量删除" placement="bottom">

File diff suppressed because one or more lines are too long

@ -36,7 +36,6 @@ gulp.task("dev", function () {
gulp.task("clean", function () {
del(["dist/*"]);
del(["dist"]);
})
//baseJs
var baseJsList = [
@ -52,6 +51,7 @@ var baseCssList = [
];
gulp.task("baseJs", function () {
return gulp.src(baseJsList)
.pipe(jshint())
.pipe(concat("lib.js"))
.pipe(uglify())
.pipe(rename({suffix: '.min'}))

@ -70,29 +70,70 @@ Array.prototype.exchange = function (val1, val2) {
this.splice(val1, 1, o2);
this.splice(val2, 1, o1);
};
window.utils = {};
window.utils.downBlob = function (name, blob) {
var url = window.URL.createObjectURL(blob);
console.log(url)
var link = document.createElement('a')
link.style.display = 'none';
link.href = url;
link.setAttribute('download', name)
document.body.appendChild(link);
var evt = document.createEvent("MouseEvents");
evt.initEvent("click", false, false);
link.dispatchEvent(evt);
document.body.removeChild(link);
};
window.utils.base64toString = function (base64) {
return window.atob(base64);
};
window.utils.base64toBytes = function (base64) {
var str = window.atob(base64);
var len = str.length;
var bytes = new Int8Array(len)
for (var i = 0; i < len; i++) {
bytes[i] = str.charCodeAt(i);
window.utils = {
/**
* 隐藏文件选择器
*
* @param cb 回调函数
*/
selectFile: function (cb) {
var input = document.createElement('input');
input.style.display = 'none';
input.type = "file";
document.body.appendChild(input);
input.dispatchEvent(new MouseEvent('click'));
input.onchange = function (ev) {
cb(ev.target.files);
document.body.removeChild(input);
}
},
/**
* Blob二进制文件异步下载
*
* @param name 文件名
* @param blob 二进制文件
*/
blobtoDown: function (name, blob) {
var url = window.URL.createObjectURL(blob);
console.log(url)
var link = document.createElement('a');
link.style.display = 'none';
link.href = url;
link.setAttribute('download', name);
document.body.appendChild(link);
link.dispatchEvent(new MouseEvent('click'));
document.body.removeChild(link);
},
/**
* base64转为String
*
* @param base64 base64字符串
* @returns {string} 字符串
*/
base64toString: function (base64) {
return window.atob(base64);
},
/**
* base64转为字节数组
*
* @param base64 base64字符串
* @returns {string} 字节数组
*/
base64toBytes: function (base64) {
var str = window.atob(base64);
var len = str.length;
var bytes = new Int8Array(len);
for (var i = 0; i < len; i++) {
bytes[i] = str.charCodeAt(i);
}
return bytes;
},
/**
*
* @param base64
* @returns {Int8Array}
*/
base64toBlob: function (base64) {
return new Blob(this.base64toBytes(base64));
}
return bytes;
};
}

@ -0,0 +1 @@
3e0d100ef9e28dc05d6f121d767ff0a1e8a3a1c3

@ -4,7 +4,8 @@
"description": "",
"main": "gulpfile.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
"test": "echo \"Error: no test specified\" && exit 1",
"build": "gulp build"
},
"author": "wangbing",
"license": "ISC",

@ -1,4 +1,4 @@
import xyz.wbsite.dbtool.javafx.manger.DBManager;
import xyz.wbsite.dbtool.javafx.manger.ProjectManager;
import java.util.HashMap;
public class TestConnect {
@ -10,9 +10,9 @@ public class TestConnect {
map.put("username","JCJ");
map.put("password","JCJ");
map.put("driverClassName","oracle.jdbc.driver.OracleDriver");
boolean b = DBManager.testConnect(map);
boolean b = ProjectManager.testConnect(map);
DBManager.loadMD(map);
ProjectManager.loadMD(map);
System.out.println(b);
}

Loading…
Cancel
Save

Powered by TurnKey Linux.