diff --git a/src/component/modules/generalMiniCanvas.vue b/src/component/modules/generalMiniCanvas.vue index d87b5d14..3f0001ca 100644 --- a/src/component/modules/generalMiniCanvas.vue +++ b/src/component/modules/generalMiniCanvas.vue @@ -2,7 +2,18 @@
-
+
+ {{ $t('exportModel.Brushwork') }}: + + + + + +
+
{{ $t('exportModel.Size') }}
@@ -18,17 +29,7 @@ {{ $t('exportModel.Color') }}
-
- {{ $t('exportModel.Brushwork') }}: - - - - - -
+
@@ -488,6 +489,8 @@ export default defineComponent({ pencilbtnStyle.value.width = canvasBtn.canvasPencilWidth[canvasBtn.canvasState]+'px' if(brushworkValue.value == 'RibbonBrush' || brushworkValue.value == 'LongfurBrush'){ canvas.freeDrawingBrush.width = 1; + pencilbtnStyle.value.height = 1+'px' + pencilbtnStyle.value.width = 1+'px' } },300) } @@ -553,7 +556,8 @@ export default defineComponent({ } let setSubmit = (liquefation)=>{ return new Promise((resolve,reject)=>{ - var allObjects = canvas.getObjects('path'); + var allObjects = canvas.getObjects(); + // return // if(allObjects.length == 0){ // return message.info(t('addDetails.jsContent1')) // } @@ -577,17 +581,29 @@ export default defineComponent({ if(item.type == 'circle')return let obj item.clone((cloned)=>{ + console.log(cloned); obj = cloned - }) - obj.set( - { - scaleX:(item.scaleX?item.scaleX:1)*scale, - scaleY:(item.scaleY?item.scaleY:1)*scale, - left:item.left*scale, - top:item.top*scale, + console.log(obj); + if(obj.set){ + obj.set( + { + scaleX:(item.scaleX?item.scaleX:1)*scale, + scaleY:(item.scaleY?item.scaleY:1)*scale, + left:item.left*scale, + top:item.top*scale, + } + ) + }else{ + obj.width = (item.width?item.width:1)*scale + obj.height = (item.height?item.height:1)*scale + obj.left = item.left*scale + obj.top = item.top*scale + } - ) - exportCanvas.add(obj) + + exportCanvas.add(obj) + }) + }) let position = JSON.parse(JSON.stringify(canvas.viewportTransform)) position[4] *= scale