aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
src/component/HomePage/MoodboardUpload.vue
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);

60
src/component/modules/generalMiniCanvas.vue
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,35 +576,43 @@ export default defineComponent({
top:back.top*scale , top:back.top*scale ,
}) })
exportCanvas.backgroundImage = back exportCanvas.backgroundImage = back
allObjects.forEach((item,index)=>{ await new Promise((resolve, reject) => {
// let obj = fabric.util.object.clone(item); allObjects.forEach((item,index)=>{
if(item.type == 'circle')return // let obj = fabric.util.object.clone(item);
let obj if(item.type == 'circle')return
item.clone((cloned)=>{ let obj
console.log(cloned); item.clone((cloned)=>{
obj = cloned console.log(cloned);
console.log(obj); obj = cloned
if(obj.set){ console.log(obj.set);
obj.set( if(obj.set){
{ obj.set(
scaleX:(item.scaleX?item.scaleX:1)*scale, {
scaleY:(item.scaleY?item.scaleY:1)*scale, scaleX:(item.scaleX?item.scaleX:1)*scale,
left:item.left*scale, scaleY:(item.scaleY?item.scaleY:1)*scale,
top:item.top*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 // else{
obj.left = item.left*scale // console.log(item.width,scale);
obj.top = item.top*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)
if(index == allObjects.length - 1){
resolve('')
}
})
exportCanvas.add(obj)
}) })
}) })
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