From f79e45f5e09afa70a02912e6086f02947563312a Mon Sep 17 00:00:00 2001 From: SheRunFeng <541899641@qq.com> Date: Thu, 25 Aug 2022 15:46:52 +0800 Subject: [PATCH] fix(): preview error when legacy was iframe --- packages/brick-kit/src/core/Kernel.spec.ts | 5 +++++ packages/brick-kit/src/core/Kernel.ts | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/brick-kit/src/core/Kernel.spec.ts b/packages/brick-kit/src/core/Kernel.spec.ts index 3bda731e55..df96deb084 100644 --- a/packages/brick-kit/src/core/Kernel.spec.ts +++ b/packages/brick-kit/src/core/Kernel.spec.ts @@ -1541,6 +1541,7 @@ describe("Kernel", () => { bricks: [{ brick: "tpl-a", properties: { textContent: "hello" } }], exact: true, menu: false, + hybrid: false, path: "${APP.homepage}/_dev_only_/template-preview/tpl-a", }, ], @@ -1624,6 +1625,7 @@ describe("Kernel", () => { context: [{ name: "quality" }], }, ], + hybrid: false, menu: false, exact: true, }, @@ -1670,6 +1672,7 @@ describe("Kernel", () => { ], menu: false, exact: true, + hybrid: false, }, { alias: "home", @@ -1751,6 +1754,7 @@ describe("Kernel", () => { }, ], "exact": true, + "hybrid": false, "menu": false, "path": "\${APP.homepage}/_dev_only_/snippet-preview/snippet-a", }, @@ -1805,6 +1809,7 @@ describe("Kernel", () => { }, ], "exact": true, + "hybrid": false, "menu": false, "path": "\${APP.homepage}/_dev_only_/snippet-preview/snippet-a", }, diff --git a/packages/brick-kit/src/core/Kernel.ts b/packages/brick-kit/src/core/Kernel.ts index 6252632e64..abae0f4f70 100644 --- a/packages/brick-kit/src/core/Kernel.ts +++ b/packages/brick-kit/src/core/Kernel.ts @@ -402,7 +402,7 @@ export class Kernel { templateId: string, settings?: unknown ): void { - const { routes } = this.bootstrapData.storyboards.find( + const { routes, app } = this.bootstrapData.storyboards.find( (item) => item.app.id === appId ); const previewPath = `\${APP.homepage}/_dev_only_/template-preview/${templateId}`; @@ -419,6 +419,7 @@ export class Kernel { ], menu: false, exact: true, + hybrid: app.legacy === "iframe", }; if (previewRouteIndex === -1) { routes.unshift(newPreviewRoute); @@ -434,7 +435,7 @@ export class Kernel { bricks: BrickConf[]; } ): void { - const { routes } = this.bootstrapData.storyboards.find( + const { routes, app } = this.bootstrapData.storyboards.find( (item) => item.app.id === appId ); const previewPath = `\${APP.homepage}/_dev_only_/snippet-preview/${snippetData.snippetId}`; @@ -449,6 +450,7 @@ export class Kernel { : [{ brick: "span" }], menu: false, exact: true, + hybrid: app.legacy === "iframe", }; if (previewRouteIndex === -1) { routes.unshift(newPreviewRoute);