diff --git a/electron/electron.js b/electron/electron.js index e9672502a..57c28ada0 100644 --- a/electron/electron.js +++ b/electron/electron.js @@ -341,18 +341,16 @@ function createChildWindow(args) { browser = preloadWindow; preloadWindow = null; setTimeout(() => onShowWindow(browser), 300) - browser.once('resize', () => onShowWindow(browser)) + browser.once('resize', () => setTimeout(() => onShowWindow(browser), 10)) browser.setSize(options.width, options.height); browser.setMinimumSize(options.minWidth, options.minHeight); browser.center(); browser.setParentWindow(options.parent); browser.setAutoHideMenuBar(options.autoHideMenuBar); browser.removeAllListeners("closed"); - console.log("use preload window") } else { // 创建新窗口 browser = new BrowserWindow(options) - console.log("create new window") } browser.on('page-title-updated', (event, title) => { diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 1cca1d800..06c5b439c 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -3373,9 +3373,6 @@ export default { width: Math.min(window.screen.availWidth, 1440), height: Math.min(window.screen.availHeight, 900), }, - webPreferences: { - nodeIntegrationInSubFrames: msg.ext === 'drawio' - }, }); } else if (this.$isEEUiApp) { this.$store.dispatch('openAppChildPage', { diff --git a/resources/assets/js/pages/manage/components/FileHistory.vue b/resources/assets/js/pages/manage/components/FileHistory.vue index abedaafdd..65db1d7f6 100644 --- a/resources/assets/js/pages/manage/components/FileHistory.vue +++ b/resources/assets/js/pages/manage/components/FileHistory.vue @@ -193,9 +193,6 @@ export default { width: Math.min(window.screen.availWidth, 1440), height: Math.min(window.screen.availHeight, 900), }, - webPreferences: { - nodeIntegrationInSubFrames: this.file.type === 'drawio' - }, }); } else if (this.$isEEUiApp) { this.$store.dispatch('openAppChildPage', { diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index 07e16c557..ba69e5206 100755 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -1706,9 +1706,6 @@ export default { width: Math.min(window.screen.availWidth, 1440), height: Math.min(window.screen.availHeight, 900), }, - webPreferences: { - nodeIntegrationInSubFrames: file.ext === 'drawio' - }, }); } else if (this.$isEEUiApp) { this.$store.dispatch('openAppChildPage', { diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index 30419b884..1d7049620 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -1107,9 +1107,6 @@ export default { width: Math.min(window.screen.availWidth, 1440), height: Math.min(window.screen.availHeight, 900), }, - webPreferences: { - nodeIntegrationInSubFrames: item.type === 'drawio' - }, }); } else if (this.$isEEUiApp) { this.$store.dispatch('openAppChildPage', {