From 45decd48c4ff1133e8cf5323ab1b03219e04c533 Mon Sep 17 00:00:00 2001
From: gsx <530353222@qq.com>
Date: Fri, 13 May 2022 19:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/library/tray.js |  6 ++++++
 package.json             | 19 +++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/electron/library/tray.js b/electron/library/tray.js
index 69a4bbe..d75036e 100644
--- a/electron/library/tray.js
+++ b/electron/library/tray.js
@@ -13,6 +13,12 @@ module.exports = {
    * 安装
    */
   install (eeApp) {
+    // 开发环境，代码热更新开启时，会导致托盘中有残影
+    // 目前没有找到合适的解决方案
+    // 启用热更新功能时，不加载该模块
+    // 如果调试该模式，请使用dev模式
+    if (process.env.EE_SERVER_ENV == 'local' && process.env.HOT_RELOAD) return;
+
     eeApp.logger.info('[preload] load tray module');
     const trayConfig = eeApp.config.tray;
     const mainWindow = eeApp.electron.mainWindow;
diff --git a/package.json b/package.json
index 777580c..b4e7bb2 100755
--- a/package.json
+++ b/package.json
@@ -1,11 +1,12 @@
 {
   "name": "ee",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "A fast, desktop software development framework",
   "main": "main.js",
   "scripts": {
     "start": "electron . ",
     "dev": "electron . --env=local",
+    "hot": "nodemon",
     "test": "set DEBUG=* && electron . --env=local",
     "build-w": "electron-builder -w --ia32",
     "build-w-64": "electron-builder -w --x64",
@@ -16,6 +17,19 @@
     "compress": "node ./node_modules/ee-core/bin/tools compress",
     "restore": "node ./node_modules/ee-core/bin/tools restore"
   },
+  "nodemonConfig": {
+    "watch": [
+      "electron/",
+      "main.js"
+    ],
+    "ignore": [],
+    "ext": "js,json",
+    "verbose": true,
+    "exec": "electron . --env=local --hot-reload=1",
+    "restartable": "hr",
+    "colours": true,
+    "events": {}
+  },
   "build": {
     "productName": "ee",
     "appId": "com.electron.ee",
@@ -92,7 +106,8 @@
     "electron-builder": "22.10.4",
     "eslint": "^5.13.0",
     "eslint-config-egg": "^7.1.0",
-    "eslint-plugin-prettier": "^3.0.1"
+    "eslint-plugin-prettier": "^3.0.1",
+    "nodemon": "^2.0.16"
   },
   "dependencies": {
     "dayjs": "^1.10.7",