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

Merge remote-tracking branch 'origin/StableVersion' into dev_vite

Browse Source
This commit is contained in:
X1627315083
2025-09-16 13:57:24 +08:00
parent 97e5f8bd66 ffa60e26b8
commit ef432309d1
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,14 +302,15 @@ export default defineComponent({
if(detailData.currentDetailType == 'sketch' && newData){ 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}`:''
} }
console.log(list[i])
let data:any = { let data:any = {
changed:false, changed:false,
color, color,
designType:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.designType:list[i].designType, designType:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.designType:list[i].designType,
id:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.id:list[i].id, id:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.id:list[i].id,
maskMinioUrl:list[i]?.maskMinioUrl, maskMinioUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskMinioUrl,
// maskUrl:'', // maskUrl:'',
maskUrl:list[i].maskUrl, maskUrl:(newData && detailData.currentDetailType == 'sketch')?'':list[i]?.maskUrl,
// offset:[ // offset:[
// -233.13985, // -233.13985,
// 406.90964 // 406.90964

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

@@ -190,7 +190,7 @@ export default defineComponent({
}) })
} }
const frontBackChange = (value:any)=>{ const frontBackChange = (value:any)=>{
let full = detailData.frontBack.front[detailData.imgDomIndex].undividedLayer || detailData.frontBack.front[detailData.imgDomIndex].imageUrl let full = detailData.frontBack.front[detailData.imgDomIndex].undividedLayer || detailData.selectDetail.path
let size = { let size = {
...detailData.canvasConfig, ...detailData.canvasConfig,
} }

8
src/component/Detail/detailLeft/module/currentList.vue
View File

@@ -56,11 +56,13 @@ export default defineComponent({
}) })
const selectImgItem = (file:any)=>{ const selectImgItem = (file:any)=>{
if(props.type != 'models'){ if(props.type != 'models'){
if(!file.resData.minIOPath){ if(!file.resData?.minIOPath){
file.minIOPath = getMinioUrl(file.imgUrl || file.resData.url) file.minIOPath = getMinioUrl(file?.imgUrl || file?.resData?.url)
}else{
file.minIOPath = file.resData.minIOPath
} }
if(!file.designType){ if(!file.designType){
file.designType = file.resData.designType file.designType = file?.resData?.designType
} }
} }
// store.commit('DesignDetail/setNewDetail',file.resData) // store.commit('DesignDetail/setNewDetail',file.resData)

2
src/component/Detail/detailLeft/sketch.vue
View File

@@ -76,10 +76,10 @@ export default defineComponent({
selectImgItem(data) selectImgItem(data)
return return
} }
data.id = id
if(data?.imgUrl)data.url = data.imgUrl if(data?.imgUrl)data.url = data.imgUrl
let value = { let value = {
data, data,
id,
} }
if(detailData.currentDetailType == 'sketch'){ if(detailData.currentDetailType == 'sketch'){
detailData.selectDetail.sketchString = '' detailData.selectDetail.sketchString = ''

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

@@ -481,7 +481,7 @@ export default defineComponent({
align-items: center; align-items: center;
justify-content: center; justify-content: center;
img{ img{
height: auto; // height: auto;
} }
} }
} }