18069996051/mixly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: 修复nwjs打包后板卡页面载入异常

Browse Source
This commit is contained in:
王立帮
2025-02-24 23:10:39 +08:00
parent 8699cf26d7
commit 9eb5e500fe
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/main.js
View File

@@ -123,6 +123,8 @@ LazyLoad.js([
const path = require('path'); const path = require('path');
if (inPath.indexOf(window.location.origin) !== -1) { if (inPath.indexOf(window.location.origin) !== -1) {
inPath = inPath.replace(window.location.origin, nw.__dirname); inPath = inPath.replace(window.location.origin, nw.__dirname);
} else if (!inPath.indexOf('/')) {
inPath = path.resolve(nw.__dirname, './' + inPath);
} else { } else {
let dirPath; let dirPath;
if (fs.existsSync(nw.__filename) && fs.statSync(nw.__filename).isFile()) { if (fs.existsSync(nw.__filename) && fs.statSync(nw.__filename).isFile()) {

2
common/modules/mixly-modules/common/config.js
View File

@@ -62,7 +62,7 @@ Config.init = () => {
let pathPrefix = '../'; let pathPrefix = '../';
Config.SOFTWARE = goog.getJSON(path.join(pathPrefix, 'sw-config.json'), SOFTWARE_DEFAULT_CONFIG); Config.SOFTWARE = goog.getJSON(path.join(Env.srcDirPath, 'sw-config.json'), SOFTWARE_DEFAULT_CONFIG);
Config.pathPrefix = pathPrefix; Config.pathPrefix = pathPrefix;
Env.hasSocketServer = Config.SOFTWARE?.webSocket?.enabled ? true : false; Env.hasSocketServer = Config.SOFTWARE?.webSocket?.enabled ? true : false;

2
common/modules/mixly-modules/common/editor-blockly.js
View File

@@ -59,7 +59,7 @@ class EditorBlockly extends EditorBase {
this.workspace = null; this.workspace = null;
this.initBlockly = () => { this.initBlockly = () => {
const DEFAULT_CATEGORIES = HTMLTemplate.get('xml/default-categories.xml').render(); const DEFAULT_CATEGORIES = HTMLTemplate.get('xml/default-categories.xml').render();
const media = path.join(Config.pathPrefix, 'common/media/'); const media = path.join(Env.srcDirPath, 'common/media/');
const renderer = ['geras', 'zelos'].includes(USER.blockRenderer) ? USER.blockRenderer : 'geras'; const renderer = ['geras', 'zelos'].includes(USER.blockRenderer) ? USER.blockRenderer : 'geras';
this.editor = Blockly.inject(this.$blockly[0], { this.editor = Blockly.inject(this.$blockly[0], {
media, media,

4
common/modules/mixly-modules/common/serial.js
View File

@@ -13,7 +13,7 @@ const {
Msg Msg
} = Mixly; } = Mixly;
const { BOARD } = Config; const { SELECTED_BOARD } = Config;
class Serial { class Serial {
@@ -43,7 +43,7 @@ class Serial {
} }
this.getConfig = function () { this.getConfig = function () {
let config = BOARD?.serial ?? {}; let config = SELECTED_BOARD?.serial ?? {};
return { return {
...this.DEFAULT_CONFIG, ...this.DEFAULT_CONFIG,
...config ...config

2
common/modules/mixly-modules/electron/loader.js
View File

@@ -32,7 +32,7 @@ Loader.onbeforeunload = function(reload = false) {
window.location.reload(true); window.location.reload(true);
} }
} }
let href = Config.pathPrefix + 'index.html?' + Url.jsonToUrl({ boardType: BOARD.boardType ?? 'None' }); let href = Env.srcDirPath + '/index.html?' + Url.jsonToUrl({ boardType: BOARD.boardType ?? 'None' });
let endPromise = []; let endPromise = [];
const { mainStatusBarTabs } = Mixly; const { mainStatusBarTabs } = Mixly;
Serial.getCurrentPortsName().map((name) => { Serial.getCurrentPortsName().map((name) => {