This commit is contained in:
wxd
2024-10-14 19:50:11 +08:00
parent 00e5393ec6
commit 49fc1eb24c
2 changed files with 35 additions and 26 deletions

View File

@@ -644,6 +644,7 @@ export default defineComponent({
margin-left: calc(3rem*1.2); margin-left: calc(3rem*1.2);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden;
.modal_layout,.modal_accomplish{ .modal_layout,.modal_accomplish{
.modal_text{ .modal_text{
font-size:var(--aida-fsize1-4); font-size:var(--aida-fsize1-4);

View File

@@ -568,7 +568,7 @@ export default defineComponent({
height: exportWH * ratio[1], height: exportWH * ratio[1],
isDrawingMode: false, // 开启绘图模式 isDrawingMode: false, // 开启绘图模式
}); });
canvas.backgroundImage.clone((back)=>{ canvas.backgroundImage.clone(async (back)=>{
back.set({ back.set({
scaleX:1, scaleX:1,
scaleY:1, scaleY:1,
@@ -576,6 +576,7 @@ export default defineComponent({
top:back.top*scale , top:back.top*scale ,
}) })
exportCanvas.backgroundImage = back exportCanvas.backgroundImage = back
await new Promise((resolve, reject) => {
allObjects.forEach((item,index)=>{ allObjects.forEach((item,index)=>{
// let obj = fabric.util.object.clone(item); // let obj = fabric.util.object.clone(item);
if(item.type == 'circle')return if(item.type == 'circle')return
@@ -583,7 +584,7 @@ export default defineComponent({
item.clone((cloned)=>{ item.clone((cloned)=>{
console.log(cloned); console.log(cloned);
obj = cloned obj = cloned
console.log(obj); console.log(obj.set);
if(obj.set){ if(obj.set){
obj.set( obj.set(
{ {
@@ -593,18 +594,25 @@ export default defineComponent({
top:item.top*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
} }
// else{
// console.log(item.width,scale);
// 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)
if(index == allObjects.length - 1){
resolve('')
}
}) })
}) })
})
let position = JSON.parse(JSON.stringify(canvas.viewportTransform)) let position = JSON.parse(JSON.stringify(canvas.viewportTransform))
position[4] *= scale position[4] *= scale
position[5] *= scale position[5] *= scale