This commit is contained in:
X1627315083
2026-01-23 17:52:55 +08:00
parent 972743d3b8
commit 2f32cee502
2 changed files with 43 additions and 30 deletions

View File

@@ -343,7 +343,7 @@ export default defineComponent({
// }
await detailDom.canvasBox.privewDetail()
await uploadSelectDetail()
await uploadElement()
// await uploadElement()
}
for(let i = 0;i<list.length;i++){
detailData.selectDetail
@@ -414,10 +414,15 @@ export default defineComponent({
}
printObjectToJSON(data.printObject.prints)
printObjectToJSON(data.trims.prints)
if((detailData.isEditPattern.value && list[i].color?.gradient) || (!detailData.isEditPattern.value && (list[i].newDetail?.color?.gradient || list[i].color?.gradient))){
gradient = list[i].newDetail?.color?.gradient || list[i].color.gradient
console.log(list[i],'=======',isCurrent)
if((list[i]?.color?.gradient)){
// if(list[i].color?.gradient || (!detailData.isEditPattern.value && (list[i].newDetail?.color?.gradient || list[i].color?.gradient))){
gradient = list[i]?.color?.gradient
console.log(gradient,list[i],gradient)
gradient.colorImg = await setGradual(gradient,320,700)
data.gradient = gradient
}else{
data.gradient = null
}
clothesList.push(data)
}
@@ -611,7 +616,7 @@ export default defineComponent({
if(detailData.isEditPattern.value && detailData.isEditPattern.value == str){
// await detailDom.canvasBox.saveCanvas()
await (detailDom.canvasBox as any).privewDetail()
if(detailData.isEditPattern.value == 'canvasEditor')await uploadElement()
if(detailData.isEditPattern.value == 'canvasEditor')await uploadSelectDetail()
detailData.isEditPattern.value = ''
}else{
// if(detailData.isEditPattern.value && (str == 'canvasEditor' || str == 'redGreenExample')){
@@ -741,6 +746,7 @@ export default defineComponent({
const uploadSelectDetail = async ()=>{//更新选中的detail
// await detailDom.canvasBox.saveCanvas()
const allInfo = await (detailDom.canvasBox as any).getCanvasElement()
console.log(allInfo)
let color:any = {}
if(allInfo.color?.color?.rgba || allInfo.color?.color?.gradient){
let canvasColor = allInfo.color.color;
@@ -758,12 +764,10 @@ export default defineComponent({
hex:rgbaToHex([canvasColor.rgba.r,canvasColor.rgba.g,canvasColor.rgba.b]),
}
}
if(canvasColor.gradient){
if(canvasColor?.gradient){
color.gradient = canvasColor.gradient
}
if(detailData.currentDetailType == 'color'){
detailData.detailLeftColorKey++
}
console.log(color,'color')
}
if(detailData.isEditPattern.value == 'canvasEditor'){
@@ -775,6 +779,7 @@ export default defineComponent({
if(detailData.currentDetailType == 'color'){
if(detailData.selectDetail.newDetail?.color)delete detailData.selectDetail.newDetail.color
detailData.selectDetail.color = color
detailData.selectDetail.gradient = color.gradient
}
if(detailData.currentDetailType == 'print'){
if(detailData.selectDetail.newDetail?.print)delete detailData.selectDetail.newDetail.print
@@ -785,7 +790,9 @@ export default defineComponent({
detailData.selectDetail.trims.prints = allInfo.trims || []
}
}
if(detailData.currentDetailType == 'color'){
detailData.detailLeftColorKey++
}
}
const canvasReload = async ()=>{