From 2a3bee96b49a4f09fe00527e237186ee533d188c Mon Sep 17 00:00:00 2001 From: guopenghui Date: Tue, 12 May 2026 17:52:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(main-push):=20=E6=94=AF=E6=8C=81=20main?= =?UTF-8?q?PushCallback=20=E8=BF=94=E5=9B=9E=E7=9A=84=E5=BC=82=E6=AD=A5?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=92=8C=E5=AF=B9=E8=B1=A1=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/preload.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/resources/preload.js b/resources/preload.js index 443c26b7..ee9984cc 100644 --- a/resources/preload.js +++ b/resources/preload.js @@ -115,12 +115,20 @@ const lazyPluginDetach = lazyListen('plugin-detach', () => { }) // mainPush 查询请求（由 onMainPush 触发注册，搜索时主进程转发） -const lazyMainPushQuery = lazyListen('main-push-query', (event, { queryData, callId }) => { +const lazyMainPushQuery = lazyListen('main-push-query', async (event, { queryData, callId }) => { try { let allResults = [] if (mainPushCallback) { try { - const results = mainPushCallback.callback(queryData) + let results = mainPushCallback.callback(queryData) + // MainPush结果可能是一个 Promise，需要等待结果 + if (results && typeof results.then === 'function') { + results = await results + } + // MainPush结果可能是一个对象，需要提取 data 字段 + if (results && Array.isArray(results.data)) { + results = results.data + } if (Array.isArray(results) && results.length > 0) { allResults = allResults.concat(results) } From 28b1f3e958d9c13f49bc54d1c5ffea3ce19ee2e3 Mon Sep 17 00:00:00 2001 From: guopenghui Date: Tue, 12 May 2026 20:47:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(main-push):=20=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/preload.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/resources/preload.js b/resources/preload.js index ee9984cc..98dac196 100644 --- a/resources/preload.js +++ b/resources/preload.js @@ -120,13 +120,9 @@ const lazyMainPushQuery = lazyListen('main-push-query', async (event, { queryDat let allResults = [] if (mainPushCallback) { try { - let results = mainPushCallback.callback(queryData) - // MainPush结果可能是一个 Promise，需要等待结果 - if (results && typeof results.then === 'function') { - results = await results - } + let results = await mainPushCallback.callback(queryData) // MainPush结果可能是一个对象，需要提取 data 字段 - if (results && Array.isArray(results.data)) { + if (results && results.type === 'list' && Array.isArray(results.data)) { results = results.data } if (Array.isArray(results) && results.length > 0) {