Fix: 修复nwjs打包后板卡页面载入异常
This commit is contained in:
@@ -62,7 +62,7 @@ Config.init = () => {
|
||||
|
||||
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;
|
||||
|
||||
Env.hasSocketServer = Config.SOFTWARE?.webSocket?.enabled ? true : false;
|
||||
|
||||
@@ -59,7 +59,7 @@ class EditorBlockly extends EditorBase {
|
||||
this.workspace = null;
|
||||
this.initBlockly = () => {
|
||||
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';
|
||||
this.editor = Blockly.inject(this.$blockly[0], {
|
||||
media,
|
||||
|
||||
@@ -13,7 +13,7 @@ const {
|
||||
Msg
|
||||
} = Mixly;
|
||||
|
||||
const { BOARD } = Config;
|
||||
const { SELECTED_BOARD } = Config;
|
||||
|
||||
|
||||
class Serial {
|
||||
@@ -43,7 +43,7 @@ class Serial {
|
||||
}
|
||||
|
||||
this.getConfig = function () {
|
||||
let config = BOARD?.serial ?? {};
|
||||
let config = SELECTED_BOARD?.serial ?? {};
|
||||
return {
|
||||
...this.DEFAULT_CONFIG,
|
||||
...config
|
||||
|
||||
Reference in New Issue
Block a user