From 30f1f058c7b440aa97ca59f8eb96d14c598641ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
<1262327911@qq.com>
Date: Thu, 16 Mar 2023 20:25:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E8=81=94=E5=8A=A8?=
=?UTF-8?q?=E7=9A=84=E5=90=88=E5=B9=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/preview/suspenseIndex.vue | 36 ++++++++++++-----------------
src/views/preview/utils/storage.ts | 7 +++++-
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/src/views/preview/suspenseIndex.vue b/src/views/preview/suspenseIndex.vue
index f8de298c..29d03496 100644
--- a/src/views/preview/suspenseIndex.vue
+++ b/src/views/preview/suspenseIndex.vue
@@ -1,6 +1,6 @@
<template>
<div
- :class="`go-preview ${localStorageInfo.editCanvasConfig.previewScaleType}`"
+ :class="`go-preview ${chartEditStore.editCanvasConfig.previewScaleType}`"
>
<template v-if="showEntity">
<!-- 实体区域 -->
@@ -10,9 +10,7 @@
<!-- 展示层 -->
<div :style="previewRefStyle" v-if="show">
<!-- 渲染层 -->
- <preview-render-list
- :localStorageInfo="localStorageInfo"
- ></preview-render-list>
+ <preview-render-list></preview-render-list>
</div>
</div>
</div>
@@ -23,9 +21,7 @@
<!-- 展示层 -->
<div :style="previewRefStyle" v-if="show">
<!-- 渲染层 -->
- <preview-render-list
- :localStorageInfo="localStorageInfo"
- ></preview-render-list>
+ <preview-render-list></preview-render-list>
</div>
</div>
</template>
@@ -35,45 +31,43 @@
<script setup lang="ts">
import { computed } from 'vue'
import { PreviewRenderList } from './components/PreviewRenderList'
-import { getFilterStyle, routerTurnByName, getSessionStorage, setTitle } from '@/utils'
+import { getFilterStyle, routerTurnByName, setTitle } from '@/utils'
import { getEditCanvasConfigStyle, getSessionStorageInfo } from './utils'
import { PageEnum } from '@/enums/pageEnum'
-import { StorageEnum } from '@/enums/storageEnum'
import { useScale } from './hooks/useScale.hook'
import { useStore } from './hooks/useStore.hook'
import { PreviewScaleEnum } from '@/enums/styleEnum'
import { useComInstall } from './hooks/useComInstall.hook'
import type { ChartEditStorageType } from './index.d'
+import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
-const storageList: ChartEditStorageType[] = getSessionStorage(
- StorageEnum.GO_CHART_STORAGE_LIST
-)
+await getSessionStorageInfo()
+const chartEditStore = useChartEditStore() as unknown as ChartEditStorageType
-const localStorageInfo = await getSessionStorageInfo() as unknown as ChartEditStorageType
-setTitle(`预览-${localStorageInfo.editCanvasConfig.projectName}`)
+setTitle(`预览-${chartEditStore.editCanvasConfig.projectName}`)
// @ts-ignore
-if(localStorageInfo.isRelease === false) {
+if(chartEditStore.isRelease === false) {
routerTurnByName(PageEnum.REDIRECT_UN_PUBLISH_NAME, true, false)
}
const previewRefStyle = computed(() => {
return {
- ...getEditCanvasConfigStyle(localStorageInfo.editCanvasConfig),
- ...getFilterStyle(localStorageInfo.editCanvasConfig.filterShow ? localStorageInfo.editCanvasConfig : undefined),
+ ...getEditCanvasConfigStyle(chartEditStore.editCanvasConfig),
+ ...getFilterStyle(chartEditStore.editCanvasConfig.filterShow ? chartEditStore.editCanvasConfig : undefined),
}
})
const showEntity = computed(() => {
- const type = localStorageInfo.editCanvasConfig.previewScaleType
+ const type = chartEditStore.editCanvasConfig.previewScaleType
return (
type === PreviewScaleEnum.SCROLL_Y || type === PreviewScaleEnum.SCROLL_X
)
})
-useStore(localStorageInfo)
-const { entityRef, previewRef } = useScale(localStorageInfo)
-const { show } = useComInstall(localStorageInfo)
+useStore(chartEditStore)
+const { entityRef, previewRef } = useScale(chartEditStore)
+const { show } = useComInstall(chartEditStore)
</script>
<style lang="scss" scoped>
diff --git a/src/views/preview/utils/storage.ts b/src/views/preview/utils/storage.ts
index bc8138de..45186129 100644
--- a/src/views/preview/utils/storage.ts
+++ b/src/views/preview/utils/storage.ts
@@ -26,7 +26,12 @@ export const getSessionStorageInfo = async () => {
// 跳转未发布页
return { isRelease: false }
}
- return { ...JSONParse(content), id }
+ const parseData = { ...JSONParse(content), id }
+ const { editCanvasConfig, requestGlobalConfig, componentList } = parseData
+ chartEditStore.editCanvasConfig = editCanvasConfig
+ chartEditStore.requestGlobalConfig = requestGlobalConfig
+ chartEditStore.componentList = componentList
+ return parseData
} else {
httpErrorHandle()
}