Merge branch 'feat/v3.0.0'

# Conflicts:
#	src/main/browsers/main.ts
This commit is contained in:
sunyuqiang 2023-10-13 09:50:40 +08:00
commit 437419aca3
6 changed files with 9 additions and 2 deletions

View File

@ -69,8 +69,7 @@ function fileDisplay(filePath) {
} }
if ( if (
!appDetail.target || !appDetail.target ||
appDetail.target.toLowerCase().indexOf('unin') >= 0 || appDetail.target.toLowerCase().indexOf('unin') >= 0
appDetail.args
) )
return; return;

View File

@ -17,6 +17,7 @@ export default () => {
const createWindow = async (pluginInfo, viewInfo, view) => { const createWindow = async (pluginInfo, viewInfo, view) => {
win = new BrowserWindow({ win = new BrowserWindow({
height: viewInfo.height, height: viewInfo.height,
minHeight: 60,
width: viewInfo.width, width: viewInfo.width,
autoHideMenuBar: true, autoHideMenuBar: true,
titleBarStyle: 'hidden', titleBarStyle: 'hidden',
@ -36,6 +37,7 @@ export default () => {
webviewTag: true, webviewTag: true,
devTools: true, devTools: true,
nodeIntegration: true, nodeIntegration: true,
spellcheck: false,
}, },
}); });
if (process.env.WEBPACK_DEV_SERVER_URL) { if (process.env.WEBPACK_DEV_SERVER_URL) {

View File

@ -41,6 +41,7 @@ export default () => {
y, y,
width: 800, width: 800,
height: 600, height: 600,
minHeight: 60,
webPreferences: { webPreferences: {
webSecurity: false, webSecurity: false,
backgroundThrottling: false, backgroundThrottling: false,
@ -48,6 +49,7 @@ export default () => {
webviewTag: true, webviewTag: true,
devTools: true, devTools: true,
nodeIntegration: true, nodeIntegration: true,
spellcheck: false,
}, },
}); });
if (process.env.WEBPACK_DEV_SERVER_URL) { if (process.env.WEBPACK_DEV_SERVER_URL) {

View File

@ -19,6 +19,7 @@ export default () => {
const createWindow = async () => { const createWindow = async () => {
win = new BrowserWindow({ win = new BrowserWindow({
height: WINDOW_HEIGHT, height: WINDOW_HEIGHT,
minHeight: 60,
useContentSize: true, useContentSize: true,
resizable: true, resizable: true,
width: WINDOW_WIDTH, width: WINDOW_WIDTH,
@ -34,6 +35,7 @@ export default () => {
webviewTag: true, webviewTag: true,
nodeIntegration: true, nodeIntegration: true,
preload: path.join(__static, 'preload.js'), preload: path.join(__static, 'preload.js'),
spellcheck: false,
}, },
}); });
if (process.env.WEBPACK_DEV_SERVER_URL) { if (process.env.WEBPACK_DEV_SERVER_URL) {

View File

@ -128,6 +128,7 @@ export default () => {
standard: 'system-ui', standard: 'system-ui',
serif: 'system-ui', serif: 'system-ui',
}, },
spellcheck: false,
}, },
}); });
window.setBrowserView(view); window.setBrowserView(view);

View File

@ -93,6 +93,7 @@ const emit = defineEmits([
'focus', 'focus',
'clearSearchValue', 'clearSearchValue',
'readClipboardContent', 'readClipboardContent',
'clearClipbord',
]); ]);
const keydownEvent = (e, key: string) => { const keydownEvent = (e, key: string) => {