fix

src/component/Canvas/canvasContent.vue

@@ -17,10 +17,12 @@
 	import { defineComponent,ref,reactive,nextTick,toRefs,inject,createVNode, onMounted} from 'vue'
 	import { Modal,message } from 'ant-design-vue';
 	import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+	import { useStore } from "vuex";
 	import { useI18n } from 'vue-i18n'
 	export default defineComponent({
 		component:{},
 		setup(){
+			const store = useStore();
 			let {t} = useI18n()
 			let canvasType = inject('canvasType')
 			let canvasGeneral:any = inject('canvasObj')
@@ -33,12 +35,17 @@
 				
 			})
 			const createCanvas = (canvasSize:any)=>{
-				data.isPresuppose = false
-				nextTick(()=>{
-					canvasGeneral.canvasInit(data.canvasDom,canvasSize)
-					console.log(canvasGeneral);
-
+				return new Promise(async (resolve,reject)=>{
+					data.isPresuppose = false
+					await nextTick(async ()=>{
+						await canvasGeneral.canvasInit(data.canvasDom,{
+							width:data.canvasDom.offsetWidth,
+							height:data.canvasDom.offsetHeight,
+						})
+						resolve('')	
+					})
 				})
+				
 			}
 			const openMode = (data:any)=>{
 				let {yes,no} = data
@@ -95,6 +102,13 @@
 				let canvasSize = {width,height}
 				createCanvas(canvasSize)
 			}
+			const openSetData =async ()=>{
+				let oldCanvas = store.state.HomeStoreModule.canvasData?.canvas
+				if(oldCanvas){
+					await createCanvas({})
+					canvasGeneral.setLoadFromJSON(oldCanvas, () => {});
+				}
+			}
 			onMounted(()=>{
 				if(canvasType == 'export'){
 					data.isPresuppose = true
@@ -107,6 +121,7 @@
 				canvasGeneral,
 				...toRefs(data),
 				setPresuppose,
+				openSetData,
 			}
 		}
 	});