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

修复detail相关bug

Browse Source
This commit is contained in:
X1627315083
2026-01-23 14:43:19 +08:00
parent c5b7365977
commit 9cc012b851
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/component/Detail/DesignDetail.vue
View File

@@ -398,7 +398,7 @@ export default defineComponent({
partialDesign:list[i].partialDesign,
// partialDesign:detailData.isEditPattern.value?list[i].partialDesign:{},
path:(newData?.sketch && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData?.sketch.minIOPath:list[i].minIOPath,
printObject:((newData?.prints && detailData.currentDetailType == 'print' || detailData.isEditPattern.value == 'canvasEditor') && isCurrent)?{prints:newData.prints}:list[i].printObject?list[i].printObject:{prints:[]},
printObject:((newData?.print?.length>0 && (detailData.currentDetailType == 'print' || detailData.isEditPattern.value == 'canvasEditor')) && isCurrent)?{prints:newData.print}:list[i].printObject?list[i].printObject:{prints:[]},
priority,
// scale:[
// 0.5,
@@ -407,9 +407,8 @@ export default defineComponent({
scale:[scale[0]?scale[0]:1,scale[1]?scale[1]:1],
type:(newData?.sketch && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData?.sketch.level2Type || newData?.sketch.categoryValue:list[i].type,
sketchString:list[i].sketchString?list[i].sketchString:'',
trims:((newData?.trims && detailData.currentDetailType == 'element' || detailData.isEditPattern.value == 'canvasEditor') && isCurrent)?{prints:newData.trims}:list[i].trims?.prints?list[i].trims:{prints:[]},
trims:((newData?.element?.length>0 && (detailData.currentDetailType == 'element' || detailData.isEditPattern.value == 'canvasEditor')) && isCurrent)?{prints:newData.element}:list[i].trims?.prints?list[i].trims:{prints:[]},
}
console.log(JSON.parse(JSON.stringify(data)))
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))){
@@ -458,6 +457,7 @@ export default defineComponent({
let el:any = document.querySelector('.molepositon .perview_img')
let scale = 0
await new Promise<void>(async (resolve, reject) => {
if(!detailData.frontBack.body.path)resolve(true)
const img = new Image();
img.src = detailData.frontBack.body.path;
img.onload = () => {
@@ -533,7 +533,7 @@ export default defineComponent({
detailData.loadingShow = true
if((detailData.currentDetailType == 'models' && !detailData.isEditPattern.value) || (detailData.currentDetailType == 'sketch' && !detailData.isEditPattern.value) || detailData.isEditPattern.value == 'editSketch'){
await getSubmitData('preview')
if(detailData.currentDetailType == 'models' && !detailData.isEditPattern.value)return
if(detailData.currentDetailType == 'models')return detailData.loadingShow = false
await getSketchSize()
detailDom.canvasBox.changeSketchUpdateFrontBack = async ()=>{
await detailDom.canvasBox.privewDetail()
@@ -641,12 +641,13 @@ export default defineComponent({
}
const updateOtherLayers = async (str:any='all',type:any='noFirst')=>{//更新到画布图层
let otherData:any = {}
if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
console.log('detailData.selectDetail.newDetail',detailData.selectDetail)
if(str == 'all'){
await uploadSelectDetail()
otherData = {
color: type == 'first'? detailData.selectDetail.color:detailData.selectDetail.newDetail?.color,
printObject: type == 'first'? detailData.selectDetail.printObject || null:{prints:detailData.selectDetail.newDetail?.print},
trims: type == 'first'? detailData.selectDetail.trims || null:{prints:detailData.selectDetail.newDetail?.element},
color: detailData.selectDetail.color,
printObject: detailData.selectDetail.printObject || null,
trims: detailData.selectDetail.trims || null,
}
}else if(str == 'single'){
otherData = {
@@ -667,6 +668,7 @@ export default defineComponent({
}
}
if(detailData.currentDetailType == 'print'){
if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
otherData.printObject = {prints:detailData.selectDetail.newDetail?.print || []}
}
if(detailData.currentDetailType == 'element'){
@@ -691,7 +693,8 @@ export default defineComponent({
store.commit('DesignDetail/setNewDetail',printValue)
if(allInfo.color?.color?.rgba || allInfo.color?.color?.gradient){
let value:any = {
str:'color'
str:'color',
data:{},
}
let canvasColor = allInfo.color.color;
if(allInfo.color?.color?.rgba){

2
src/component/Detail/detailRight/editPrintElement.vue
View File

@@ -314,6 +314,7 @@ export default defineComponent({
str:props.type,
id:id,
}
console.log('data',value)
store.commit('DesignDetail/setNewDetail',value)
}
const sort = (list:any)=>{
@@ -473,6 +474,7 @@ export default defineComponent({
setPosition()
},{immediate: true,})
watch(()=>editPrintElementData.stateOverallSingle,(newVal)=>{
previewDetailPrintData()
let arr:any = editPrintElementData.selectDetail.newDetail?.print || editPrintElementData.selectDetail.printObject.prints
if(props.type == 'element'){
arr = editPrintElementData.selectDetail.newDetail?.element || editPrintElementData.selectDetail.trims.prints

2
src/component/Detail/model/modelPosition.vue
View File

@@ -28,7 +28,7 @@
<div class="detail_modal_item_front">
<img
style="object-fit: cover;"
:style="observerWH.width == '0px'?{width:observerWH.width+'px',height:observerWH.height+'px'}:{'object-fit': 'contain'}"
:style="observerWH.width == '0px'?{width:observerWH.width+'px',height:observerWH.height+'px'}:{width:'auto',height:'auto','object-fit': 'contain'}"
:src="designDetail.designItemUrl" alt="">
</div>
</div>