diff --git a/index.html b/index.html
index 4f7c545..93cdedb 100644
--- a/index.html
+++ b/index.html
@@ -6,24 +6,24 @@
Paper Arxiv
-
+
-
-
添加
-
配置
+
+ Add
+ Config
-
-
-
+
+
+
-
+
@@ -34,76 +34,78 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
- 编辑
- 删除
+
+
+
+
-
-
+
+
-
-
+
+
+
-
+
-
-
+
+
-
-
+
+
diff --git a/package.json b/package.json
index bae1065..5d9495d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "PaperArxiv",
- "version": "0.0.1",
+ "version": "0.0.2",
"description": "A paper management tool",
"main": "main.js",
"scripts": {
@@ -24,7 +24,7 @@
"author": "Maple",
"license": "MIT",
"devDependencies": {
- "electron": "~1.7.9",
+ "electron": "~1.8.7",
"electron-rebuild": "^1.6.0",
"electron-packager": "9.0.0",
"electron-installer-debian": "0.5.2",
@@ -34,9 +34,9 @@
"ava": "0.22.0"
},
"dependencies": {
- "better-sqlite3": "3.3.0",
+ "better-sqlite3": "4.1.2",
"child_process": "1.0.2",
- "element-ui": "1.4.12",
+ "element-ui": "2.0.11",
"home-dir": "1.0.0",
"path": "0.12.7",
"vue": "2.5.2",
diff --git a/src/database.js b/src/database.js
index d83f388..40454db 100644
--- a/src/database.js
+++ b/src/database.js
@@ -21,8 +21,20 @@ function DBManager(ctx) {
};
};
+ _exteactTags = function(tableData, key){
+ var tags = tableData.map(x => x[key].split(","));
+ tags = Array.prototype.concat.apply([], tags);
+ tags = tags.map(x => x.trim()).filter(x => x.length > 0);
+ var counts = {};
+ for (var i = 0; i < tags.length; i++) {
+ counts[tags[i]] = counts[tags[i]] ? counts[tags[i]] + 1 : 1;
+ }
+ return counts;
+ }
this.loadFullData = dbwrapper(function() {
if(typeof(this.db) !== undefined)ctx.tableData = this.db.prepare("SELECT * FROM docInfoTable").all();
+ //ctx.tagCounts = _exteactTags(ctx.tableData, "tags");
+ //ctx.journalCounts = _exteactTags(ctx.tableData, "journal");
});
_insertItem = dbwrapper(function(itemInfo, srcPath, dstPath){
keys = Object.keys(itemInfo);
@@ -54,7 +66,7 @@ function DBManager(ctx) {
});
this.updateItemInfo = function(oriName){
var d = new Date()
- ctx.ctor.itemEditFormData.updateTime = d.toISOString().slice(0, 10) + ' ' + d.toTimeString().slice(0, 8);
+ ctx.ctor.itemEditFormData.updateTime = d.toLocaleDateString().replace(/\//g,'-').slice(0, 10) + ' ' + d.toTimeString().slice(0, 8);
ctx.itemEditFormDataStandard = utils.deepcopy(ctx.ctor.itemEditFormData);
var findItemId = 0;
for(;findItemId < ctx.tableData.length && ctx.tableData[findItemId].name !== oriName; ++findItemId);
diff --git a/src/file.js b/src/file.js
index ac767c8..af61802 100644
--- a/src/file.js
+++ b/src/file.js
@@ -46,7 +46,7 @@ function extractFromPdfFile(filePath, ctx) {
pdfInfo.name = ([pdfInfo.year, pdfInfo.journal, authors[0].replace(/[\%\/\<\>\^\|\?\&\#\*\\\:\" \n]/g, '')].join('-') + '.pdf').replace(/[\%\/\<\>\^\|\?\&\#\*\\\:\" ]/g, '');
pdfInfo.authors = authors.map(x => x.trim()).join('\n')
var d = new Date()
- pdfInfo.addTime = d.toISOString().slice(0, 10) + ' ' + d.toTimeString().slice(0, 8);
+ pdfInfo.addTime = d.toLocaleDateString().replace(/\//g,'-').slice(0, 10) + ' ' + d.toTimeString().slice(0, 8);
pdfInfo.updateTime = pdfInfo.addTime;
pdfInfo.content = child_process.execSync('pdftohtml -q -xml -i -stdout -fontfullname "' + filePath + '"', {env:{PATH: process.env.PATH + ':/usr/local/bin'}}).toString().replace(/<\/?[^>]+(>|$)/g, "").split('\n').filter(x => x.length > 10).join('\n');
pdfInfo.tags = "";
diff --git a/src/index.js b/src/index.js
index 17d9dc5..ecd8bda 100644
--- a/src/index.js
+++ b/src/index.js
@@ -32,12 +32,13 @@ var ItemEdit = {
itemEditFormVisible: false,
itemConfigFormVisible: false,
tableData: utils.partialCopyArray(ctx.tableData, ctx.showKeys),
- userInputSearchText: ""
+ userInputSearchText: "",
}
},
methods: {
openPdfFile: function() {
fileManager.loadFile(this.ctx);
+ this.$refs.searchBox.focus();
},
itemEditFormDataUpdate: function() {
this.itemEditFormVisible = false;
@@ -48,6 +49,10 @@ var ItemEdit = {
ctx.dbManager.InsertItemInfo();
}
this.searchContent();
+ this.$refs.searchBox.focus();
+ },
+ itemEditFormDataCancel: function(){
+ this.$refs.searchBox.focus();
},
itemConfigFormDataUpdate: function(){
var config = utils.stringToConfig(this.itemConfigFormData, ctx);
@@ -57,6 +62,7 @@ var ItemEdit = {
this.itemConfigFormVisible = false;
this.itemConfigFormData = utils.configToString(ctx.configSettings);
location.reload(true);
+ this.$refs.searchBox.focus();
},
changNameByNewInfo: function() {
this.itemEditFormData.name = ([this.itemEditFormData.year, this.itemEditFormData.journal, this.itemEditFormData.authors.split('\n')[0]].join('-') + ".pdf").replace(/[\%\/\<\>\^\|\?\&\#\*\\\:\" ]/g, '');
@@ -64,7 +70,7 @@ var ItemEdit = {
openPdfFileWithSystemTool: function(val){
shell.openItem(path.join(this.ctx.configSettings.libpath, val.replace(/<\/?[^>]+(>|$)/g, "")));
},
- searchContent: function(){
+ searchContent: function(value){
if(this.userInputSearchText.length == 0){
ctx.ctor.tableData = utils.partialCopyArray(ctx.tableData, ctx.showKeys);
}else{
@@ -78,13 +84,19 @@ var ItemEdit = {
if(findItem.length !== 1){ctx.error('数据库中找不到该文件，请重启程序！');return;};
ctx.ctor.itemEditFormData = utils.deepcopy(findItem[0]);
},
- deleteRowInfo: function(row){
- this.$confirm('确认删除记录' + row.name.replace(/<\/?[^>]+(>|$)/g, "") + '？')
+ deleteRowInfo: function(){
+ name = ctx.ctor.itemEditFormData.name;
+ this.itemEditFormVisible = false;
+ this.$confirm('Confirm to delete record ' + name.replace(/<\/?[^>]+(>|$)/g, "") + '？')
.then(_ => {
- ctx.dbManager.deleteItemInfo(row.name.replace(/<\/?[^>]+(>|$)/g, ""));
+ ctx.dbManager.deleteItemInfo(name.replace(/<\/?[^>]+(>|$)/g, ""));
this.searchContent();
+ this.$refs.searchBox.focus();
})
.catch(_ => {})
+ },
+ onCellDBClick: function(row, column, cell, event){
+ this.editRowInfo(row);
}
}
}
@@ -100,7 +112,9 @@ function updateWindowSize(){
var height = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
document.getElementById('el-main-table').setAttribute("style","height:" + (height - 60).toString() + "px");
}
-updateWindowSize();
+
window.addEventListener('resize', function (e){
updateWindowSize();
}, true);
+
+updateWindowSize();