ee-core 1.1.2 → 1.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/eeApp.js +4 -8
- package/package.json +1 -2
package/lib/eeApp.js
CHANGED
|
@@ -82,7 +82,7 @@ class EeApp extends BaseApp {
|
|
|
82
82
|
this.electron.mainWindow = new BrowserWindow(winOptions);
|
|
83
83
|
|
|
84
84
|
// 隐藏菜单
|
|
85
|
-
if (this.config.openAppMenu) {
|
|
85
|
+
if (!this.config.openAppMenu) {
|
|
86
86
|
Menu.setApplicationMenu(null);
|
|
87
87
|
}
|
|
88
88
|
|
|
@@ -234,7 +234,6 @@ class EeApp extends BaseApp {
|
|
|
234
234
|
* egg
|
|
235
235
|
*/
|
|
236
236
|
startEgg (argv) {
|
|
237
|
-
const startCluster = require('egg-cluster').startCluster;
|
|
238
237
|
|
|
239
238
|
let homeDir = this.homeDir;
|
|
240
239
|
argv.baseDir = homeDir;
|
|
@@ -256,12 +255,9 @@ class EeApp extends BaseApp {
|
|
|
256
255
|
const clusterOptions = this.stringify(argv, ignoreKeys);
|
|
257
256
|
const options = JSON.parse(clusterOptions);
|
|
258
257
|
this.coreLogger.info('[ee-core:EeApp] [startEgg] options', options);
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
resolve('success');
|
|
263
|
-
});
|
|
264
|
-
});
|
|
258
|
+
if (is.function(this.startEggCluster)) {
|
|
259
|
+
return this.startEggCluster(options);
|
|
260
|
+
}
|
|
265
261
|
}
|
|
266
262
|
|
|
267
263
|
/**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ee-core",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.3",
|
|
4
4
|
"description": "ee core",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -13,7 +13,6 @@
|
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"agentkeepalive": "^4.2.0",
|
|
16
|
-
"egg-cluster": "^1.27.1",
|
|
17
16
|
"egg-errors": "^2.3.0",
|
|
18
17
|
"egg-logger": "^2.7.1",
|
|
19
18
|
"electron-is": "^3.0.0",
|