diff --git a/src/views/preview/components/PreviewRenderGroup/index.vue b/src/views/preview/components/PreviewRenderGroup/index.vue index a24e8676..19507fb7 100644 --- a/src/views/preview/components/PreviewRenderGroup/index.vue +++ b/src/views/preview/components/PreviewRenderGroup/index.vue @@ -1,31 +1,37 @@ diff --git a/src/views/preview/components/PreviewRenderList/index.vue b/src/views/preview/components/PreviewRenderList/index.vue index 4d44e678..d22be72d 100644 --- a/src/views/preview/components/PreviewRenderList/index.vue +++ b/src/views/preview/components/PreviewRenderList/index.vue @@ -6,7 +6,6 @@ :key="item.id" :style="{ ...getComponentAttrStyle(item.attr, index), - ...getFilterStyle(item.styles), ...getTransformStyle(item.styles), ...getStatusStyle(item.status), ...getPreviewConfigStyle(item.preview), @@ -31,7 +30,10 @@ :chartConfig="item" :themeSetting="themeSetting" :themeColor="themeColor" - :style="{ ...getSizeStyle(item.attr) }" + :style="{ + ...getSizeStyle(item.attr), + ...getFilterStyle(item.styles) + }" v-on="useLifeHandler(item)" > diff --git a/src/views/preview/wrapper.vue b/src/views/preview/wrapper.vue index 6a9b9a72..3ed56888 100644 --- a/src/views/preview/wrapper.vue +++ b/src/views/preview/wrapper.vue @@ -15,8 +15,7 @@ let key = ref(Date.now()) // 数据变更 -> 组件销毁重建 ;[SavePageEnum.JSON, SavePageEnum.CHART_TO_PREVIEW].forEach((saveEvent: string) => { - if (!window.opener) return - if(!(window.opener === window)) return + if (!window.opener && !window.opener.addEventListener) return window.opener.addEventListener(saveEvent, async (e: any) => { const localStorageInfo: ChartEditStorageType = await getSessionStorageInfo() as unknown as ChartEditStorageType setSessionStorage(StorageEnum.GO_CHART_STORAGE_LIST, [{ ...e.detail, id: localStorageInfo.id }])