diff --git a/cmd b/cmd index 551598b01..fcc3f0799 100755 --- a/cmd +++ b/cmd @@ -96,13 +96,13 @@ run_electron() { if [ -d "./electron/dist" ]; then rm -rf "./electron/dist" fi - if [ -d "./electron/public" ]; then + if [ -d "./electron/public" ] && [ "$argv" != "--nobuild" ]; then rm -rf "./electron/public" fi mkdir -p ./electron/public cp ./electron/index.html ./electron/public/index.html # - if [ "$argv" != "dev" ]; then + if [ "$argv" != "dev" ] && [ "$argv" != "--nobuild" ]; then npx mix --production -- --env --electron fi node ./electron/build.js $argv diff --git a/electron/build.js b/electron/build.js index 328bad5a8..05ba3dbf7 100644 --- a/electron/build.js +++ b/electron/build.js @@ -106,12 +106,13 @@ const platform = ["build-mac", "build-mac-arm", "build-win"]; // 生成配置、编译应用 function step1(data, publish) { - let systemInfo = `window.systemInformation = { - version: "${config.version}", - origin: "./", - apiUrl: "${formatUrl(data.url)}api/" -}`; - fs.writeFileSync(electronDir + "/config.js", systemInfo, 'utf8'); + let systemInfo = { + title: data.name, + version: config.version, + origin: "./", + apiUrl: formatUrl(data.url) + "api/", + } + fs.writeFileSync(electronDir + "/config.js", "window.systemInformation = " + JSON.stringify(systemInfo), 'utf8'); fs.writeFileSync(nativeCachePath, formatUrl(data.url)); fs.writeFileSync(devloadCachePath, "", 'utf8'); // diff --git a/electron/index.html b/electron/index.html index 8e3ab8a6d..0128ca856 100644 --- a/electron/index.html +++ b/electron/index.html @@ -9,12 +9,68 @@ - Dootask + +