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

Fix: 修复在线版下上传后无法操作界面

Browse Source
This commit is contained in:
王立帮
2025-01-24 11:56:24 +08:00
parent 09ab1af101
commit d310a5200b
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/modules/mixly-modules/electron/burn-upload.js
View File

@@ -253,7 +253,7 @@ BU.initWithDropdownBox = function (type, startPath) {
}, },
end: function () { end: function () {
$('#mixly-loader-div').css('display', 'none'); $('#mixly-loader-div').css('display', 'none');
$("#layui-layer-shade" + layerNum).remove(); $(`#layui-layer-shade${layerNum}`).remove();
} }
}); });
} }

18
common/modules/mixly-modules/web/burn-upload.js
View File

@@ -423,7 +423,7 @@ BU.burnWithAdafruitEsptool = async (binFile, erase) => {
statusBarTerminal.addValue("Done!\n"); statusBarTerminal.addValue("Done!\n");
BU.burning = true; BU.burning = true;
BU.uploading = false; BU.uploading = false;
layer.open({ const layerNum = layer.open({
type: 1, type: 1,
title: Msg.Lang['shell.burning'] + '...', title: Msg.Lang['shell.burning'] + '...',
content: $('#mixly-loader-div'), content: $('#mixly-loader-div'),
@@ -462,6 +462,9 @@ BU.burnWithAdafruitEsptool = async (binFile, erase) => {
await espStub.port.close(); await espStub.port.close();
} }
} }
},
end: function () {
$(`#layui-layer-shade${layerNum}`).remove();
} }
}); });
} }
@@ -595,7 +598,7 @@ BU.uploadByUSB = async (portName) => {
const data = goog.get(importsMap[key]['__path__']); const data = goog.get(importsMap[key]['__path__']);
FSWrapper.writeFile(filename, data); FSWrapper.writeFile(filename, data);
} }
layer.open({ const layerNum = layer.open({
type: 1, type: 1,
title: Msg.Lang['shell.uploading'] + '...', title: Msg.Lang['shell.uploading'] + '...',
content: $('#mixly-loader-div'), content: $('#mixly-loader-div'),
@@ -641,6 +644,7 @@ BU.uploadByUSB = async (portName) => {
end: function () { end: function () {
$('#mixly-loader-btn').css('display', 'inline-block'); $('#mixly-loader-btn').css('display', 'inline-block');
$('#mixly-loader-div').css('display', 'none'); $('#mixly-loader-div').css('display', 'none');
$(`#layui-layer-shade${layerNum}`).remove();
} }
}); });
} }
@@ -662,7 +666,7 @@ BU.uploadWithAmpy = (portName) => {
} else if (Serial.type === 'hid') { } else if (Serial.type === 'hid') {
dataLength = 31; dataLength = 31;
} }
layer.open({ const layerNum = layer.open({
type: 1, type: 1,
title: Msg.Lang['shell.uploading'] + '...', title: Msg.Lang['shell.uploading'] + '...',
content: $('#mixly-loader-div'), content: $('#mixly-loader-div'),
@@ -735,6 +739,7 @@ BU.uploadWithAmpy = (portName) => {
end: function () { end: function () {
$('#mixly-loader-btn').css('display', 'inline-block'); $('#mixly-loader-btn').css('display', 'inline-block');
$('#mixly-loader-div').css('display', 'none'); $('#mixly-loader-div').css('display', 'none');
$(`#layui-layer-shade${layerNum}`).remove();
} }
}); });
} }
@@ -861,13 +866,13 @@ BU.burnWithSpecialBin = () => {
}); });
firmwareMap[firmware.name] = firmware.binFile; firmwareMap[firmware.name] = firmware.binFile;
} }
LayerExt.open({ const layerNum = LayerExt.open({
title: [Msg.Lang['nav.btn.burn'], '36px'], title: [Msg.Lang['nav.btn.burn'], '36px'],
area: ['400px', '160px'], area: ['400px', '160px'],
max: false, max: false,
min: false, min: false,
content: BU.FILMWARE_LAYER, content: BU.FILMWARE_LAYER,
shade: Mixly.LayerExt.SHADE_ALL, shade: LayerExt.SHADE_ALL,
resize: false, resize: false,
success: function (layero, index) { success: function (layero, index) {
const $select = layero.find('select'); const $select = layero.find('select');
@@ -898,6 +903,9 @@ BU.burnWithSpecialBin = () => {
beforeEnd: function (layero) { beforeEnd: function (layero) {
layero.find('select').select2('destroy'); layero.find('select').select2('destroy');
layero.find('button').off(); layero.find('button').off();
},
end: function () {
$(`#layui-layer-shade${layerNum}`).remove();
} }
}); });
} }