Merge branch 'dev'

src/views/preview/components/PreviewRenderGroup/index.vue

@@ -1,31 +1,37 @@
 <template>
   <div
-    class="chart-item"
-    v-for="item in groupData.groupList"
-    :class="animationsClass(item.styles.animations)"
-    :key="item.id"
+    :class="animationsClass(groupData.styles.animations)"
     :style="{
-      ...getComponentAttrStyle(item.attr, groupIndex),
+      ...getSizeStyle(groupData.attr),
       ...getFilterStyle(groupData.styles),
-      ...getTransformStyle(groupData.styles),
+    }"
+  >
+    <div
+      class="chart-item"
+      v-for="item in groupData.groupList"
+      :class="animationsClass(item.styles.animations)"
+      :key="item.id"
+      :style="{
+      ...getComponentAttrStyle(item.attr, groupIndex),
       ...getStatusStyle(item.status),
       ...getPreviewConfigStyle(item.preview),
       ...getBlendModeStyle(item.styles) as any
     }"
-  >
-    <component
-      :is="item.chartConfig.chartKey"
-      :id="item.id"
-      :chartConfig="item"
-      :themeSetting="themeSetting"
-      :themeColor="themeColor"
-      :style="{
-        ...getSizeStyle(item.attr),
-        ...getFilterStyle(item.styles),
-        ...getTransformStyle(item.styles)
-      }"
-      v-on="useLifeHandler(item)"
-    ></component>
+    >
+      <component
+        :is="item.chartConfig.chartKey"
+        :id="item.id"
+        :chartConfig="item"
+        :themeSetting="themeSetting"
+        :themeColor="themeColor"
+        :style="{
+          ...getSizeStyle(item.attr),
+          ...getFilterStyle(item.styles),
+          ...getTransformStyle(item.styles)
+        }"
+        v-on="useLifeHandler(item)"
+      ></component>
+    </div>
   </div>
 </template>
 

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)"
     ></component>
   </div>

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 }])