diff --git a/src/assets/options.js b/src/assets/options.js index 040d30b..f625562 100644 --- a/src/assets/options.js +++ b/src/assets/options.js @@ -319,8 +319,8 @@ let showCustomize = () => { ﹢动作 ﹢按键 ?帮助 + 格式化 - 格式化

@@ -871,7 +871,7 @@ let showRunResult = (content, raw, success) => { popup: 'fadeOutUpWindow' } } - swalOneByOne(options) + success ? swalOneByOne(options) : Swal.fire(options) } } @@ -965,18 +965,19 @@ showCodeEditor = () => { 运 行 - 格式化 + 格式化 ﹢动作 ﹢按键 ?帮助 + ` $("#options").html(customWindow) createEditor() - $(".CodeMirror").css({ height: '580px' }) - $(".robot").css({ "margin-bottom": "5px" }); + $(".CodeMirror").css({ height: '100%' }) + $(".robot").css({ "margin-bottom": "2.5px" }); $("#customize").css({ top: '0px', padding: '0px' }); $("span.customscript > input").css({"height": "30px"}) var db = getDB('codeHistory') @@ -987,7 +988,7 @@ showCodeEditor = () => { } programCheck() $('#program').select2({ - width: 100, + width: 120, minimumResultsForSearch: Infinity, dropdownParent: $("#customize") }); diff --git a/src/preload.js b/src/preload.js index d23b561..8e41fbe 100644 --- a/src/preload.js +++ b/src/preload.js @@ -237,6 +237,7 @@ runCodeInVm = (cmd, cb) => { return item.toString() } + //重定向 console vm.on('console.log', stdout => { cb(parseItem(stdout), null) }); @@ -245,6 +246,7 @@ runCodeInVm = (cmd, cb) => { cb(null, stderr.toString()) }); + // 错误处理 try { vm.run(cmd, path.join(__dirname, 'preload.js')); } catch (error) { @@ -255,9 +257,14 @@ runCodeInVm = (cmd, cb) => { window.removeEventListener('error', cbUnhandledError) cb(null, e.error.toString()) } + + let cbUnhandledRejection = e => { + window.removeEventListener('unhandledrejection', cbUnhandledRejection) + cb(null, e.reason.toString()) + } - // 捕捉渲染进程异常 window.addEventListener('error', cbUnhandledError) + window.addEventListener('unhandledrejection', cbUnhandledRejection); } // shell 以环境变量下命令作为代码提示