Compare commits

..

No commits in common. "44552c8a33baa036867864a2b94bf2822f0095a6" and "ad6b5d731d6d024df5747b9066c1ad8dc88b87df" have entirely different histories.

2 changed files with 3 additions and 21 deletions

View File

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

View File

@ -2,11 +2,7 @@ import { onUnmounted } from 'vue';
import html2canvas from 'html2canvas'
import { getUUID, httpErrorHandle, fetchRouteParamsLocation, base64toFile, JSONStringify, JSONParse } from '@/utils'
import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
import { EditCanvasTypeEnum,
ChartEditStoreEnum, ProjectInfoEnum,
ChartEditStorage,
EditCanvasConfigEnum
} from '@/store/modules/chartEditStore/chartEditStore.d'
import { EditCanvasTypeEnum, ChartEditStoreEnum, ProjectInfoEnum, ChartEditStorage } from '@/store/modules/chartEditStore/chartEditStore.d'
import { useChartHistoryStore } from '@/store/modules/chartHistoryStore/chartHistoryStore'
import { StylesSetting } from '@/components/Pages/ChartItemSetting'
import { useSystemStore } from '@/store/modules/systemStore/systemStore'
@ -124,20 +120,6 @@ export const useSync = () => {
// 画布补丁处理
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) => {
const intComponent = (target: CreateComponentType) => {