diff --git a/src/assets/index.js b/src/assets/index.js
index fc7129f..58b7187 100644
--- a/src/assets/index.js
+++ b/src/assets/index.js
@@ -46,7 +46,7 @@
if (db.program == "custom") {
option = db.customOptions;
} else if(db.program == "quickcommand"){
- option = "quickcommand";
+ option = { mode: "quickcommand", payload: payload };
}else{
option = programs[db.program];
}
@@ -109,12 +109,12 @@
setTimeout(() => { utools.outPlugin(); }, 500);
}
var outputOpts = { type: output, autoScroll: autoScroll, autoHeight: autoHeight }
- if (option == "quickcommand") {
+ if (option.mode) {
// 内置环境
runCodeInVm(cmd, (stdout, stderr) => {
if (cmd.includes("utools.setExpendHeight")) outputOpts.autoHeight = false
switchQuickCommandResult(stdout, stderr, outputOpts)
- })
+ }, option.payload)
} else {
var terminal = output == 'terminal' ? true : false
outputOpts.scriptPath = getQuickCommandScriptFile(option.ext)
@@ -200,9 +200,11 @@
// 兼容暗黑模式
let adaptDarkMode = () => {
if (utools.isDarkColors()) {
- !$('#darkmode').length && $('head').append('')
+ !$('#darkmode').length && $('head').append(`
+
+ `)
} else {
- $('#darkmode').length && $('#darkmode').remove()
+ $('#darkmode').length && $('#darkmode, #darkswal').remove()
}
}
}()
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index bbf70b6..ee137e6 100755
--- a/src/index.html
+++ b/src/index.html
@@ -8,7 +8,7 @@
-
+
diff --git a/src/preload.js b/src/preload.js
index fa4c29b..411d409 100644
--- a/src/preload.js
+++ b/src/preload.js
@@ -105,7 +105,7 @@ quickcommand = {
var options = {
html: html,
focusConfirm: false,
- backdrop: '#bbb',
+ backdrop: utools.isDarkColors() ? '#464646' : '#bbb',
preConfirm: () => {
for (let i = 0; i < inputBoxNumbers; i++) {
result.push(document.getElementById(`inputBox${i}`).value)
@@ -139,7 +139,7 @@ quickcommand = {
}
},
html: html,
- backdrop: '#bbb',
+ backdrop: utools.isDarkColors() ? '#464646' : '#bbb',
showConfirmButton: false
}
swalOneByOne(options)
@@ -263,7 +263,9 @@ var getSandboxFuns = () => {
return sandbox
}
-runCodeInVm = (cmd, cb) => {
+runCodeInVm = (cmd, cb, payload = "") => {
+ var sandbox = getSandboxFuns()
+ sandbox.quickcommand.payload = payload
const vm = new NodeVM({
require: {
external: true,
@@ -271,7 +273,7 @@ runCodeInVm = (cmd, cb) => {
},
console: 'redirect',
env: process.env,
- sandbox: getSandboxFuns(),
+ sandbox: sandbox,
});
var parseItem = item => {
@@ -392,6 +394,7 @@ dirPythonMod = (mod, cb) => {
getNodeJsCommand = () => {
var obj = getSandboxFuns()
obj.Buffer = Buffer
+ obj.quickcommand.payload = ''
return obj
}