Skip to content

fix(main-push): 支持 mainPushCallback 返回的异步结果和对象结果 #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lzx8589561 merged 2 commits into from
May 12, 2026
+6 −2
Merged

fix(main-push): 支持 mainPushCallback 返回的异步结果和对象结果 #487

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a3bee9
fix(main-push): 支持 mainPushCallback 返回的异步结果和对象结果
guopenghui May 12, 2026
28b1f3e
fix(main-push): 简化代码
guopenghui May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions resources/preload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,16 @@ 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 = await mainPushCallback.callback(queryData)
// MainPush结果可能是一个对象，需要提取 data 字段
if (results && results.type === 'list' && Array.isArray(results.data)) {
results = results.data
}
if (Array.isArray(results) && results.length > 0) {
allResults = allResults.concat(results)
}
Expand Down