@@ -154,6 +155,7 @@ export default defineComponent({
fun:null,
},
positionKey:0,
+ isUndividedLayerWithSinglePrint:false,
})
provide('getCanvasIfEdit',detailData.getCanvasIfEdit)
@@ -207,16 +209,24 @@ export default defineComponent({
element.designType = 'Library'
}
});
+ if(!item.layersObject[0].undividedLayerWithSinglePrint){
+ detailData.isUndividedLayerWithSinglePrint = true
+ }
})
detailData.singleOveral.value = rv.singleOverall
detailData.designDetailShow = true
// this.deleteShow = false
initialize()
setRevocation()
- detailData.loadingShow = false
if(rv.singleOverall == "single"){
store.commit('DesignDetail/setDesignColthes',rv.clothes[0].id)
}
+
+
+ if(detailData.isUndividedLayerWithSinglePrint){
+ }else{
+ detailData.loadingShow = false
+ }
resolve(rv)
}
).catch(rv=>{
@@ -308,10 +318,11 @@ export default defineComponent({
`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:
'')
if(detailData.currentDetailType == 'sketch' && newData){
- color = detailData.designDetail.clothes[0].color?.rgba?.r?`${detailData.designDetail.clothes[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:''
+ color = detailData.designDetail.clothes?.[0]?.color?.rgba?.r?`${detailData.designDetail.clothes?.[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:''
detailData.selectDetail.maskUrl = ''
detailData.selectDetail.maskMinioUrl = ''
}
+ console.log(list[i])
let data:any = {
changed:false,
color,
@@ -339,7 +350,7 @@ export default defineComponent({
sketchString:list[i].sketchString?list[i].sketchString:'',
trims:(newData && detailData.currentDetailType == 'element' && isCurrent && !detailData.isEditPattern.value)?{prints:newData}:list[i].trims?.prints?list[i].trims:{prints:[]},
}
- if((list[i].color?.gradient || list[i].newDetail?.color?.gradient) && !detailData.isEditPattern.value){
+ 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
gradient.colorImg = await setGradual(gradient,320,700)
data.gradient = gradient
@@ -351,9 +362,9 @@ export default defineComponent({
const getSubmitData = async (str:string)=>{
// return
let workspace = store.state.Workspace.probjects
- if(!detailData.selectDetail.path && !detailData.selectDetail.newDetail?.sketch?.minIOPath)return
+ if(!detailData?.selectDetail?.path && !detailData?.selectDetail?.newDetail?.sketch?.minIOPath)return
let clothes:any
- if(detailData.currentDetailType == 'models'){
+ if(detailData.currentDetailType == 'models' || detailData.isUndividedLayerWithSinglePrint){
clothes = await setClothes(detailData.designDetail.clothes)
}else{
clothes = await setClothes([detailData.selectDetail])
@@ -382,6 +393,7 @@ export default defineComponent({
delete detailData.designDetail.newModel
store.commit('DesignDetail/setPraeview',value)
detailData.loadingShow = false
+ detailData.isUndividedLayerWithSinglePrint = false
canvasReload()
// setRevocation()
}).catch(res=>{
@@ -431,6 +443,12 @@ export default defineComponent({
let data = getSubmitData('preview')
store.dispatch('DesignDetail/setSubmit',data)
}
+ const modelOnLoad = ()=>{
+ if(!detailData.isUndividedLayerWithSinglePrint)return
+ setTimeout(()=>{
+ previwe()
+ })
+ }
const detailEdit = async (str:any)=>{
if(str){
if(detailData.isEditPattern.value && detailData.isEditPattern.value == str){
@@ -482,6 +500,7 @@ export default defineComponent({
oppositeRevocation,
detailEdit,
canvasReload,
+ modelOnLoad,
}
},
@@ -579,10 +598,12 @@ export default defineComponent({
display: flex;
flex-direction: column;
justify-content: space-between;
+ overflow: hidden;
}
&.isEditPattern{width: 0px;}
&.model{
- width: 45rem;
+ flex: 1;
+ // width: 45rem;
// width: 50rem;
margin: 0 8rem;
// margin: 0 10rem;
@@ -590,7 +611,10 @@ export default defineComponent({
flex-direction: column;
}
&.detailRight{
- flex: 1;
+ width: 30%;
+ &.canvas{
+ width: 60%;
+ }
display: flex;
flex-direction: column;
// padding-bottom: calc(6rem + 1rem);
diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue
index 9d3d59cc..437de717 100644
--- a/src/component/Detail/canvas/index.vue
+++ b/src/component/Detail/canvas/index.vue
@@ -10,7 +10,7 @@
@canvasInit="canvasInit"
@changeCanvas="changeCanvas"
is-edit
- :clothingImageUrl="selectDetail.undividedLayer || selectDetail.path"
+ :clothingImageUrl="selectDetail?.undividedLayerWithSinglePrint || selectDetail.undividedLayer || selectDetail.path"
showFixedLayer
:canvasJSON="canvasJSON"
:clothing-image-opts="{
@@ -136,7 +136,7 @@ export default defineComponent({
}else{
if(detailData.currentView === 'redGreenExample'){
nextTick(()=>{
- setCanvas(detailData.selectDetail.undividedLayer || detailData.selectDetail.path).then(()=>{
+ setCanvas(detailData.selectDetail?.undividedLayerWithSinglePrint || detailData.selectDetail.undividedLayer || detailData.selectDetail.path).then(()=>{
detailData.canvasLoad = true
})
})
@@ -222,7 +222,7 @@ export default defineComponent({
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 = {
...detailData.canvasConfig,
}
@@ -244,7 +244,6 @@ export default defineComponent({
}
const canvasInit = (value:any)=>{
- // detailDom.editCanvas.addImageToLayer(detailData.selectDetail.undividedLayer,{layerId:value.layers.value[0].id,imageMode:'contains',undoable:false})
detailData.canvasInstance = value
detailData.getCanvasIfEdit.fun = getCanvasLength
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
})
})
diff --git a/src/component/Detail/detailLeft/module/libraryList.vue b/src/component/Detail/detailLeft/module/libraryList.vue
index 284999c8..16d586a3 100644
--- a/src/component/Detail/detailLeft/module/libraryList.vue
+++ b/src/component/Detail/detailLeft/module/libraryList.vue
@@ -347,7 +347,7 @@ export default defineComponent({
margin-top: 1rem;
justify-content: space-between;
align-content: flex-start;
- &::-webkit-scrollbar{display: none;}
+ // &::-webkit-scrollbar{display: none;}
> .content_img_item{
width: calc((50% - 1rem));
> .content_img_item_block{
diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue
index 3f776923..12b6effc 100644
--- a/src/component/Detail/detailRight/editPrintElement.vue
+++ b/src/component/Detail/detailRight/editPrintElement.vue
@@ -70,7 +70,7 @@