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

Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

Browse Source
This commit is contained in:
李志鹏
2026-01-23 17:54:32 +08:00
parent a6bfca3b2f a1b51d5807
commit 8d0b792fd4
2 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/component/Detail/DesignDetail.vue
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 ()=>{

48
src/component/Detail/detailLeft/colorBox/index.vue
View File

@@ -100,12 +100,17 @@ export default defineComponent({
tcxToColor:'',
})
watch(()=>colorData.selectColor,async (newVal,oldVal)=>{
if(newVal.rgba && newVal.rgba?.r != null){
let data:any = await getColorName(newVal.rgba)
newVal.name = data.name
newVal.tcx = data.tcx
colorData.colorList.list[colorData.selectDetail.id][colorData.colorList.index] = newVal
data.rgba = newVal.rgba
console.log('=======',123)
if((newVal.rgba && newVal.rgba?.r != null) || newVal.gradient != null){
console.log('=======',123)
let data :any = {}
if(newVal.rgba?.r != null){
data = await getColorName(newVal.rgba)
newVal.name = data.name
newVal.tcx = data.tcx
colorData.colorList.list[colorData.selectDetail.id][colorData.colorList.index] = newVal
data.rgba = newVal.rgba
}
if(newVal.gradient){
data.gradient = newVal.gradient
}
@@ -115,6 +120,7 @@ export default defineComponent({
}
store.commit('DesignDetail/setNewDetail',value)
}else{
console.log('=======',123)
let value = {
data:{},
str:'color'
@@ -124,13 +130,11 @@ export default defineComponent({
})
watch(()=>colorData.selectDetail.id,(newVal,oldVal)=>{
if(!newVal)return
console.log(12312)
if(!colorData.colorList?.list?.[newVal]){
colorData.colorList.list[newVal] = []
}else{
return
}
console.log(12312)
let isNoSelect = false
let pushIndex = 0
for (let index = 0; index < 9; index++) {
@@ -146,7 +150,6 @@ export default defineComponent({
colorData.selectDetail.color.rgba?.b == color?.rgba?.b) ||
(JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient) && colorData.selectDetail.color.gradient)
){
console.log(123)
isNoSelect = true
colorData.selectColor = item
colorData.colorList.index = index
@@ -173,18 +176,21 @@ export default defineComponent({
}
if(!isNoSelect){
let color = colorData.selectDetail.newDetail?.color?.rgba?.r != null?colorData.selectDetail.newDetail?.color:colorData.selectDetail.color
if(color?.rgba?.r == null)return
let item = {
hex:rgbaToHex([color.rgba.r,color.rgba.g,color.rgba.b]),
id:color.id,
rgba:{
r:color.rgba.r,
g:color.rgba.g,
b:color.rgba.b,
},
tcx:color.tcx,
name:color.name,
} as any
let item:any = {}
if(color?.rgba?.r != null){
item = {
hex:rgbaToHex([color.rgba.r,color.rgba.g,color.rgba.b]),
id:color.id,
rgba:{
r:color.rgba.r,
g:color.rgba.g,
b:color.rgba.b,
},
tcx:color.tcx,
name:color.name,
} as any
}
if(color.gradient){
item.gradient = color.gradient
}