From 09d95806d00a553a3fcd3e4a03151159939b6c84 Mon Sep 17 00:00:00 2001 From: gaoshuaixing Date: Mon, 9 Oct 2023 18:59:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=EF=BC=88=E5=A4=9A?= =?UTF-8?q?=EF=BC=89=E5=91=BD=E4=BB=A4=EF=BC=8Cjobs=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron/config/bin.js | 10 ++++++++++ electron/config/config.default.js | 7 +++++++ electron/config/config.local.js | 7 +++++++ electron/config/config.prod.js | 7 +++++++ electron/controller/framework.js | 2 ++ package.json | 1 + 6 files changed, 34 insertions(+) diff --git a/electron/config/bin.js b/electron/config/bin.js index 6ef6541..6af78e8 100644 --- a/electron/config/bin.js +++ b/electron/config/bin.js @@ -84,5 +84,15 @@ module.exports = { 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 c2c229b..be57281 100644 --- a/electron/config/config.default.js +++ b/electron/config/config.default.js @@ -132,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 cc58f5b..2ed9b61 100644 --- a/electron/config/config.prod.js +++ b/electron/config/config.prod.js @@ -18,6 +18,13 @@ module.exports = (appInfo) => { */ config.openAppMenu = false; + /** + * jobs + */ + config.jobs = { + messageLog: false + }; + return { ...config }; diff --git a/electron/controller/framework.js b/electron/controller/framework.js index c60993c..91de22c 100644 --- a/electron/controller/framework.js +++ b/electron/controller/framework.js @@ -241,6 +241,8 @@ class FrameworkController extends Controller { /** * 上传文件 + * 不建议使用,请使用electron的api来获取文件的本机路径,然后读取并上传 + * 使用http的files属性,实际上多余拷贝一次文件 */ async uploadFile() { const { CoreApp } = EE; diff --git a/package.json b/package.json index fbe34e9..06419d5 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "dev-frontend": "ee-bin dev --serve=frontend", "dev-electron": "ee-bin dev --serve=electron", "dev-go": "ee-bin exec --command=go", + "dev-cmd": "ee-bin exec --command=node_version,npm_version", "build-frontend": "ee-bin build", "start": "ee-bin start", "rd": "ee-bin rd",