From 5541cef6dea7d1442a239b819aa62d70a4e26b6b Mon Sep 17 00:00:00 2001 From: chilingling Date: Wed, 17 Jul 2024 18:41:31 -0700 Subject: [PATCH] fix(preview): multiple nested blocks cannot preview #663 --- .../design-core/src/preview/src/preview/Preview.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/design-core/src/preview/src/preview/Preview.vue b/packages/design-core/src/preview/src/preview/Preview.vue index 04f797bb04..3a16bb2781 100644 --- a/packages/design-core/src/preview/src/preview/Preview.vue +++ b/packages/design-core/src/preview/src/preview/Preview.vue @@ -86,11 +86,17 @@ export default { .map((name) => fetchBlockSchema(name)) const schemaList = await Promise.allSettled(promiseList) + const extraList = [] schemaList.forEach((item) => { if (item.status === 'fulfilled' && item.value?.[0]?.content) { res.push(item.value[0].content) - res.push(...getBlocksSchema(item.value[0].content, blockSet)) + extraList.push(getBlocksSchema(item.value[0].content, blockSet)) + } + }) + ;(await Promise.allSettled(extraList)).forEach((item) => { + if (item.status === 'fulfilled' && item.value) { + res.push(...item.value) } }) @@ -136,11 +142,10 @@ export default { }, ...(blocks || []).map((blockSchema) => { return { - panelName: blockSchema.fileName, + panelName: `${blockSchema.fileName}.vue`, panelValue: genSFCWithDefaultPlugin(blockSchema, appData?.componentsMap || [], { blockRelativePath: './' }) || '', - panelType: 'vue', - index: true + panelType: 'vue' } }) ]