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

feat(core): 将一些progress layer从layui调整为dialog-plus

Browse Source
This commit is contained in:
王立帮
2025-04-27 21:40:00 +08:00
parent 3934c819c5
commit c5027cac8c
7 changed files with 343 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

213
common/modules/mixly-modules/electron/arduino-shell.js
View File

@@ -14,6 +14,8 @@ goog.require('Mixly.Msg');
goog.require('Mixly.MString');
goog.require('Mixly.Workspace');
goog.require('Mixly.Serial');
goog.require('Mixly.LayerProgress');
goog.require('Mixly.Debug');
goog.require('Mixly.Electron.Shell');
goog.provide('Mixly.Electron.ArduShell');
@@ -21,6 +23,7 @@ const {
Env,
Electron,
LayerExt,
Config,
Title,
Boards,
MFile,
@@ -29,7 +32,8 @@ const {
MString,
Workspace,
Serial,
Config
LayerProgress,
Debug
} = Mixly;
const { BOARD, SOFTWARE, USER } = Config;
@@ -46,14 +50,29 @@ const {
} = Electron;
ArduShell.DEFAULT_CONFIG = goog.readJsonSync(path.join(Env.templatePath, 'json/arduino-cli-config.json'));
ArduShell.binFilePath = '';
ArduShell.shellPath = null;
ArduShell.shell = null;
ArduShell.ERROR_ENCODING = Env.currentPlatform == 'win32' ? 'cp936' : 'utf-8';
ArduShell.binFilePath = '';
ArduShell.shellPath = null;
ArduShell.shell = null;
ArduShell.compiling = false;
ArduShell.uploading = false;
ArduShell.killing = false;
ArduShell.progressLayer = new LayerProgress({
width: 200,
cancelValue: Msg.Lang['nav.btn.stop'],
skin: 'layui-anim layui-anim-scale',
cancel: () => {
if (ArduShell.killing) {
return false;
}
ArduShell.progressLayer.title(`${Msg.Lang['shell.aborting']}...`);
ArduShell.killing = true;
ArduShell.cancel();
return false;
},
cancelDisplay: false
});
ArduShell.updateShellPath = () => {
let shellPath = path.join(Env.clientPath, 'arduino-cli');
@@ -143,32 +162,12 @@ ArduShell.compile = (doFunc = () => {}) => {
const code = editor.getCode();
ArduShell.compiling = true;
ArduShell.uploading = false;
ArduShell.killing = false;
const boardType = Boards.getSelectedBoardCommandParam();
mainStatusBarTabs.show();
const layerNum = layer.open({
type: 1,
title: Msg.Lang['shell.compiling'] + "...",
content: $('#mixly-loader-div'),
shade: LayerExt.SHADE_NAV,
resize: false,
closeBtn: 0,
success: () => {
$(".layui-layer-page").css("z-index", "198910151");
$("#mixly-loader-btn").off("click").click(() => {
$("#mixly-loader-btn").css('display', 'none');
layer.title(Msg.Lang['shell.aborting'] + '...', layerNum);
ArduShell.cancel();
});
},
end: () => {
$('#mixly-loader-div').css('display', 'none');
$("layui-layer-shade" + layerNum).remove();
$("#mixly-loader-btn").off("click");
$("#mixly-loader-btn").css('display', 'inline-block');
}
});
ArduShell.progressLayer.title(`${Msg.Lang['shell.compiling']}...`);
ArduShell.progressLayer.show();
statusBarTerminal.setValue(Msg.Lang['shell.compiling'] + "...\n");
let myLibPath = path.join(Env.boardDirPath, "/libraries/myLib/");
if (fs_plus.isDirectorySync(myLibPath))
myLibPath += '\",\"';
@@ -202,7 +201,7 @@ ArduShell.compile = (doFunc = () => {}) => {
+ '\" \"'
+ codePath
+ '\" --no-color';
ArduShell.runCmd(layerNum, 'compile', cmdStr, code, doFunc);
ArduShell.runCmd('compile', cmdStr, code, doFunc);
}
/**
@@ -214,6 +213,7 @@ ArduShell.initUpload = () => {
const { mainStatusBarTabs } = Mixly;
ArduShell.compiling = false;
ArduShell.uploading = true;
ArduShell.killing = false;
const boardType = Boards.getSelectedBoardCommandParam();
const uploadType = Boards.getSelectedBoardConfigParam('upload_method');
let port = Serial.getSelectedPortName();
@@ -256,28 +256,7 @@ ArduShell.upload = (boardType, port) => {
const mainWorkspace = Workspace.getMain();
const editor = mainWorkspace.getEditorsManager().getActive();
const code = editor.getCode();
const layerNum = layer.open({
type: 1,
title: Msg.Lang['shell.uploading'] + "...",
content: $('#mixly-loader-div'),
shade: LayerExt.SHADE_NAV,
resize: false,
closeBtn: 0,
success: function () {
$(".layui-layer-page").css("z-index", "198910151");
$("#mixly-loader-btn").off("click").click(() => {
$("#mixly-loader-btn").css('display', 'none');
layer.title(Msg.Lang['shell.aborting'] + '...', layerNum);
ArduShell.cancel();
});
},
end: function () {
$('#mixly-loader-div').css('display', 'none');
$("layui-layer-shade" + layerNum).remove();
$("#mixly-loader-btn").off("click");
$("#mixly-loader-btn").css('display', 'inline-block');
}
});
ArduShell.progressLayer.title(`${Msg.Lang['shell.uploading']}...`);
mainStatusBarTabs.show();
statusBarTerminal.setValue(Msg.Lang['shell.uploading'] + "...\n");
const configPath = path.join(ArduShell.shellPath, '../arduino-cli.json'),
@@ -331,7 +310,7 @@ ArduShell.upload = (boardType, port) => {
+ codePath
+ '\" --no-color';
}
ArduShell.runCmd(layerNum, 'upload', cmdStr, code, () => {
ArduShell.runCmd('upload', cmdStr, code, () => {
if (!Serial.portIsLegal(port)) {
return;
}
@@ -480,7 +459,7 @@ ArduShell.writeLibFiles = (inPath) => {
* @param cmd {String} 输入的cmd命令
* @return void
*/
ArduShell.runCmd = (layerNum, type, cmd, code, sucFunc) => {
ArduShell.runCmd = (type, cmd, code, sucFunc) => {
const { mainStatusBarTabs } = Mixly;
const statusBarTerminal = mainStatusBarTabs.getStatusBarById('output');
const testArduinoDirPath = path.join(Env.clientPath, 'testArduino');
@@ -500,7 +479,7 @@ ArduShell.runCmd = (layerNum, type, cmd, code, sucFunc) => {
return ArduShell.shell.exec(cmd);
})
.then((info) => {
layer.close(layerNum);
ArduShell.progressLayer.hide();
let message = '';
if (info.code) {
message = (type === 'compile' ? Msg.Lang['shell.compileFailed'] : Msg.Lang['shell.uploadFailed']);
@@ -513,8 +492,8 @@ ArduShell.runCmd = (layerNum, type, cmd, code, sucFunc) => {
layer.msg(message, { time: 1000 });
})
.catch((error) => {
layer.close(layerNum);
console.log(error);
ArduShell.progressLayer.hide();
Debug.error(error);
})
.finally(() => {
statusBarTerminal.scrollToBottom();
@@ -530,74 +509,56 @@ ArduShell.writeFile = function (readPath, writePath) {
const statusBarTerminal = mainStatusBarTabs.getStatusBarById('output');
ArduShell.compile(function () {
window.setTimeout(function () {
const layerNum = layer.open({
type: 1,
title: Msg.Lang['shell.saving'] + '...',
content: $('#mixly-loader-div'),
shade: LayerExt.SHADE_ALL,
resize: false,
closeBtn: 0,
success: function () {
$(".layui-layer-page").css("z-index", "198910151");
$("#mixly-loader-btn").off("click").click(() => {
layer.close(layerNum);
ArduShell.cancel();
});
window.setTimeout(function () {
try {
readPath = readPath.replace(/\\/g, "/");
writePath = writePath.replace(/\\/g, "/");
} catch (e) {
console.log(e);
}
try {
let writeDirPath = writePath.substring(0, writePath.lastIndexOf("."));
let writeFileName = writePath.substring(writePath.lastIndexOf("/") + 1, writePath.lastIndexOf("."));
let writeFileType = writePath.substring(writePath.lastIndexOf(".") + 1);
if (!fs.existsSync(writeDirPath)) {
fs.mkdirSync(writeDirPath);
}
if (fs.existsSync(writePath)) {
fs.unlinkSync(writePath);
}
let readBinFilePath = readPath + "/testArduino.ino." + writeFileType;
let binFileData = fs.readFileSync(readBinFilePath);
fs.writeFileSync(writePath, binFileData);
let binFileType = [
".eep",
".hex",
".with_bootloader.bin",
".with_bootloader.hex",
".bin",
".elf",
".map",
".partitions.bin",
".bootloader.bin"
]
for (let i = 0; i < binFileType.length; i++) {
let readFilePath = readPath + "/testArduino.ino" + binFileType[i];
let writeFilePath = writeDirPath + "/" + writeFileName + binFileType[i];
if (fs.existsSync(readFilePath)) {
let binData = fs.readFileSync(readFilePath);
fs.writeFileSync(writeFilePath, binData);
}
}
layer.msg(Msg.Lang['shell.saveSucc'], {
time: 1000
});
} catch (e) {
console.log(e);
statusBarTerminal.addValue(e + "\n");
}
layer.close(layerNum);
}, 500);
},
end: function () {
$('#mixly-loader-div').css('display', 'none');
$("layui-layer-shade" + layerNum).remove();
$("#mixly-loader-btn").off("click");
ArduShell.progressLayer.title(`${Msg.Lang['shell.saving']}...`);
ArduShell.progressLayer.show();
window.setTimeout(function () {
try {
readPath = readPath.replace(/\\/g, "/");
writePath = writePath.replace(/\\/g, "/");
} catch (error) {
Debug.error(error);
}
});
try {
let writeDirPath = writePath.substring(0, writePath.lastIndexOf("."));
let writeFileName = writePath.substring(writePath.lastIndexOf("/") + 1, writePath.lastIndexOf("."));
let writeFileType = writePath.substring(writePath.lastIndexOf(".") + 1);
if (!fs.existsSync(writeDirPath)) {
fs.mkdirSync(writeDirPath);
}
if (fs.existsSync(writePath)) {
fs.unlinkSync(writePath);
}
let readBinFilePath = readPath + "/testArduino.ino." + writeFileType;
let binFileData = fs.readFileSync(readBinFilePath);
fs.writeFileSync(writePath, binFileData);
let binFileType = [
".eep",
".hex",
".with_bootloader.bin",
".with_bootloader.hex",
".bin",
".elf",
".map",
".partitions.bin",
".bootloader.bin"
]
for (let i = 0; i < binFileType.length; i++) {
let readFilePath = readPath + "/testArduino.ino" + binFileType[i];
let writeFilePath = writeDirPath + "/" + writeFileName + binFileType[i];
if (fs.existsSync(readFilePath)) {
let binData = fs.readFileSync(readFilePath);
fs.writeFileSync(writeFilePath, binData);
}
}
layer.msg(Msg.Lang['shell.saveSucc'], {
time: 1000
});
} catch (error) {
Debug.error(error);
statusBarTerminal.addValue(e + "\n");
}
ArduShell.progressLayer.hide();
}, 500);
}, 1000);
});
}

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

@@ -11,6 +11,7 @@ goog.require('Mixly.Workspace');
goog.require('Mixly.Debug');
goog.require('Mixly.HTMLTemplate');
goog.require('Mixly.LayerFirmware');
goog.require('Mixly.LayerProgress');
goog.require('Mixly.Electron.Serial');
goog.provide('Mixly.Electron.BU');
@@ -26,7 +27,8 @@ const {
Serial,
Debug,
HTMLTemplate,
LayerFirmware
LayerFirmware,
LayerProgress
} = Mixly;
const { BU } = Electron;
@@ -66,6 +68,22 @@ BU.firmwareLayer.bind('burn', (info) => {
const port = Serial.getSelectedPortName();
BU.burnWithPort(port, info);
});
BU.killing = false;
BU.progressLayer = new LayerProgress({
width: 200,
cancelValue: Msg.Lang['nav.btn.stop'],
skin: 'layui-anim layui-anim-scale',
cancel: () => {
if (BU.killing) {
return false;
}
BU.progressLayer.title(`${Msg.Lang['shell.aborting']}...`);
BU.killing = true;
BU.cancel();
return false;
},
cancelDisplay: false
});
/**
* @function 根据传入的stdout判断磁盘数量并选择对应操作
@@ -173,11 +191,10 @@ BU.checkNumOfDisks = function (type, stdout, startPath) {
/**
* @function 将文件或文件夹下所有文件拷贝到指定文件夹
* @param type {string} 值为'burn' | 'upload'
* @param layerNum {number} 烧录或上传加载弹窗的编号，用于关闭此弹窗
* @param startPath {string} 需要拷贝的文件或文件夹的路径
* @param desPath {string} 文件的目的路径
**/
BU.copyFiles = (type, layerNum, startPath, desPath) => {
BU.copyFiles = async (type, startPath, desPath) => {
const { mainStatusBarTabs } = Mixly;
const statusBarTerminal = mainStatusBarTabs.getStatusBarById('output');
const { burn, upload } = SELECTED_BOARD;
@@ -193,9 +210,9 @@ BU.copyFiles = (type, layerNum, startPath, desPath) => {
if (fs_plus.isFileSync(startPath)) {
desPath = path.join(desPath, path.basename(startPath));
}
fs_extra.copy(startPath, desPath)
.then(() => {
layer.close(layerNum);
try {
await fs_extra.copy(startPath, desPath);
BU.progressLayer.hide();
const message = (type === 'burn'? Msg.Lang['shell.burnSucc'] : Msg.Lang['shell.uploadSucc']);
layer.msg(message, {
time: 1000
@@ -210,16 +227,14 @@ BU.copyFiles = (type, layerNum, startPath, desPath) => {
const statusBarSerial = mainStatusBarTabs.getStatusBarById(port);
statusBarSerial.open();
}
})
.catch((error) => {
layer.close(layerNum);
} catch (error) {
Debug.error(error);
BU.progressLayer.hide();
statusBarTerminal.setValue(error + '\n');
console.log(error);
})
.finally(() => {
BU.burning = false;
BU.uploading = false;
});
}
BU.burning = false;
BU.uploading = false;
}
/**
@@ -231,43 +246,32 @@ BU.copyFiles = (type, layerNum, startPath, desPath) => {
BU.initWithDropdownBox = function (type, startPath) {
const { mainStatusBarTabs } = Mixly;
const statusBarTerminal = mainStatusBarTabs.getStatusBarById('output');
const layerNum = layer.open({
type: 1,
title: (type === 'burn'? Msg.Lang['shell.burning'] : Msg.Lang['shell.uploading']) + '...',
content: $('#mixly-loader-div'),
shade: LayerExt.SHADE_ALL,
resize: false,
closeBtn: 0,
success: function (layero, index) {
$(".layui-layer-page").css("z-index","198910151");
$("#mixly-loader-btn").off("click").click(() => {
layer.close(index);
BU.cancel();
const message = (type === 'burn'? Msg.Lang['shell.burning'] : Msg.Lang['shell.uploading']);
BU.progressLayer.title(`${message}...`);
const desPath = $('#mixly-selector-type option:selected').val();
if (type === 'burn') {
BU.copyFiles(type, startPath, desPath)
.catch((error) => {
BU.progressLayer.hide();
BU.burning = false;
BU.uploading = false;
statusBarTerminal.setValue(error + '\n');
});
const desPath = $('#mixly-selector-type option:selected').val();
if (type === 'burn') {
BU.copyFiles(type, index, startPath, desPath);
} else {
const mainWorkspace = Workspace.getMain();
const editor = mainWorkspace.getEditorsManager().getActive();
const code = editor.getCode();
fs_extra.outputFile(startPath, code)
.then(() => {
BU.copyFiles(type, index, startPath, desPath);
})
.catch((error) => {
layer.close(index);
BU.burning = false;
BU.uploading = false;
statusBarTerminal.setValue(error + '\n');
});
}
},
end: function () {
$('#mixly-loader-div').css('display', 'none');
$(`#layui-layer-shade${layerNum}`).remove();
}
});
} else {
const mainWorkspace = Workspace.getMain();
const editor = mainWorkspace.getEditorsManager().getActive();
const code = editor.getCode();
fs_extra.outputFile(startPath, code)
.then(() => {
return BU.copyFiles(type, startPath, desPath);
})
.catch((error) => {
BU.progressLayer.hide();
BU.burning = false;
BU.uploading = false;
statusBarTerminal.setValue(error + '\n');
});
}
}
/**
@@ -506,26 +510,24 @@ BU.searchLibs = function (dirPath, code, libArr) {
/**
* @function 通过cmd烧录
* @param layerNum {number} 烧录或上传加载弹窗的编号，用于关闭此弹窗
* @param port {string} 所选择的串口
* @param command {string} 需要执行的指令
* @return {void}
*/
BU.burnByCmd = function (layerNum, port, command) {
BU.burnByCmd = function (port, command) {
const { mainStatusBarTabs } = Mixly;
const statusBarTerminal = mainStatusBarTabs.getStatusBarById('output');
statusBarTerminal.setValue(Msg.Lang['shell.burning'] + '...\n');
BU.runCmd(layerNum, 'burn', port, command);
BU.runCmd('burn', port, command);
}
/**
* @function 通过cmd上传
* @param layerNum {number} 烧录或上传加载弹窗的编号，用于关闭此弹窗
* @param port {string} 所选择的串口
* @param command {string} 需要执行的指令
* @return {void}
*/
BU.uploadByCmd = async function (layerNum, port, command) {
BU.uploadByCmd = async function (port, command) {
const { mainStatusBarTabs } = Mixly;
const statusBarTerminal = mainStatusBarTabs.getStatusBarById('output');
statusBarTerminal.setValue(Msg.Lang['shell.uploading'] + '...\n');
@@ -539,27 +541,26 @@ BU.uploadByCmd = async function (layerNum, port, command) {
BU.copyLib(upload.filePath, '');
}
fs_extra.outputFile(upload.filePath, code)
.then(() => {
BU.runCmd(layerNum, 'upload', port, command);
})
.catch((error) => {
statusBarTerminal.setValue(error.toString() + '\n');
console.log(error);
layer.close(layerNum);
BU.uploading = false;
});
.then(() => {
BU.runCmd('upload', port, command);
})
.catch((error) => {
BU.progressLayer.hide();
statusBarTerminal.setValue(error.toString() + '\n');
Debug.error(error);
BU.uploading = false;
});
}
/**
* @function 运行cmd
* @param layerNum {number} 烧录或上传加载弹窗的编号，用于关闭此弹窗
* @param type {string} 值为 'burn' | 'upload'
* @param port {string} 所选择的串口
* @param command {string} 需要执行的指令
* @param sucFunc {function} 指令成功执行后所要执行的操作
* @return {void}
*/
BU.runCmd = function (layerNum, type, port, command, sucFunc) {
BU.runCmd = function (type, port, command, sucFunc) {
const { mainStatusBarTabs } = Mixly;
const statusBarTerminal = mainStatusBarTabs.getStatusBarById('output');
mainStatusBarTabs.changeTo('output');
@@ -567,7 +568,7 @@ BU.runCmd = function (layerNum, type, port, command, sucFunc) {
let nowCommand = MString.tpl(command, { com: port });
BU.shell = child_process.exec(nowCommand, { encoding: 'binary' }, function (error, stdout, stderr) {
layer.close(layerNum);
BU.progressLayer.hide();
BU.burning = false;
BU.uploading = false;
BU.shell = null;
@@ -605,7 +606,7 @@ BU.runCmd = function (layerNum, type, port, command, sucFunc) {
statusBarSerial.open().catch(Debug.error);
}
}
})
});
BU.shell.stdout.on('data', function (data) {
if (BU.uploading || BU.burning) {
@@ -656,48 +657,23 @@ BU.operateWithPort = (type, port, command) => {
return;
}
const title = (type === 'burn' ? Msg.Lang['shell.burning'] : Msg.Lang['shell.uploading']) + '...';
const operate = () => {
const layerNum = layer.open({
type: 1,
title,
content: $('#mixly-loader-div'),
shade: LayerExt.SHADE_NAV,
resize: false,
closeBtn: 0,
success: function (layero, index) {
$(".layui-layer-page").css("z-index","198910151");
switch (type) {
case 'burn':
BU.burnByCmd(index, port, command);
break;
case 'upload':
default:
BU.uploadByCmd(index, port, command);
}
$("#mixly-loader-btn").off("click").click(() => {
$("#mixly-loader-btn").css('display', 'none');
layer.title(Msg.Lang['shell.aborting'] + '...', index);
BU.cancel(type);
});
},
end: function () {
$('#mixly-loader-div').css('display', 'none');
$("layui-layer-shade" + layerNum).remove();
$("#mixly-loader-btn").off("click");
$("#mixly-loader-btn").css('display', 'inline-block');
}
});
}
BU.progressLayer.title(title);
BU.progressLayer.show();
const { mainStatusBarTabs } = Mixly;
const statusBarSerial = mainStatusBarTabs.getStatusBarById(port);
let serialClosePromise = null;
if (statusBarSerial) {
statusBarSerial.close()
.finally(() => {
operate();
});
serialClosePromise = statusBarSerial.close();
} else {
operate();
serialClosePromise = Promise.resolve();
}
serialClosePromise.finally(() => {
if (type === 'burn') {
BU.burnByCmd(port, command);
} else {
BU.uploadByCmd(port, command);
}
});
}
/**