diff --git a/package.json b/package.json index d80943a..48ecc29 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rubick", - "version": "4.1.2", + "version": "4.1.3", "author": "muwoo <2424880409@qq.com>", "private": true, "scripts": { diff --git a/src/common/constans/common.ts b/src/common/constans/common.ts index 551de27..3a7310e 100644 --- a/src/common/constans/common.ts +++ b/src/common/constans/common.ts @@ -1,5 +1,6 @@ export const WINDOW_WIDTH = 688; export const WINDOW_HEIGHT = 60; +export const WINDOW_PLUGIN_HEIGHT = 600; export const GUIDE_WIDTH = 800; export const GUIDE_HEIGHT = 600; diff --git a/src/main/browsers/runner.ts b/src/main/browsers/runner.ts index ce8f3be..d63b788 100644 --- a/src/main/browsers/runner.ts +++ b/src/main/browsers/runner.ts @@ -3,6 +3,11 @@ import path from 'path'; import commonConst from '../../common/utils/commonConst'; import { PLUGIN_INSTALL_DIR as baseDir } from '@/common/constans/main'; import localConfig from '@/main/common/initLocalConfig'; +import { + WINDOW_HEIGHT, + WINDOW_PLUGIN_HEIGHT, + WINDOW_WIDTH, +} from '@/common/constans/common'; const getRelativePath = (indexPath) => { return commonConst.windows() @@ -57,8 +62,13 @@ export default () => { const viewReadyFn = async (window, { pluginSetting, ext }) => { if (!view) return; const height = pluginSetting && pluginSetting.height; - window.setSize(800, height || 600); - view.setBounds({ x: 0, y: 60, width: 800, height: height || 540 }); + window.setSize(WINDOW_WIDTH, height || WINDOW_PLUGIN_HEIGHT); + view.setBounds({ + x: 0, + y: WINDOW_HEIGHT, + width: WINDOW_WIDTH, + height: height || WINDOW_PLUGIN_HEIGHT - WINDOW_HEIGHT, + }); view.setAutoResize({ width: true, height: true }); executeHooks('PluginEnter', ext); executeHooks('PluginReady', ext); diff --git a/src/renderer/App.vue b/src/renderer/App.vue index caa9bc3..df10810 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -78,13 +78,13 @@ getPluginInfo({ watch([options, pluginHistory, currentPlugin], () => { currentSelect.value = 0; - // if (currentPlugin.value.name) return; + if (currentPlugin.value.name) return; nextTick(() => { ipcRenderer.sendSync('msg-trigger', { type: 'setExpendHeight', data: getWindowHeight( options.value, - (pluginLoading.value || currentPlugin.value.name) ? [] : pluginHistory.value + (pluginLoading.value) ? [] : pluginHistory.value ), }); });