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 (
!appDetail.target ||
appDetail.target.toLowerCase().indexOf('unin') >= 0 ||
appDetail.args
appDetail.target.toLowerCase().indexOf('unin') >= 0
)
return;

View File

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

View File

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

View File

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

View File

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

View File

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