diff --git a/electron/build.sh b/electron/build.sh
index ead00dd..26e60ec 100644
--- a/electron/build.sh
+++ b/electron/build.sh
@@ -8,4 +8,5 @@ rm -rf ./static/js
rm -rf ./static/css
cp -r ../openRenamerFront/dist/* ./static
cd ../electron
+mkdir -p dist
npm run build
\ No newline at end of file
diff --git a/electron/index.html b/electron/index.html
new file mode 100644
index 0000000..f193613
--- /dev/null
+++ b/electron/index.html
@@ -0,0 +1,70 @@
+
+
+ open-renamer
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/electron/main.js b/electron/main.js
index 9bbccb3..5ed53a9 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -26,15 +26,25 @@ async function createWindow() {
nodeIntegration: true, // 是否完整支持node。默认为 true
preload: path.join(__dirname, 'preload.js') //界面的其它脚本运行之前预先加载一个指定脚本。
}
- })
+ });
+ //打开调试
+ // win.webContents.openDevTools();
+
+ win.loadFile('./index.html');
+ let startTime = Date.now();
+
// 下面这两行代码配合上面 new BrowserWindow 里面的 show: false，可以实现打开时窗口最大化
win.maximize()
win.show()
log.info(__dirname);
let port = await startBackend()
- // 并且为你的应用加载index.html
- // win.loadFile('./dist/index.html')
log.info("backend service started")
+
+ let diff = Date.now() - startTime;
+ let time = 2000;
+ if (diff < time) {
+ await sleep(time - diff);
+ }
win.loadURL(`http://localhost:` + port);
// win.webContents.openDevTools()
}
diff --git a/electron/package.json b/electron/package.json
index 4c985dd..e4cc66a 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -1,6 +1,6 @@
{
"name": "electron",
- "version": "1.0.0",
+ "version": "1.1.0",
"description": "",
"main": "main.js",
"scripts": {
@@ -22,7 +22,8 @@
},
"files": [
"main.js",
- "preload.js"
+ "preload.js",
+ "index.html"
],
"extraFiles": [
{
diff --git a/openRenamerFront/src/components/rules/RuleBlock.vue b/openRenamerFront/src/components/rules/RuleBlock.vue
index bd67d31..d61926a 100644
--- a/openRenamerFront/src/components/rules/RuleBlock.vue
+++ b/openRenamerFront/src/components/rules/RuleBlock.vue
@@ -90,7 +90,7 @@ export default {
} else {
this.chosedTemplate = await HttpUtil.get("/applicationRule/default");
this.ruleList = JSON.parse(this.chosedTemplate.content);
- await this.ruleUpdate();
+ await this.ruleUpdate(false);
}
},
watch: {
@@ -101,9 +101,14 @@ export default {
},
methods: {
//规则更新
- ruleUpdate() {
+ ruleUpdate(preview) {
+ if (preview !== undefined && preview === false) {
+ preview = false;
+ } else {
+ preview = true;
+ }
let temp = this.ruleList.filter((item) => !item.blocked);
- this.$emit("ruleUpdate", temp);
+ this.$emit("ruleUpdate", temp, preview);
},
//模板内容提交
async templateSubmit() {
diff --git a/openRenamerFront/src/views/home/Home.vue b/openRenamerFront/src/views/home/Home.vue
index 40ee7fb..ebedfb5 100644
--- a/openRenamerFront/src/views/home/Home.vue
+++ b/openRenamerFront/src/views/home/Home.vue
@@ -155,9 +155,12 @@ export default {
this.dialogVisible = false;
await this.showResult();
},
- async ruleUpdate(rules) {
+ async ruleUpdate(rules, preview) {
+ console.log(rules, preview);
this.ruleList = rules;
- await this.showResult();
+ if (preview) {
+ await this.showResult();
+ }
},
//预览结果
async showResult() {