ban掉utools enter和out

This commit is contained in:
fofolee 2022-04-19 15:00:01 +08:00
parent 7729108ebe
commit 724e969f07
2 changed files with 27 additions and 24 deletions

View File

@ -214,22 +214,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
@ -394,12 +394,12 @@ window.getSelectFile = hwnd => {
}
window.showHelpPage = path => {
utools.ubrowser
.goto("https://www.yuque.com/fofolee-awga0/cpbg1m/bg31vl" + path)
.run({
width: 1380,
height: 750
});
utools.ubrowser
.goto("https://www.yuque.com/fofolee-awga0/cpbg1m/bg31vl" + path)
.run({
width: 1380,
height: 750
});
}
window.clipboardReadText = () => electron.clipboard.readText()
@ -465,6 +465,9 @@ window.getuToolsLite = () => {
delete utoolsLite.getUserServerTemporaryToken
delete utoolsLite.openPayment
delete utoolsLite.fetchUserPayments
// 其他
delete utoolsLite.onPluginEnter
delete utoolsLite.onPluginOut
Object.freeze(utoolsLite)
return utoolsLite
}
@ -668,4 +671,4 @@ window.quickcommandHttpServer = () => {
run,
stop
}
}
}

View File

@ -33,10 +33,10 @@ export default defineComponent({
window.utools = window.getuToolsLite();
if (!this.checkVer()) return;
this.startUp();
utools.onPluginEnter((enter) => {
this.utools.whole.onPluginEnter((enter) => {
this.enterPlugin(enter);
});
utools.onPluginOut(() => {
this.utools.whole.onPluginOut(() => {
this.outPlugin();
});
},