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

Merge branch 'master-fetch-dev' into master-fetch

Browse Source
This commit is contained in:
奔跑的面条 2026-05-26 18:48:46 +08:00
commit 54a7042cf0
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/chart/ContentConfigurations/components/ChartData/index.vue
View File

@ -46,8 +46,8 @@ const selectOptions: SelectCreateDataType[] = [
// 无数据源 // 无数据源
const isNotData = computed(() => { const isNotData = computed(() => {
return ( return (
targetData.value.chartConfig?.chartFrame === ChartFrameEnum.STATIC || targetData.value.chartConfig?.chartFrame === ChartFrameEnum.STATIC &&
typeof targetData.value?.option?.dataset === 'undefined' !targetData.value?.option?.hasOwnProperty('dataset')
) )
}) })
</script> </script>

20
src/views/chart/hooks/useSync.hook.ts
View File

@ -2,7 +2,11 @@ import { onUnmounted } from 'vue';
import html2canvas from 'html2canvas' import html2canvas from 'html2canvas'
import { getUUID, httpErrorHandle, fetchRouteParamsLocation, base64toFile, JSONStringify, JSONParse } from '@/utils' import { getUUID, httpErrorHandle, fetchRouteParamsLocation, base64toFile, JSONStringify, JSONParse } from '@/utils'
import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
import { EditCanvasTypeEnum, ChartEditStoreEnum, ProjectInfoEnum, ChartEditStorage } from '@/store/modules/chartEditStore/chartEditStore.d' import { EditCanvasTypeEnum,
ChartEditStoreEnum, ProjectInfoEnum,
ChartEditStorage,
EditCanvasConfigEnum
} from '@/store/modules/chartEditStore/chartEditStore.d'
import { useChartHistoryStore } from '@/store/modules/chartHistoryStore/chartHistoryStore' import { useChartHistoryStore } from '@/store/modules/chartHistoryStore/chartHistoryStore'
import { StylesSetting } from '@/components/Pages/ChartItemSetting' import { StylesSetting } from '@/components/Pages/ChartItemSetting'
import { useSystemStore } from '@/store/modules/systemStore/systemStore' import { useSystemStore } from '@/store/modules/systemStore/systemStore'
@ -120,6 +124,20 @@ export const useSync = () => {
// 画布补丁处理 // 画布补丁处理
projectData.editCanvasConfig = canvasVersionUpdatePolyfill(projectData.editCanvasConfig) projectData.editCanvasConfig = canvasVersionUpdatePolyfill(projectData.editCanvasConfig)
if (projectData.editCanvasConfig[EditCanvasConfigEnum.WIDTH]) {
chartEditStore.setEditCanvasConfig(
EditCanvasConfigEnum.WIDTH,
projectData.editCanvasConfig[EditCanvasConfigEnum.WIDTH]
)
}
if (projectData.editCanvasConfig[EditCanvasConfigEnum.HEIGHT]) {
chartEditStore.setEditCanvasConfig(
EditCanvasConfigEnum.HEIGHT,
projectData.editCanvasConfig[EditCanvasConfigEnum.HEIGHT]
)
}
chartEditStore.computedScale()
// 列表组件注册 // 列表组件注册
projectData.componentList.forEach(async (e: CreateComponentType | CreateComponentGroupType) => { projectData.componentList.forEach(async (e: CreateComponentType | CreateComponentGroupType) => {
const intComponent = (target: CreateComponentType) => { const intComponent = (target: CreateComponentType) => {