fix
This commit is contained in:
@@ -312,6 +312,7 @@ export default defineComponent({
|
|||||||
detailData.selectDetail.maskUrl = ''
|
detailData.selectDetail.maskUrl = ''
|
||||||
detailData.selectDetail.maskMinioUrl = ''
|
detailData.selectDetail.maskMinioUrl = ''
|
||||||
}
|
}
|
||||||
|
console.log(list[i])
|
||||||
let data:any = {
|
let data:any = {
|
||||||
changed:false,
|
changed:false,
|
||||||
color,
|
color,
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
@canvasInit="canvasInit"
|
@canvasInit="canvasInit"
|
||||||
@changeCanvas="changeCanvas"
|
@changeCanvas="changeCanvas"
|
||||||
is-edit
|
is-edit
|
||||||
:clothingImageUrl="selectDetail.undividedLayer || selectDetail.path"
|
:clothingImageUrl="selectDetail?.undividedLayerWithSinglePrint || selectDetail.undividedLayer || selectDetail.path"
|
||||||
showFixedLayer
|
showFixedLayer
|
||||||
:canvasJSON="canvasJSON"
|
:canvasJSON="canvasJSON"
|
||||||
:clothing-image-opts="{
|
:clothing-image-opts="{
|
||||||
@@ -136,7 +136,7 @@ export default defineComponent({
|
|||||||
}else{
|
}else{
|
||||||
if(detailData.currentView === 'redGreenExample'){
|
if(detailData.currentView === 'redGreenExample'){
|
||||||
nextTick(()=>{
|
nextTick(()=>{
|
||||||
setCanvas(detailData.selectDetail.undividedLayer || detailData.selectDetail.path).then(()=>{
|
setCanvas(detailData.selectDetail?.undividedLayerWithSinglePrint || detailData.selectDetail.undividedLayer || detailData.selectDetail.path).then(()=>{
|
||||||
detailData.canvasLoad = true
|
detailData.canvasLoad = true
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@@ -222,7 +222,7 @@ export default defineComponent({
|
|||||||
|
|
||||||
|
|
||||||
const frontBackChange = (value:any)=>{
|
const frontBackChange = (value:any)=>{
|
||||||
let full = detailData.frontBack.front[detailData.imgDomIndex].undividedLayer || detailData.selectDetail.path
|
let full = detailData.frontBack.front[detailData.imgDomIndex]?.undividedLayerWithSinglePrint || detailData.frontBack.front[detailData.imgDomIndex].undividedLayer || detailData.selectDetail.path
|
||||||
let size = {
|
let size = {
|
||||||
...detailData.canvasConfig,
|
...detailData.canvasConfig,
|
||||||
}
|
}
|
||||||
@@ -244,7 +244,6 @@ export default defineComponent({
|
|||||||
|
|
||||||
}
|
}
|
||||||
const canvasInit = (value:any)=>{
|
const canvasInit = (value:any)=>{
|
||||||
// detailDom.editCanvas.addImageToLayer(detailData.selectDetail.undividedLayer,{layerId:value.layers.value[0].id,imageMode:'contains',undoable:false})
|
|
||||||
detailData.canvasInstance = value
|
detailData.canvasInstance = value
|
||||||
detailData.getCanvasIfEdit.fun = getCanvasLength
|
detailData.getCanvasIfEdit.fun = getCanvasLength
|
||||||
detailData.isShowMark = false
|
detailData.isShowMark = false
|
||||||
@@ -328,7 +327,7 @@ export default defineComponent({
|
|||||||
});
|
});
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
setCanvas(detailData.selectDetail.undividedLayer || detailData.selectDetail.path).then(()=>{
|
setCanvas(detailData.selectDetail?.undividedLayerWithSinglePrint || detailData.selectDetail.undividedLayer || detailData.selectDetail.path).then(()=>{
|
||||||
detailData.canvasLoad = true
|
detailData.canvasLoad = true
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -202,6 +202,7 @@ export default defineComponent({
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
const addPrintELement = async (data:any)=>{
|
const addPrintELement = async (data:any)=>{
|
||||||
|
console.log(data)
|
||||||
let {scale,location} = await setScaleLocation(data)
|
let {scale,location} = await setScaleLocation(data)
|
||||||
let item = {
|
let item = {
|
||||||
angle:0,
|
angle:0,
|
||||||
|
|||||||
@@ -72,11 +72,13 @@ const DesignDetail : Module<DesignDetail,RootState> = {
|
|||||||
// front[index].style.zIndex = v.priority
|
// front[index].style.zIndex = v.priority
|
||||||
front[index].id = v.id
|
front[index].id = v.id
|
||||||
front[index].undividedLayer = v.undividedLayer
|
front[index].undividedLayer = v.undividedLayer
|
||||||
|
front[index].undividedLayerWithSinglePrint = v?.undividedLayerWithSinglePrint
|
||||||
}else{
|
}else{
|
||||||
back[index] = v.layersObject[i]
|
back[index] = v.layersObject[i]
|
||||||
back[index].style.zIndex = v.priority
|
back[index].style.zIndex = v.priority
|
||||||
back[index].id = v.id
|
back[index].id = v.id
|
||||||
back[index].undividedLayer = v.undividedLayer
|
back[index].undividedLayer = v.undividedLayer
|
||||||
|
back[index].undividedLayerWithSinglePrint = v?.undividedLayerWithSinglePrint
|
||||||
// back[index].style.zIndex = backIndex==0?v.layersObject[i]:backIndex++
|
// back[index].style.zIndex = backIndex==0?v.layersObject[i]:backIndex++
|
||||||
}
|
}
|
||||||
if(state.printZIndex < v.priority){
|
if(state.printZIndex < v.priority){
|
||||||
@@ -194,6 +196,7 @@ const DesignDetail : Module<DesignDetail,RootState> = {
|
|||||||
trims:null,
|
trims:null,
|
||||||
type:null,
|
type:null,
|
||||||
undividedLayer:null,
|
undividedLayer:null,
|
||||||
|
undividedLayerWithSinglePrint:null,
|
||||||
}
|
}
|
||||||
if(!state.currentDetailType)state.currentDetailType = 'sketch'
|
if(!state.currentDetailType)state.currentDetailType = 'sketch'
|
||||||
state.designDetail.clothes.forEach((item:any) => {
|
state.designDetail.clothes.forEach((item:any) => {
|
||||||
@@ -225,6 +228,7 @@ const DesignDetail : Module<DesignDetail,RootState> = {
|
|||||||
await new Promise((resolve, reject) => {
|
await new Promise((resolve, reject) => {
|
||||||
if(!state.frontBack?.body?.path){
|
if(!state.frontBack?.body?.path){
|
||||||
state.frontBack.front[0].undividedLayer = value.rv.clothes[0].undividedLayer
|
state.frontBack.front[0].undividedLayer = value.rv.clothes[0].undividedLayer
|
||||||
|
state.frontBack.front[0].undividedLayerWithSinglePrint = value.rv.clothes[0]?.undividedLayerWithSinglePrint
|
||||||
resolve('')
|
resolve('')
|
||||||
}
|
}
|
||||||
const img = new Image();
|
const img = new Image();
|
||||||
@@ -255,11 +259,13 @@ const DesignDetail : Module<DesignDetail,RootState> = {
|
|||||||
// state.frontBack.front[index].style.zIndex = v.priority
|
// state.frontBack.front[index].style.zIndex = v.priority
|
||||||
state.frontBack.front[index].id = item.id
|
state.frontBack.front[index].id = item.id
|
||||||
state.frontBack.front[index].undividedLayer = item.undividedLayer
|
state.frontBack.front[index].undividedLayer = item.undividedLayer
|
||||||
|
state.frontBack.front[index].undividedLayerWithSinglePrint = item?.undividedLayerWithSinglePrint
|
||||||
}else{
|
}else{
|
||||||
state.frontBack.back[index] = item.layersObject[i]
|
state.frontBack.back[index] = item.layersObject[i]
|
||||||
// state.frontBack.back[index].style.zIndex = v.priority
|
// state.frontBack.back[index].style.zIndex = v.priority
|
||||||
state.frontBack.back[index].id = item.id
|
state.frontBack.back[index].id = item.id
|
||||||
state.frontBack.back[index].undividedLayer = item.undividedLayer
|
state.frontBack.back[index].undividedLayer = item.undividedLayer
|
||||||
|
state.frontBack.back[index].undividedLayerWithSinglePrint = item?.undividedLayerWithSinglePrint
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -295,6 +301,7 @@ const DesignDetail : Module<DesignDetail,RootState> = {
|
|||||||
gradient:item.gradient,
|
gradient:item.gradient,
|
||||||
}
|
}
|
||||||
state.selectDetail.undividedLayer = item.undividedLayer
|
state.selectDetail.undividedLayer = item.undividedLayer
|
||||||
|
state.selectDetail.undividedLayerWithSinglePrint = item?.undividedLayerWithSinglePrint
|
||||||
if(state.selectDetail.newDetail?.sketch?.id && !state.selectDetail.id){
|
if(state.selectDetail.newDetail?.sketch?.id && !state.selectDetail.id){
|
||||||
state.designDetail.clothes.push(state.selectDetail)
|
state.designDetail.clothes.push(state.selectDetail)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user