blackteay/go-view
1
0
Fork 0
mirror of https://gitee.com/dromara/go-view.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
奔跑的面条 2023-09-18 11:43:20 +08:00
commit fdc39e18dc
3 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/preview/components/PreviewRenderGroup/index.vue
View File

@ -1,4 +1,11 @@
<template> <template>
<div
:class="animationsClass(groupData.styles.animations)"
:style="{
...getSizeStyle(groupData.attr),
...getFilterStyle(groupData.styles),
}"
>
<div <div
class="chart-item" class="chart-item"
v-for="item in groupData.groupList" v-for="item in groupData.groupList"
@ -6,8 +13,6 @@
:key="item.id" :key="item.id"
:style="{ :style="{
...getComponentAttrStyle(item.attr, groupIndex), ...getComponentAttrStyle(item.attr, groupIndex),
...getFilterStyle(groupData.styles),
...getTransformStyle(groupData.styles),
...getStatusStyle(item.status), ...getStatusStyle(item.status),
...getPreviewConfigStyle(item.preview), ...getPreviewConfigStyle(item.preview),
...getBlendModeStyle(item.styles) as any ...getBlendModeStyle(item.styles) as any
@ -27,6 +32,7 @@
v-on="useLifeHandler(item)" v-on="useLifeHandler(item)"
></component> ></component>
</div> </div>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">

6
src/views/preview/components/PreviewRenderList/index.vue
View File

@ -6,7 +6,6 @@
:key="item.id" :key="item.id"
:style="{ :style="{
...getComponentAttrStyle(item.attr, index), ...getComponentAttrStyle(item.attr, index),
...getFilterStyle(item.styles),
...getTransformStyle(item.styles), ...getTransformStyle(item.styles),
...getStatusStyle(item.status), ...getStatusStyle(item.status),
...getPreviewConfigStyle(item.preview), ...getPreviewConfigStyle(item.preview),
@ -31,7 +30,10 @@
:chartConfig="item" :chartConfig="item"
:themeSetting="themeSetting" :themeSetting="themeSetting"
:themeColor="themeColor" :themeColor="themeColor"
:style="{ ...getSizeStyle(item.attr) }" :style="{
...getSizeStyle(item.attr),
...getFilterStyle(item.styles)
}"
v-on="useLifeHandler(item)" v-on="useLifeHandler(item)"
></component> ></component>
</div> </div>

3
src/views/preview/wrapper.vue
View File

@ -15,8 +15,7 @@ let key = ref(Date.now())
// 数据变更 -> 组件销毁重建 // 数据变更 -> 组件销毁重建
;[SavePageEnum.JSON, SavePageEnum.CHART_TO_PREVIEW].forEach((saveEvent: string) => { ;[SavePageEnum.JSON, SavePageEnum.CHART_TO_PREVIEW].forEach((saveEvent: string) => {
if (!window.opener) return if (!window.opener && !window.opener.addEventListener) return
if(!(window.opener === window)) return
window.opener.addEventListener(saveEvent, async (e: any) => { window.opener.addEventListener(saveEvent, async (e: any) => {
const localStorageInfo: ChartEditStorageType = await getSessionStorageInfo() as unknown as ChartEditStorageType const localStorageInfo: ChartEditStorageType = await getSessionStorageInfo() as unknown as ChartEditStorageType
setSessionStorage(StorageEnum.GO_CHART_STORAGE_LIST, [{ ...e.detail, id: localStorageInfo.id }]) setSessionStorage(StorageEnum.GO_CHART_STORAGE_LIST, [{ ...e.detail, id: localStorageInfo.id }])