diff --git a/design1.html b/design1.html index 3bb932a..eb27eed 100644 --- a/design1.html +++ b/design1.html @@ -1033,6 +1033,7 @@ if (openAs.name != "") { //打开的文件 let fs = require('fs') + o.soonType = 1 fs.writeFileSync(openAs.name, JSON.stringify(o)) layer.msg(language_str("saveSucc") + openAs.name);//'保存成功至' saveHistory(); @@ -4096,6 +4097,7 @@ if (openAs.name != "") { //打开的文件 let fs = require('fs') + con_o.soonType = 1 fs.writeFileSync(openAs.name, JSON.stringify(con_o)) layer.msg(language_str("saveSucc") + openAs.name);//'保存成功至' saveHistory(); @@ -4168,6 +4170,7 @@ if (openAs.name != "") { //打开的文件 let fs = require('fs') + con_o.soonType = 1 fs.writeFileSync(openAs.name, JSON.stringify(con_o)) layer.msg(language_str("saveSucc") + openAs.name);//'保存成功至' saveHistory(); @@ -4411,6 +4414,11 @@ var fsData = fs.readFileSync(result.filePaths[0]) openAs.name = result.filePaths[0]; let j = JSON.parse(fsData.toString()); + let type = j.soonType ? j.soonType : j.backBlackPic ? 2 : 1; + if (type == 2) { + ipcRenderer.send('open-design-page', $(this).attr("data"), type); + return + } let left = background_image.left; let top = background_image.top; let new_left = j.f.objects[0].left; @@ -4560,6 +4568,7 @@ if (openAs.name != "") { //打开的文件 let fs = require('fs') + o.soonType = 1 fs.writeFileSync(openAs.name, JSON.stringify(o)) layer.msg(language_str("saveSucc") + openAs.name);//'保存成功至' /* diff --git a/design2.html b/design2.html index c76d6f2..8c340f4 100644 --- a/design2.html +++ b/design2.html @@ -819,6 +819,7 @@ if (openAs.name != '') { //打开的文件 let fs = require('fs') + o.soonType = 2 fs.writeFileSync(openAs.name, JSON.stringify(o)) layer.msg(language_str('saveSucc') + openAs.name) //'保存成功至' saveHistory() @@ -3434,6 +3435,7 @@ if (openAs.name != '') { //打开的文件 let fs = require('fs') + con_o.soonType = 2 fs.writeFileSync(openAs.name, JSON.stringify(con_o)) layer.msg(language_str('saveSucc') + openAs.name) //'保存成功至' saveHistory() @@ -3511,6 +3513,7 @@ if (openAs.name != '') { //打开的文件 let fs = require('fs') + con_o.soonType = 2 fs.writeFileSync(openAs.name, JSON.stringify(con_o)) layer.msg(language_str('saveSucc') + openAs.name) //'保存成功至' saveHistory() @@ -3759,6 +3762,11 @@ var fsData = fs.readFileSync(result.filePaths[0]) openAs.name = result.filePaths[0] let j = JSON.parse(fsData.toString()) + let type = j.soonType ? j.soonType : j.backBlackPic ? 2 : 1; + if (type == 1) { + ipcRenderer.send('open-design-page', $(this).attr("data"), type); + return + } let left = background_image.left let top = background_image.top let new_left = j.f.objects[0].left @@ -3914,6 +3922,7 @@ if (openAs.name != '') { //打开的文件 let fs = require('fs') + o.soonType = 2 fs.writeFileSync(openAs.name, JSON.stringify(o)) layer.msg(language_str('saveSucc') + openAs.name) //'保存成功至' /* diff --git a/index.html b/index.html index 586a768..ef2f6f9 100644 --- a/index.html +++ b/index.html @@ -215,7 +215,8 @@ fsData = fs.readFileSync(fullPath); let soonData = fs.readFileSync($(this).attr("data")) let j = JSON.parse(soonData.toString()); - ipcRenderer.send('open-design-page', $(this).attr("data"), j.soonType); + let type = j.soonType ? j.soonType : j.backBlackPic ? 2 : 1; + ipcRenderer.send('open-design-page', $(this).attr("data"), type); } catch (e) { layer.msg(language_str("noFile"));//当前文件不存在 let j = JSON.parse(fsData.toString()); @@ -261,10 +262,11 @@ }).then(result => { console.log(result.canceled) console.log(result.filePaths) - if (result.canceled) return; - let soonData = fs.readFileSync(result.filePaths) + if (result.canceled || !result.filePaths[0]) return; + let soonData = fs.readFileSync(result.filePaths[0]) let j = JSON.parse(soonData.toString()); - ipcRenderer.send('open-design-page', result.filePaths, j.soonType); + let type = j.soonType ? j.soonType : j.backBlackPic ? 2 : 1; + ipcRenderer.send('open-design-page', result.filePaths[0], type); //console.log(result.filePaths) }).catch(err => { console.log(err) diff --git a/main.js b/main.js index de40dac..1410aaf 100644 --- a/main.js +++ b/main.js @@ -45,7 +45,7 @@ function createWindow() { if (preFilePath) { let soonData = fs.readFileSync(preFilePath) let j = JSON.parse(soonData.toString()); - let type = j.soonType ? j.soonType : 1 + let type = j.soonType ? j.soonType : j.backBlackPic ? 2 : 1; mainWindow.loadURL(`file://${__dirname}/design${type}.html?file=${preFilePath}&type=${type}`); } else { mainWindow.loadFile("index.html");