🐛 Fix: remove circular dependency

This commit is contained in:
萌萌哒赫萝
2023-09-02 07:38:04 -07:00
parent 0a02b96662
commit 9ef5136201
4 changed files with 79 additions and 9 deletions

View File

@@ -8,7 +8,6 @@ import bus from '@core/bus'
import db from '~/main/apis/core/datastore'
import picgo from '~/main/apis/core/picgo'
import { T } from '~/main/i18n'
import { remoteNoticeHandler } from '../remoteNotice'
import {
SETTING_WINDOW_URL,
TRAY_WINDOW_URL,
@@ -18,7 +17,7 @@ import {
} from './constants'
// Custom types/enums
import { IRemoteNoticeTriggerHook, IWindowList } from '#/types/enum'
import { IWindowList } from '#/types/enum'
// External utility functions
import { CREATE_APP_MENU } from '@core/bus/constants'
@@ -175,9 +174,6 @@ windowList.set(IWindowList.SETTING_WINDOW, {
multiple: false,
options: () => settingWindowOptions,
callback (window, windowManager) {
window.once('show', () => {
remoteNoticeHandler.triggerHook(IRemoteNoticeTriggerHook.SETTING_WINDOW_OPEN)
})
window.loadURL(handleWindowParams(SETTING_WINDOW_URL))
window.on('closed', () => {
bus.emit(TOGGLE_SHORTKEY_MODIFIED_MODE, false)

View File

@@ -1,5 +1,5 @@
import { isReactive, isRef, toRaw, unref } from 'vue'
import { sendToMain } from './dataSender'
import { ipcRenderer } from 'electron'
import { OPEN_URL } from '~/universal/events/constants'
/**
@@ -19,6 +19,11 @@ export const getRawData = (args: any): any => {
return args
}
function sendToMain (channel: string, ...args: any[]) {
const data = getRawData(args)
ipcRenderer.send(channel, ...data)
}
export const openURL = (url: string) => {
sendToMain(OPEN_URL, url)
}