Pre Merge pull request !212 from fresh66/2.2.6-fixed-bug

This commit is contained in:
fresh66 2023-10-08 08:01:28 +00:00 committed by Gitee
commit b7ae4d7f13
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 18 additions and 10 deletions

View File

@ -182,9 +182,7 @@ export const useChartEditStore = defineStore({
}, },
getComponentList(): Array<CreateComponentType | CreateComponentGroupType> { getComponentList(): Array<CreateComponentType | CreateComponentGroupType> {
return this.componentList return this.componentList
} },
},
actions: {
// * 获取需要存储的数据项 // * 获取需要存储的数据项
getStorageInfo(): ChartEditStorage { getStorageInfo(): ChartEditStorage {
return { return {
@ -192,7 +190,9 @@ export const useChartEditStore = defineStore({
[ChartEditStoreEnum.COMPONENT_LIST]: this.getComponentList, [ChartEditStoreEnum.COMPONENT_LIST]: this.getComponentList,
[ChartEditStoreEnum.REQUEST_GLOBAL_CONFIG]: this.getRequestGlobalConfig [ChartEditStoreEnum.REQUEST_GLOBAL_CONFIG]: this.getRequestGlobalConfig
} }
}, }
},
actions: {
// * 设置 editCanvas 数据项 // * 设置 editCanvas 数据项
setEditCanvas<T extends keyof EditCanvasType, K extends EditCanvasType[T]>(key: T, value: K) { setEditCanvas<T extends keyof EditCanvasType, K extends EditCanvasType[T]>(key: T, value: K) {
this.editCanvas[key] = value this.editCanvas[key] = value

View File

@ -1,3 +1,11 @@
/*
* @Author: jiangnan
* @Email: hujiangnan@hatech.com.cn
* @Date: 2023-09-27 17:22:40
* @LastEditors: jiangnan
* @LastEditTime: 2023-09-27 17:26:38
* @Describle:
*/
import { watch } from 'vue' import { watch } from 'vue'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import throttle from 'lodash/throttle' import throttle from 'lodash/throttle'
@ -20,14 +28,14 @@ export const syncData = () => {
onPositiveCallback: async () => { onPositiveCallback: async () => {
window['$message'].success('正在同步编辑器...') window['$message'].success('正在同步编辑器...')
dataSyncUpdate && (await dataSyncUpdate()) dataSyncUpdate && (await dataSyncUpdate())
dispatchEvent(new CustomEvent(SavePageEnum.CHART, { detail: chartEditStore.getStorageInfo() })) dispatchEvent(new CustomEvent(SavePageEnum.CHART, { detail: chartEditStore.getStorageInfo }))
} }
}) })
} }
// 同步数据到预览页 // 同步数据到预览页
export const syncDataToPreview = () => { export const syncDataToPreview = () => {
dispatchEvent(new CustomEvent(SavePageEnum.CHART_TO_PREVIEW, { detail: chartEditStore.getStorageInfo() })) dispatchEvent(new CustomEvent(SavePageEnum.CHART_TO_PREVIEW, { detail: chartEditStore.getStorageInfo }))
} }
// 侦听器更新 // 侦听器更新

View File

@ -158,7 +158,7 @@ const editHandle = () => {
// SessionStorage 便 // SessionStorage 便
const updateToSession = (id: string) => { const updateToSession = (id: string) => {
const storageInfo = chartEditStore.getStorageInfo() const storageInfo = chartEditStore.getStorageInfo
const sessionStorageInfo = getLocalStorage(StorageEnum.GO_CHART_STORAGE_LIST) || [] const sessionStorageInfo = getLocalStorage(StorageEnum.GO_CHART_STORAGE_LIST) || []
if (sessionStorageInfo?.length) { if (sessionStorageInfo?.length) {

View File

@ -9,7 +9,7 @@ export const exportHandle = () => {
// 导出数据 // 导出数据
downloadTextFile( downloadTextFile(
JSONStringify(chartEditStore.getStorageInfo() || []), JSONStringify(chartEditStore.getStorageInfo || []),
undefined, undefined,
'json' 'json'
) )

View File

@ -94,7 +94,7 @@ const previewHandle = () => {
const { id } = routerParamsInfo.params const { id } = routerParamsInfo.params
// id // id
const previewId = typeof id === 'string' ? id : id[0] const previewId = typeof id === 'string' ? id : id[0]
const storageInfo = chartEditStore.getStorageInfo() const storageInfo = chartEditStore.getStorageInfo
const sessionStorageInfo = getLocalStorage(StorageEnum.GO_CHART_STORAGE_LIST) || [] const sessionStorageInfo = getLocalStorage(StorageEnum.GO_CHART_STORAGE_LIST) || []
if (sessionStorageInfo?.length) { if (sessionStorageInfo?.length) {

View File

@ -322,7 +322,7 @@ export const useSync = () => {
// 保存数据 // 保存数据
let params = new FormData() let params = new FormData()
params.append('projectId', projectId) params.append('projectId', projectId)
params.append('content', JSONStringify(chartEditStore.getStorageInfo() || {})) params.append('content', JSONStringify(chartEditStore.getStorageInfo || {}))
const res= await saveProjectApi(params) const res= await saveProjectApi(params)
if (res && res.code === ResultEnum.SUCCESS) { if (res && res.code === ResultEnum.SUCCESS) {