ee-core 1.2.3 → 1.2.4

package/config/config.default.js

@@ -224,5 +224,12 @@ module.exports = appInfo => {
     port: 7072, // 默认端口（如果端口被使用，则随机获取一个）
   }; 
 
+  /**
+   * 应用程序顶部菜单
+   * boolean | string
+   * true, false, 'dev-show'(dev环境显示，prod环境隐藏)
+   */
+  config.openAppMenu = true; 
+
   return config;
 };

package/lib/application.js

@@ -29,10 +29,14 @@ class Appliaction extends EeApp {
     }
 
     // argv
+    let hotReload = false;
     for (let i = 0; i < process.argv.length; i++) {
       const tmpArgv = process.argv[i]
       if (tmpArgv.indexOf('--env=') !== -1) {
-        options.env = tmpArgv.substring(6)
+        options.env = tmpArgv.substring(6);
+      }
+      if (tmpArgv.indexOf('--hot-reload=') !== -1) {
+        hotReload = tmpArgv.substring(13) == 1 ? true : false;
       }
     }
 
@@ -52,7 +56,7 @@ class Appliaction extends EeApp {
     env.EE_MAIN_PORT = null;
     env.EE_SOCKET_PORT = null;
     env.EE_HTTP_PORT = null;
-    env.EGG_SERVER_ENV = options.env;
+    env.HOT_RELOAD = hotReload;
     debug('options:%j', options)
 
     super(options);
@@ -70,7 +74,7 @@ class Appliaction extends EeApp {
 
     await this.createElectronApp();
 
-    this.catchLog();
+    await this.catchLog();
   } 
 }
 

package/lib/eeApp.js

@@ -84,7 +84,6 @@ class EeApp extends BaseApp {
     app.on('before-quit', () => {
       self.electron.extra.closeWindow = true;
     })
-
     await this.electronAppReady();
   }
     
@@ -95,9 +94,14 @@ class EeApp extends BaseApp {
     const winOptions = this.config.windowsOption;
     this.electron.mainWindow = new BrowserWindow(winOptions);
 
-    // 隐藏菜单
-    if (!this.config.openAppMenu) {
+    // 菜单显示/隐藏
+    if (this.config.openAppMenu === 'dev-show'
+      && this.config.env == 'prod') {
+      Menu.setApplicationMenu(null);
+    } else if (this.config.openAppMenu === false) {
       Menu.setApplicationMenu(null);
+    } else {
+      // nothing 
     }
 
     this.loadingView(winOptions);
@@ -292,17 +296,12 @@ class EeApp extends BaseApp {
   /**
    * 捕获异常
    */
-  catchLog () {
+  async catchLog () {
     const self = this;
+
     process.on('uncaughtException', function(err) {
       self.logger.error(err);
     });
-    
-    // process.on('SIGINT', function () {
-    //   console.log('Exit now!');
-    //   self.appQuit();
-    //   process.exit();
-    // });
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "ee core",
   "main": "index.js",
   "scripts": {