ee-core 2.9.2 → 2.10.1

package/ee/index.js

@@ -1,58 +1,58 @@
-const Utils = require('../utils');
-const EEApplication = Symbol('Ee#Application');
-const BuiltInApp = Symbol('Ee#BuiltInApp');
-
-/**
- * EE
- */
-const EE = {
-
-  /**
-   * 兼容1.x版本api
-   */
-  get Application() {
-    const appClass = require('./application');
-    return appClass;
-  },
-
-  /**
-   * 设置实例化app对象
-   */  
-  set app(appObject) {
-    if (!this[EEApplication]) {
-      this[EEApplication] = appObject;
-    }
-  },
-
-  /**
-   * 获取实例化app对象
-   */  
-  get app() {
-    return this[EEApplication] || null;
-  },
-
-  /**
-   * 设置全局this到CoreApp (eeApp)
-   */  
-  set CoreApp(obj) {
-    if (!this[BuiltInApp]) {
-      this[BuiltInApp] = obj;
-    }
-  },
-
-  /**
-   * 获取 CoreApp (eeApp)
-   */  
-  get CoreApp() {
-    return this[BuiltInApp] || null;
-  },
-
-  /**
-   * 是否加密
-   */  
-  isEncrypt(basePath) {
-    return Utils.isEncrypt(basePath);
-  },
-}  
-
+const Utils = require('../utils');
+const EEApplication = Symbol('Ee#Application');
+const BuiltInApp = Symbol('Ee#BuiltInApp');
+
+/**
+ * EE
+ */
+const EE = {
+
+  /**
+   * 兼容1.x版本api
+   */
+  get Application() {
+    const appClass = require('./application');
+    return appClass;
+  },
+
+  /**
+   * 设置实例化app对象
+   */  
+  set app(appObject) {
+    if (!this[EEApplication]) {
+      this[EEApplication] = appObject;
+    }
+  },
+
+  /**
+   * 获取实例化app对象
+   */  
+  get app() {
+    return this[EEApplication] || null;
+  },
+
+  /**
+   * 设置全局this到CoreApp (eeApp)
+   */  
+  set CoreApp(obj) {
+    if (!this[BuiltInApp]) {
+      this[BuiltInApp] = obj;
+    }
+  },
+
+  /**
+   * 获取 CoreApp (eeApp)
+   */  
+  get CoreApp() {
+    return this[BuiltInApp] || null;
+  },
+
+  /**
+   * 是否加密
+   */  
+  isEncrypt(basePath) {
+    return Utils.isEncrypt(basePath);
+  },
+}  
+
 module.exports = EE;

package/electron/app/index.js

@@ -1,58 +1,64 @@
-const { app } = require('electron');
-const EE = require('../../ee');
-const Log = require('../../log');
-const Electron = require('../index');
-const UtilsIs = require('../../utils/is');
-const Cross = require('../../cross');
-
-/**
- * CoreElectronApp (框架封装的electron app对象)
- */
-const CoreElectronApp = {
-
-  /**
-   * 创建electron应用
-   */
-  async create() {
-    const { CoreApp } = EE;
-
-    const gotTheLock = app.requestSingleInstanceLock();
-    if (!gotTheLock) {
-      app.quit();
-      return;
-    }
-  
-    app.whenReady().then(() => {
-      CoreApp.createWindow();
-    })
-    
-    app.on('window-all-closed', () => {
-      if (!UtilsIs.macOS()) {
-        Log.coreLogger.info('[ee-core] [lib/eeApp] window-all-closed quit');
-        CoreApp.appQuit();
-      }
-    })
-
-    app.on('before-quit', () => {
-      Electron.extra.closeWindow = true;
-
-      // kill cross services
-      Cross.killAll();
-    })
-
-    if (CoreApp.config.hardGpu.enable == false) {
-      app.disableHardwareAcceleration();
-    }
-
-    return app;
-  },
-
-  /**
-   * 退出app
-   */
-  quit() {
-    app.quit();
-  }
-}
-
-module.exports = CoreElectronApp;
+const { app } = require('electron');
+const EE = require('../../ee');
+const Log = require('../../log');
+const Electron = require('../index');
+const UtilsIs = require('../../utils/is');
+const Cross = require('../../cross');
+const Window = require('../window');
+
+/**
+ * CoreElectronApp (框架封装的electron app对象)
+ */
+const CoreElectronApp = {
+
+  /**
+   * 创建electron应用
+   */
+  async create() {
+    const { CoreApp } = EE;
+
+    const gotTheLock = app.requestSingleInstanceLock();
+    if (!gotTheLock) {
+      app.quit();
+    }
+
+    app.whenReady().then(() => {
+      CoreApp.createWindow();
+    })
+
+    // 显示首次打开的窗口
+    app.on('second-instance', () => {
+      Log.coreLogger.info('[ee-core] [lib/eeApp] second-instance');
+      Window.restoreMainWindow();
+    });
+
+    app.on('window-all-closed', () => {
+      if (!UtilsIs.macOS()) {
+        Log.coreLogger.info('[ee-core] [lib/eeApp] window-all-closed quit');
+        CoreApp.appQuit();
+      }
+    })
+
+    app.on('before-quit', () => {
+      Electron.extra.closeWindow = true;
+
+      // kill cross services
+      Cross.killAll();
+    })
+
+    if (CoreApp.config.hardGpu.enable == false) {
+      app.disableHardwareAcceleration();
+    }
+
+    return app;
+  },
+
+  /**
+   * 退出app
+   */
+  quit() {
+    app.quit();
+  }
+}
+
+module.exports = CoreElectronApp;

package/electron/index.js

@@ -1,20 +1,20 @@
-const Window = require('./window');
-
-const Electron = {
-
-  /**
-   * 兼容1.x版本api
-   */
-  get mainWindow() {
-    return Window.getMainWindow();
-  },
-
-  /**
-   * extra
-   */
-  extra: {
-    closeWindow: false,
-  }, 
-};
-
+const Window = require('./window');
+
+const Electron = {
+
+  /**
+   * 兼容1.x版本api
+   */
+  get mainWindow() {
+    return Window.getMainWindow();
+  },
+
+  /**
+   * extra
+   */
+  extra: {
+    closeWindow: false,
+  }, 
+};
+
 module.exports = Electron;

package/electron/window/index.js

@@ -1,74 +1,74 @@
-const is = require('is-type-of');
-const { BrowserWindow, Menu } = require('electron');
-const Conf = require('../../config');
-const Ps = require('../../ps');
-const EEMainWindow = Symbol('Ee#electron#mainWindow');
-
-const Window = {
-
-  /**
-   * 获取 mainWindow
-   */
-  getMainWindow() {
-    if (!this[EEMainWindow]) {
-      this[EEMainWindow] = this.createMainWindow();
-    }
-
-    return this[EEMainWindow] || null;
-  },
-
-  /**
-   * 创建应用主窗口
-   */
-  createMainWindow() {
-
-    // todo
-    // const protocolName = 'eefile';
-    // protocol.registerFileProtocol(protocolName, (request, callback) => {
-    //   const url = request.url.substring(protocolName.length + 3);
-    //   console.log('[ee-core] [lib/eeApp] registerFileProtocol ----url: ', url);
-    //   callback({ path: path.normalize(decodeURIComponent(url)) })
-    // });
-
-    const config = Conf.all();
-    const win = new BrowserWindow(config.windowsOption);
-    this[EEMainWindow] = win;
-
-    // 菜单显示/隐藏
-    if (config.openAppMenu === 'dev-show' && Ps.isProd()) {
-      Menu.setApplicationMenu(null);
-    } else if (config.openAppMenu === false) {
-      Menu.setApplicationMenu(null);
-    } else {
-      // nothing 
-    }
-
-    // DevTools
-    if (is.object(config.openDevTools)) {
-      win.webContents.openDevTools(config.openDevTools);
-    } else if (config.openDevTools === true) {
-      win.webContents.openDevTools({
-        mode: 'undocked'
-      });
-    } else {
-      //
-    }
-    
-    return win;
-  },
-
-  /**
-   * 还原窗口
-   */
-  restoreMainWindow() {
-    if (this[EEMainWindow]) {
-      if (this[EEMainWindow].isMinimized()) {
-        this[EEMainWindow].restore();
-      }
-      this[EEMainWindow].show();
-      this[EEMainWindow].focus();
-    }
-  }
-};
-
+const is = require('is-type-of');
+const { BrowserWindow, Menu } = require('electron');
+const Conf = require('../../config/cache');
+const Ps = require('../../ps');
+const EEMainWindow = Symbol('Ee#electron#mainWindow');
+
+const Window = {
+
+  /**
+   * 获取 mainWindow
+   */
+  getMainWindow() {
+    if (!this[EEMainWindow]) {
+      this[EEMainWindow] = this.createMainWindow();
+    }
+
+    return this[EEMainWindow] || null;
+  },
+
+  /**
+   * 创建应用主窗口
+   */
+  createMainWindow() {
+
+    // todo
+    // const protocolName = 'eefile';
+    // protocol.registerFileProtocol(protocolName, (request, callback) => {
+    //   const url = request.url.substring(protocolName.length + 3);
+    //   console.log('[ee-core] [lib/eeApp] registerFileProtocol ----url: ', url);
+    //   callback({ path: path.normalize(decodeURIComponent(url)) })
+    // });
+
+    const config = Conf.all();
+    const win = new BrowserWindow(config.windowsOption);
+    this[EEMainWindow] = win;
+
+    // 菜单显示/隐藏
+    if (config.openAppMenu === 'dev-show' && Ps.isProd()) {
+      Menu.setApplicationMenu(null);
+    } else if (config.openAppMenu === false) {
+      Menu.setApplicationMenu(null);
+    } else {
+      // nothing 
+    }
+
+    // DevTools
+    if (is.object(config.openDevTools)) {
+      win.webContents.openDevTools(config.openDevTools);
+    } else if (config.openDevTools === true) {
+      win.webContents.openDevTools({
+        mode: 'undocked'
+      });
+    } else {
+      //
+    }
+    
+    return win;
+  },
+
+  /**
+   * 还原窗口
+   */
+  restoreMainWindow() {
+    if (this[EEMainWindow]) {
+      if (this[EEMainWindow].isMinimized()) {
+        this[EEMainWindow].restore();
+      }
+      this[EEMainWindow].show();
+      this[EEMainWindow].focus();
+    }
+  }
+};
+
 module.exports = Window;