🐛 Fix: busApi event register first && emit later

This commit is contained in:
PiEgg
2020-01-01 17:30:06 +08:00
parent 6b57cf7981
commit e1a0cbb8a1
2 changed files with 4 additions and 9 deletions
-5
View File
@@ -624,11 +624,6 @@ app.on('ready', async () => {
server.startup() server.startup()
if (process.env.NODE_ENV !== 'development') { if (process.env.NODE_ENV !== 'development') {
let files = getUploadFiles() let files = getUploadFiles()
if (files === null) {
logger.info('get clipboardFile, null')
} else {
logger.info(`get clipboardFile, ${files.toString()}`)
}
if (files === null || files.length > 0) { // 如果有文件列表作为参数,说明是命令行启动 if (files === null || files.length > 0) { // 如果有文件列表作为参数,说明是命令行启动
if (files === null) { if (files === null) {
uploadClipboardFiles() uploadClipboardFiles()
+4 -4
View File
@@ -15,7 +15,6 @@ export const uploadWithClipboardFiles = (): Promise<{
result?: string[] result?: string[]
}> => { }> => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
bus.emit(UPLOAD_WITH_CLIPBOARD_FILES)
bus.once(UPLOAD_WITH_CLIPBOARD_FILES_RESPONSE, (result: string) => { bus.once(UPLOAD_WITH_CLIPBOARD_FILES_RESPONSE, (result: string) => {
if (result) { if (result) {
return resolve({ return resolve({
@@ -28,6 +27,7 @@ export const uploadWithClipboardFiles = (): Promise<{
}) })
} }
}) })
bus.emit(UPLOAD_WITH_CLIPBOARD_FILES)
}) })
} }
@@ -36,7 +36,6 @@ export const uploadWithFiles = (pathList: IFileWithPath[]): Promise<{
result?: string[] result?: string[]
}> => { }> => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
bus.emit(UPLOAD_WITH_FILES, pathList)
bus.once(UPLOAD_WITH_FILES_RESPONSE, (result: string[]) => { bus.once(UPLOAD_WITH_FILES_RESPONSE, (result: string[]) => {
if (result.length) { if (result.length) {
return resolve({ return resolve({
@@ -49,6 +48,7 @@ export const uploadWithFiles = (pathList: IFileWithPath[]): Promise<{
}) })
} }
}) })
bus.emit(UPLOAD_WITH_FILES, pathList)
}) })
} }
@@ -56,19 +56,19 @@ export const uploadWithFiles = (pathList: IFileWithPath[]): Promise<{
// miniWindow or settingWindow or trayWindow // miniWindow or settingWindow or trayWindow
export const getWindowId = (): Promise<number> => { export const getWindowId = (): Promise<number> => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
bus.emit(GET_WINDOW_ID)
bus.once(GET_WINDOW_ID_REPONSE, (id: number) => { bus.once(GET_WINDOW_ID_REPONSE, (id: number) => {
resolve(id) resolve(id)
}) })
bus.emit(GET_WINDOW_ID)
}) })
} }
// get settingWindow id: // get settingWindow id:
export const getSettingWindowId = (): Promise<number> => { export const getSettingWindowId = (): Promise<number> => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
bus.emit(GET_SETTING_WINDOW_ID)
bus.once(GET_SETTING_WINDOW_ID_RESPONSE, (id: number) => { bus.once(GET_SETTING_WINDOW_ID_RESPONSE, (id: number) => {
resolve(id) resolve(id)
}) })
bus.emit(GET_SETTING_WINDOW_ID)
}) })
} }