优化一些文件导出相关的问题

NaoTu · Aug 31, 2018 · 982448e · 982448e
1 parent 5ac9006
commit 982448e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/doc/History.md b/doc/History.md
@@ -4,6 +4,13 @@
 
 ## 更新记录
 
+### 1.0.3 / 2018-8-31
+
+- 修复 导出文件不出现在`最近的文件`中
+- 修复 另存为时默认采用`根节点的文字`为文件名称
+- 修复 新建文件弹出的提示从`覆盖当前文件`改为`关闭当前文件`
+- 新增 导出默认采用`根节点的文字`为文件名称
+
 ### 1.0.2 / 2018-8-30
 
 - 新增 图片双击放大

diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "desktopnaotu",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "桌面版脑图",
   "main": "main.js",
   "scripts": {
     "start": "gulp default && electron main.js",
-    "packwin32": "electron-packager ./ DesktopNaotu --platform=win32 --arch=ia32 --out=../OutApp --icon=favicon.ico --electron-version=2.0.2 --app-version=1.0.2 --ignore=\"(.git|node_modules|screenshot|doc|src|bower_components|electron-packager)\" --overwrite --prune",
-    "packwin64": "electron-packager ./ DesktopNaotu --platform=win32 --arch=x64 --out=../OutApp --icon=favicon.ico --electron-version=2.0.2 --app-version=1.0.2 --ignore=\"(.git|node_modules|screenshot|doc|src|bower_components|electron-packager)\" --overwrite --prune",
-    "packosx": "electron-packager ./ DesktopNaotu --platform=darwin --arch=x64 --out=../OutApp --icon=favicon.icns --electron-version=2.0.2 --app-version=1.0.2 --ignore=\"(.git|node_modules|screenshot|doc|src|bower_components|electron-packager)\" --overwrite --prune",
-    "packlinux": "electron-packager ./ DesktopNaotu --platform=linux --arch=x64 --out=../OutApp --icon=favicon.png --electron-version=2.0.2 --app-version=1.0.2 --ignore=\"(.git|node_modules|screenshot|doc|src|bower_components|electron-packager)\" --overwrite --prune"
+    "packwin32": "electron-packager ./ DesktopNaotu --platform=win32 --arch=ia32 --out=../OutApp --icon=favicon.ico --electron-version=2.0.2 --app-version=1.0.3 --ignore=\"(.git|node_modules|screenshot|doc|src|bower_components|electron-packager)\" --overwrite --prune",
+    "packwin64": "electron-packager ./ DesktopNaotu --platform=win32 --arch=x64 --out=../OutApp --icon=favicon.ico --electron-version=2.0.2 --app-version=1.0.3 --ignore=\"(.git|node_modules|screenshot|doc|src|bower_components|electron-packager)\" --overwrite --prune",
+    "packosx": "electron-packager ./ DesktopNaotu --platform=darwin --arch=x64 --out=../OutApp --icon=favicon.icns --electron-version=2.0.2 --app-version=1.0.3 --ignore=\"(.git|node_modules|screenshot|doc|src|bower_components|electron-packager)\" --overwrite --prune",
+    "packlinux": "electron-packager ./ DesktopNaotu --platform=linux --arch=x64 --out=../OutApp --icon=favicon.png --electron-version=2.0.2 --app-version=1.0.3 --ignore=\"(.git|node_modules|screenshot|doc|src|bower_components|electron-packager)\" --overwrite --prune"
   },
   "repository": {
     "type": "git",

diff --git a/src/js/common.js b/src/js/common.js
@@ -27,7 +27,7 @@ function readFile(fileName) {
     saveRecords(defaultPath);
 }
 
-function writeFile(fileName, content) {
+function writeFile(fileName, content, isExport) {
     if (!fileName) return;
 
     fs.writeFile(fileName, content, function (err) {
@@ -38,13 +38,15 @@ function writeFile(fileName, content) {
         }
     });
 
-    saveRecords(fileName);
+    if(!isExport){
+        saveRecords(fileName);
+    }
 }
 
 function newDialog() {
     if (hasData()) {
         bootbox.confirm({
-            message: '新建文件会覆盖当前文件，是否继续？',
+            message: '新建文件会关闭当前文件，是否继续？',
             callback: function (result) {
                 if (result) {
                     initRoot();
@@ -104,10 +106,12 @@ function saveDialog() {
 }
 
 function saveAsDialog() {
+    var newPath = path.join(getUserDataDir(), '/' + minder.getRoot().data.text + '.km');
+
     dialog.showSaveDialog(
         {
             title: "保存 KityMinder 文件",
-            defaultPath: defaultPath,
+            defaultPath: newPath,
             filters: [{ name: 'KityMinder', extensions: ['km'] }]
         },
         (fileName) => {
@@ -123,6 +127,8 @@ function saveAsDialog() {
 }
 
 function exportDialog() {
+    var newPath = path.join(getUserDataDir(), '/' + minder.getRoot().data.text);
+
     var filters = [];
     var pool = kityminder.data.getRegisterProtocol();
     for (var name in pool) {
@@ -134,6 +140,7 @@ function exportDialog() {
     dialog.showSaveDialog(
         {
             title: "导出 KityMinder 文件",
+            defaultPath: newPath,
             filters: filters
         },
         (fileName) => {
@@ -295,13 +302,13 @@ function exportFile(protocol, filename) {
     minder.exportData(protocol.name, options).then(function (data) {
         switch (protocol.dataType) {
             case 'text':
-                writeFile(filename, data);
+                writeFile(filename, data, true);
                 break;
             case 'base64':
                 var base64Data = data.replace(/^data:image\/\w+;base64,/, "");
                 var dataBuffer = new Buffer(base64Data, 'base64');
 
-                writeFile(filename, dataBuffer);
+                writeFile(filename, dataBuffer, true);
                 break;
             case 'blob':
                 break;

diff --git a/version.js b/version.js
@@ -1 +1 @@
-exports.version = [1, 0, 2, 326];
+exports.version = [1, 0, 3, 331];