画布增加的新功能

src/component/Detail/canvas/index.vue

@@ -5,14 +5,17 @@
 		 <div class="canvasContent" ref="canvasContent">
 			<div class="content-bottom" ref="canvasContent">
 				<div class="contet">
+							<!-- :clothingImageUrl="selectDetail?.undividedLayerWithSinglePrint || selectDetail.undividedLayer || selectDetail.path" -->
 					<div class="canvas" v-if="currentView === 'canvasEditor'" @click.stop>
 						<editCanvas v-if="canvasLoad" :config="canvasConfig" 
 							@canvasInit="canvasInit"
 							@changeCanvas="changeCanvas" 
 							is-edit
-							:clothingImageUrl="selectDetail?.undividedLayerWithSinglePrint || selectDetail.undividedLayer || selectDetail.path"
+							:clothingImageUrl="selectDetail.path"
+							:clothingImageUrl2="selectDetail.undividedLayer"
 							showFixedLayer
 							:canvasJSON="canvasJSON"
+							:otherData="otherData"
 							:clothing-image-opts="{
 								imageMode:'contains',
 							}"
@@ -108,6 +111,12 @@ export default defineComponent({
 			canvasInstance:null as any,
 			canvasJSON:'',
 			hideCanvas: computed(()=>store.state.Workspace.projectPath !== route.fullPath),
+			otherData:computed(()=>({
+				canvasId: store.state.DesignDetail.selectDetail.canvasId,
+				color: store.state.DesignDetail.selectDetail.color,
+				printObject: store.state.DesignDetail.selectDetail.printObject,
+				trims: store.state.DesignDetail.selectDetail.trims,
+			})),
 		})
 		watch(()=>detailData.selectDetail,(newValue,oldValue)=>{
 			detailData.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == newValue.id)
@@ -117,7 +126,6 @@ export default defineComponent({
 		provide('canvasType',detailData.canvasType)
 		
 		const editFront = (str:any)=>{//编辑前后片
-
 			let canvasJSON = '' as any
 			if(detailData.currentView === 'canvasEditor'){
 				sessionStorage.setItem('sketchEdit',detailDom.editCanvas.getJSON())
@@ -309,7 +317,7 @@ export default defineComponent({
 			sessionStorage.removeItem('frontBackEdit');
 			sessionStorage.removeItem('sketchEdit');
 			detailData.canvasLoad = false
-			privewDetail()
+			// privewDetail()
 		})
 		onMounted(()=>{
 			nextTick(async ()=>{