gaoshuaixing 2 年之前
父节点
当前提交
e674a7fe86
共有 11 个文件被更改,包括 52 次插入8 次删除
  1. 二进制
      build/icons/128x128.png
  2. 二进制
      build/icons/16x16.png
  3. 二进制
      build/icons/48x48.png
  4. 二进制
      build/icons/icon.icns
  5. 二进制
      build/icons/icon.png
  6. 23 1
      electron/config/bin.js
  7. 11 3
      electron/config/config.default.js
  8. 7 0
      electron/config/config.local.js
  9. 7 0
      electron/config/config.prod.js
  10. 1 1
      frontend/index.html
  11. 3 3
      package.json

二进制
build/icons/128x128.png


二进制
build/icons/16x16.png


二进制
build/icons/48x48.png


二进制
build/icons/icon.icns


二进制
build/icons/icon.png


+ 23 - 1
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'],
+    },
+  },  
 };

+ 11 - 3
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
   };  
 
   /**

+ 7 - 0
electron/config/config.local.js

@@ -18,6 +18,13 @@ module.exports = (appInfo) => {
    */
   config.openAppMenu = true;
 
+  /**
+   * jobs
+   */
+  config.jobs = {
+    messageLog: true
+  };   
+
   return {
     ...config
   };

+ 7 - 0
electron/config/config.prod.js

@@ -16,6 +16,13 @@ module.exports = (appInfo) => {
    */
   config.openAppMenu = false;
 
+  /**
+   * jobs
+   */
+  config.jobs = {
+    messageLog: false
+  }; 
+
   return {
     ...config
   };

+ 1 - 1
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;

+ 3 - 3
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"
   }