study/uTools-quickcommand
1
0
Fork 0
mirror of https://github.com/fofolee/uTools-quickcommand.git synced 2025-06-16 19:26:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

更改enterData的赋值方式

Browse Source
This commit is contained in:
fofolee 2022-04-25 08:27:40 +08:00
parent 6d8034d950
commit 219d0146e0
3 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugin/preload.js
View File

@ -504,6 +504,7 @@ utools.isDev() && (window.godMode = code => eval(code))
// vm 模块将无法在渲染进程中使用，改用 ses 来执行代码 // vm 模块将无法在渲染进程中使用，改用 ses 来执行代码
window.evalCodeInSandbox = (code, addVars = {}) => { window.evalCodeInSandbox = (code, addVars = {}) => {
let sandboxWithAD = Object.assign(addVars, getSandboxFuns()) let sandboxWithAD = Object.assign(addVars, getSandboxFuns())
sandboxWithAD.quickcommand = _.cloneDeep(quickcommand)
try { try {
return new Compartment(sandboxWithAD).evaluate(code); return new Compartment(sandboxWithAD).evaluate(code);
} catch (error) { } catch (error) {
@ -524,6 +525,11 @@ window.runCodeInSandbox = (code, callback, addVars = {}) => {
} }
} }
let sandboxWithAD = Object.assign(addVars, sandbox) let sandboxWithAD = Object.assign(addVars, sandbox)
sandboxWithAD.quickcommand = _.cloneDeep(quickcommand)
if (addVars.enterData) {
sandboxWithAD.quickcommand.enterData = addVars.enterData
sandboxWithAD.quickcommand.payload = addVars.enterData.payload
}
try { try {
new Compartment(sandboxWithAD).evaluate(code) new Compartment(sandboxWithAD).evaluate(code)
} catch (e) { } catch (e) {
@ -628,7 +634,7 @@ window.quickcommandHttpServer = () => {
// 错误返回 500 // 错误返回 500
if (stderr) return httpResponse(res, 500, stderr) if (stderr) return httpResponse(res, 500, stderr)
return httpResponse(res, 200, stdout) return httpResponse(res, 200, stdout)
}, Object.assign(userVars, _.cloneDeep(quickcommand))) })
} }
httpServer = http.createServer() httpServer = http.createServer()
httpServer.on('request', (req, res) => { httpServer.on('request', (req, res) => {

4
src/App.vue
View File

@ -105,9 +105,7 @@ export default defineComponent({
runCommandSilently(featureCode) { runCommandSilently(featureCode) {
let command = this.utools.getDB(this.utools.DBPRE.QC + featureCode); let command = this.utools.getDB(this.utools.DBPRE.QC + featureCode);
if (command.program === "quickcommand") { if (command.program === "quickcommand") {
window.runCodeInSandbox(command.cmd, () => {}, { window.runCodeInSandbox(command.cmd, () => {});
quickcommand: _.cloneDeep(quickcommand),
});
} else { } else {
let option = let option =
command.program === "custom" command.program === "custom"

5
src/components/CommandRunResult.vue
View File

@ -113,9 +113,6 @@ export default {
utools.outPlugin(); utools.outPlugin();
}, 500); }, 500);
if (currentCommand.program === "quickcommand") { if (currentCommand.program === "quickcommand") {
let qc = _.cloneDeep(quickcommand);
qc.enterData = this.$root.enterData;
qc.type = this.$root.enterData.type;
window.runCodeInSandbox( window.runCodeInSandbox(
currentCommand.cmd, currentCommand.cmd,
(stdout, stderr) => { (stdout, stderr) => {
@ -126,7 +123,7 @@ export default {
} }
!outPlugin && this.showRunResult(stdout, true, action); !outPlugin && this.showRunResult(stdout, true, action);
}, },
{ quickcommand: qc } { enterData: this.$root.enterData }
); );
} else if (currentCommand.program === "html") { } else if (currentCommand.program === "html") {
this.showRunResult(currentCommand.cmd, true, action); this.showRunResult(currentCommand.cmd, true, action);