study/uTools-quickcommand
1
0
Fork 0
mirror of https://github.com/fofolee/uTools-quickcommand.git synced 2025-06-08 14:34:13 +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

38
plugin/preload.js
View File

@ -212,22 +212,22 @@ if (process.platform !== 'linux') quickcommand.runInTerminal = function(cmdline,
}
let getCommandToLaunchTerminal = (cmdline, dir) => {
let cd = ''
if (utools.isWindows()) {
let appPath = path.join(utools.getPath('home'), '/AppData/Local/Microsoft/WindowsApps/')
// 直接 existsSync wt.exe 无效
if (fs.existsSync(appPath) && fs.readdirSync(appPath).includes('wt.exe')) {
cmdline = cmdline.replace(/"/g, `\\"`)
if (dir) cd = `-d "${dir.replace(/\\/g, '/')}"`
command = `${appPath}wt.exe ${cd} cmd /k "${cmdline}"`
} else {
cmdline = cmdline.replace(/"/g, `^"`)
if (dir) cd = `cd /d "${dir.replace(/\\/g, '/')}" &&`
command = `${cd} start "" cmd /k "${cmdline}"`
}
} else {
let cd = ''
if (utools.isWindows()) {
let appPath = path.join(utools.getPath('home'), '/AppData/Local/Microsoft/WindowsApps/')
// 直接 existsSync wt.exe 无效
if (fs.existsSync(appPath) && fs.readdirSync(appPath).includes('wt.exe')) {
cmdline = cmdline.replace(/"/g, `\\"`)
if (dir) cd = `cd ${dir.replace(/ /g, `\\\\ `)} &&`
if (dir) cd = `-d "${dir.replace(/\\/g, '/')}"`
command = `${appPath}wt.exe ${cd} cmd /k "${cmdline}"`
} else {
cmdline = cmdline.replace(/"/g, `^"`)
if (dir) cd = `cd /d "${dir.replace(/\\/g, '/')}" &&`
command = `${cd} start "" cmd /k "${cmdline}"`
}
} else {
cmdline = cmdline.replace(/"/g, `\\"`)
if (dir) cd = `cd ${dir.replace(/ /g, `\\\\ `)} &&`
if (fs.existsSync('/Applications/iTerm.app')) {
command = `osascript -e 'tell application "iTerm"
create window with default profile
@ -504,6 +504,7 @@ utools.isDev() && (window.godMode = code => eval(code))
// vm 模块将无法在渲染进程中使用，改用 ses 来执行代码
window.evalCodeInSandbox = (code, addVars = {}) => {
let sandboxWithAD = Object.assign(addVars, getSandboxFuns())
sandboxWithAD.quickcommand = _.cloneDeep(quickcommand)
try {
return new Compartment(sandboxWithAD).evaluate(code);
} catch (error) {
@ -524,6 +525,11 @@ window.runCodeInSandbox = (code, callback, addVars = {}) => {
}
}
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 {
new Compartment(sandboxWithAD).evaluate(code)
} catch (e) {
@ -628,7 +634,7 @@ window.quickcommandHttpServer = () => {
// 错误返回 500
if (stderr) return httpResponse(res, 500, stderr)
return httpResponse(res, 200, stdout)
}, Object.assign(userVars, _.cloneDeep(quickcommand)))
})
}
httpServer = http.createServer()
httpServer.on('request', (req, res) => {

4
src/App.vue
View File

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

5
src/components/CommandRunResult.vue
View File

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