diff --git a/build/icons/128x128.png b/build/icons/128x128.png new file mode 100644 index 0000000..56b37e1 Binary files /dev/null and b/build/icons/128x128.png differ diff --git a/build/icons/16x16.png b/build/icons/16x16.png new file mode 100644 index 0000000..fc40055 Binary files /dev/null and b/build/icons/16x16.png differ diff --git a/build/icons/48x48.png b/build/icons/48x48.png new file mode 100644 index 0000000..a85fc93 Binary files /dev/null and b/build/icons/48x48.png differ diff --git a/build/icons/icon.icns b/build/icons/icon.icns new file mode 100644 index 0000000..aa79460 Binary files /dev/null and b/build/icons/icon.icns differ diff --git a/build/icons/icon.png b/build/icons/icon.png new file mode 100644 index 0000000..df48e85 Binary files /dev/null and b/build/icons/icon.png differ diff --git a/electron/config/bin.js b/electron/config/bin.js index 45c22ca..6af78e8 100644 --- a/electron/config/bin.js +++ b/electron/config/bin.js @@ -72,5 +72,27 @@ module.exports = { stringArrayEncoding: ['none'], deadCodeInjection: false, } - } + }, + + /** + * 执行自定义命令 + * ee-bin exec + */ + exec: { + go: { + directory: './go', + cmd: 'go', + args: ['run', './main.go', '--env=dev'], + }, + node_version: { + directory: './', + cmd: 'node', + args: ['-v'], + }, + npm_version: { + directory: './', + cmd: 'npm', + args: ['-v'], + }, + }, }; \ No newline at end of file diff --git a/electron/config/config.default.js b/electron/config/config.default.js index 961f3e1..9f8c89f 100644 --- a/electron/config/config.default.js +++ b/electron/config/config.default.js @@ -26,8 +26,8 @@ module.exports = (appInfo) => { title: 'EE框架', width: 980, height: 650, - minWidth: 800, - minHeight: 650, + minWidth: 400, + minHeight: 300, webPreferences: { webSecurity: false, contextIsolation: false, // false -> 可在渲染进程中使用electron的api,true->需要bridge.js(contextBridge) @@ -89,6 +89,7 @@ module.exports = (appInfo) => { key: '/public/ssl/localhost+1.key', cert: '/public/ssl/localhost+1.pem' }, + host: '127.0.0.1', port: 7071, cors: { origin: "*" @@ -113,7 +114,7 @@ module.exports = (appInfo) => { config.mainServer = { protocol: 'file://', indexPath: '/public/dist/index.html', - host: 'localhost', + host: '127.0.0.1', port: 7072, }; @@ -131,6 +132,13 @@ module.exports = (appInfo) => { mainExit: false, childExit: true, rendererExit: true, + }; + + /** + * jobs + */ + config.jobs = { + messageLog: true }; /** diff --git a/electron/config/config.local.js b/electron/config/config.local.js index 9b63737..69938ca 100644 --- a/electron/config/config.local.js +++ b/electron/config/config.local.js @@ -18,6 +18,13 @@ module.exports = (appInfo) => { */ config.openAppMenu = true; + /** + * jobs + */ + config.jobs = { + messageLog: true + }; + return { ...config }; diff --git a/electron/config/config.prod.js b/electron/config/config.prod.js index d8e68e1..5c5218d 100644 --- a/electron/config/config.prod.js +++ b/electron/config/config.prod.js @@ -16,6 +16,13 @@ module.exports = (appInfo) => { */ config.openAppMenu = false; + /** + * jobs + */ + config.jobs = { + messageLog: false + }; + return { ...config }; diff --git a/frontend/index.html b/frontend/index.html index 42ae824..c0b96bd 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -17,7 +17,7 @@ margin: -7.5em; padding: 3em; position: absolute; - top: 40%; + top: 50%; width: 9em; transform: rotateX(45deg) rotateZ(45deg); transform-style: preserve-3d; diff --git a/package.json b/package.json index c2ed34d..63709e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ee", - "version": "3.7.0", + "version": "3.8.0", "description": "A fast, desktop software development framework", "main": "main.js", "scripts": { @@ -46,7 +46,7 @@ "devDependencies": { "@electron/rebuild": "^3.2.13", "debug": "^4.3.3", - "ee-bin": "^1.2.0", + "ee-bin": "^1.3.0", "electron": "^21.4.4", "electron-builder": "^23.6.0", "eslint": "^5.13.0", @@ -55,7 +55,7 @@ }, "dependencies": { "dayjs": "^1.10.7", - "ee-core": "^2.5.0", + "ee-core": "^2.6.0", "electron-updater": "^5.3.0", "lodash": "^4.17.21" }