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

更新首次打开detail 应该使用接口数据而不是new数据

Browse Source
This commit is contained in:
X1627315083
2026-01-22 14:30:40 +08:00
parent 0de5fe276a
commit cd7d572e43
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,15 +331,15 @@ export default defineComponent({
}
const setClothes = async (list:any,str:string)=>{
let clothesList:any = []
await uploadElement()
if(detailData.isEditPattern.value == 'editSketch')await detailDom.canvasBox.submitBase64Data().then((rv)=>{
detailData.selectDetail.sketchString = rv
})
if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
if(detailDom.canvasBox && (detailData.currentDetailType != 'sketch' || detailData.isEditPattern.value == 'canvasEditor')){
let otherData = await updateOtherLayers('single')
let otherData = await updateOtherLayers(detailData.isEditPattern.value == 'canvasEditor'?'all':'single')
await detailDom.canvasBox.updateOtherLayers(otherData)
await detailDom.canvasBox.privewDetail()
await uploadElement()
}
for(let i = 0;i<list.length;i++){
detailData.selectDetail
@@ -355,7 +355,7 @@ export default defineComponent({
// 0.35822305
// ]
let isCurrent = list[i].id == detailData?.selectDetail?.id
let color = (detailData.currentDetailType == 'color' && isCurrent && !detailData.isEditPattern.value)?
let color = ((detailData.currentDetailType == 'color' && isCurrent) || detailData.isEditPattern.value == 'canvasEditor')?
(newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):
(list[i].color?.rgba?.r?
`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:
@@ -372,6 +372,8 @@ export default defineComponent({
})
}
}
console.log(newData,'========')
if(newData)console.log(JSON.parse(JSON.stringify(newData)))
let data:any = {
changed:false,
color,
@@ -390,7 +392,7 @@ export default defineComponent({
partialDesign:list[i].partialDesign,
// partialDesign:detailData.isEditPattern.value?list[i].partialDesign:{},
path:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.minIOPath:list[i].minIOPath,
printObject:(newData && detailData.currentDetailType == 'print' && isCurrent && !detailData.isEditPattern.value)?{prints:newData}:list[i].printObject?list[i].printObject:{prints:[]},
printObject:((newData && detailData.currentDetailType == 'print' && isCurrent) || detailData.isEditPattern.value == 'canvasEditor')?{prints:newData}:list[i].printObject?list[i].printObject:{prints:[]},
priority,
// scale:[
// 0.5,
@@ -399,9 +401,10 @@ export default defineComponent({
scale:[scale[0]?scale[0]:1,scale[1]?scale[1]:1],
type:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.level2Type || newData.categoryValue:list[i].type,
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:[]},
trims:((newData && detailData.currentDetailType == 'element' && isCurrent) || detailData.isEditPattern.value == 'canvasEditor')?{prints:newData}:list[i].trims?.prints?list[i].trims:{prints:[]},
accessory:(newData && detailData.currentDetailType == 'accessory' && isCurrent && !detailData.isEditPattern.value)?{prints:newData}:list[i].trims?.prints?list[i].trims:{prints:[]},
}
console.log(JSON.parse(JSON.stringify(data)))
// if(!data.partialDesign.partialDesignMinioPath){
// data.partialDesign.partialDesignMinioPath = data.path
// }
@@ -478,6 +481,7 @@ export default defineComponent({
}
const submit = async ()=>{
detailData.loadingShow = true
let workspace = store.state.Workspace.probjects
let clothes:any = await setClothes(detailData.designDetail.clothes,'sub')
let data = {
@@ -494,7 +498,6 @@ export default defineComponent({
processId:userDetail.value.userId,
probjectId:store.state.Workspace.probjects.id,
}
detailData.loadingShow = true
Https.axiosPost(Https.httpUrls.designSingle, data).then(async (rv)=>{
saveCanvasJSONToSession()
// store.commit('DesignDetail/setPraeview',rv)
@@ -526,8 +529,9 @@ export default defineComponent({
}
const previwe = async ()=>{
detailData.loadingShow = true
if((detailData.currentDetailType == 'sketch' && !detailData.isEditPattern.value) || detailData.isEditPattern.value == 'editSketch'){
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
await getSketchSize()
detailDom.canvasBox.changeSketchUpdateFrontBack = async ()=>{
await detailDom.canvasBox.privewDetail()
@@ -633,14 +637,14 @@ export default defineComponent({
});
})
}
const updateOtherLayers = async (str:any='all')=>{//更新到画布图层
const updateOtherLayers = async (str:any='all',type:any='noFirst')=>{//更新到画布图层
let otherData:any = {}
if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
if(str == 'all'){
otherData = {
color: detailData.selectDetail.newDetail?.color?.r?detailData.selectDetail.newDetail?.color:detailData.selectDetail.color,
printObject: detailData.selectDetail.newDetail?.print?.length>0?{prints:detailData.selectDetail.newDetail?.print}:detailData.selectDetail.printObject || null,
trims: detailData.selectDetail.newDetail?.element?.length>0?detailData.selectDetail.newDetail?.element:detailData.selectDetail.trims || null,
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},
}
}else if(str == 'single'){
otherData = {
@@ -661,10 +665,10 @@ export default defineComponent({
}
}
if(detailData.currentDetailType == 'print'){
otherData.printObject = detailData.selectDetail.newDetail?.print?.length>0?{prints:detailData.selectDetail.newDetail?.print}:detailData.selectDetail.printObject || null
otherData.printObject = {prints:detailData.selectDetail.newDetail?.print || []}
}
if(detailData.currentDetailType == 'element'){
otherData.trims = detailData.selectDetail.newDetail?.element?.length>0?{prints:detailData.selectDetail.newDetail?.element}:detailData.selectDetail.trims || null
otherData.trims = {prints:detailData.selectDetail.newDetail?.element || []}
}
}
return otherData

2
src/component/Detail/canvas/index.vue
View File

@@ -338,7 +338,7 @@ export default defineComponent({
// },3000)
// }
const canvasLoadJsonSuccess = async ()=>{
let otherData = await props.updateOtherLayers()
let otherData = await props.updateOtherLayers('all','first')
await updateOtherLayers(otherData)
if(detailData.changeSketchUpdateFrontBack){
await detailData.changeSketchUpdateFrontBack()

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

@@ -145,7 +145,6 @@ export default defineComponent({
colorData.selectDetail.color.rgba?.g == color?.rgba?.g &&
colorData.selectDetail.color.rgba?.b == color?.rgba?.b ||
(JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient) && colorData.selectDetail.color.gradient)
&& colorData.selectDetail.color.rgba?.r
){
console.log(123)
isNoSelect = true