Merge remote-tracking branch 'origin/StableVersion' into dev_vite
This commit is contained in:
@@ -74,6 +74,7 @@ const DesignDetail : Module<DesignDetail,RootState> = {
|
||||
state.frontBack.back = back
|
||||
},
|
||||
updataDetailItem(state,data){
|
||||
console.log(data)
|
||||
state.designDetail.clothes.forEach((item:any) => {
|
||||
if(item.id == state.selectDetail.id){
|
||||
for (const key in data) {
|
||||
@@ -255,7 +256,7 @@ const DesignDetail : Module<DesignDetail,RootState> = {
|
||||
})
|
||||
if(state.currentDetailType != 'models'){
|
||||
state.selectDetail.change = item.change
|
||||
if(state.selectDetail?.newDetail?.color){
|
||||
if(state.selectDetail?.newDetail?.color && currentType != 'color'){
|
||||
state.selectDetail.color = state.selectDetail?.newDetail?.color
|
||||
state.selectDetail.newDetail.color = null
|
||||
}
|
||||
@@ -272,12 +273,20 @@ const DesignDetail : Module<DesignDetail,RootState> = {
|
||||
state.selectDetail.printObject = item.printObject
|
||||
state.selectDetail.trims = item.trims
|
||||
state.selectDetail.type = item.type
|
||||
state.selectDetail.color = {
|
||||
...item.color,
|
||||
rgba:{
|
||||
r:item.color?.r,
|
||||
g:item.color?.g,
|
||||
b:item.color?.b,
|
||||
}
|
||||
}
|
||||
state.selectDetail.undividedLayer = item.undividedLayer
|
||||
if(state.selectDetail.newDetail?.sketch?.id && !state.selectDetail.id){
|
||||
state.designDetail.clothes.push(state.selectDetail)
|
||||
}
|
||||
state.selectDetail.id = item.id
|
||||
if(currentType)if(state.selectDetail.newDetail?.[currentType])delete state.selectDetail.newDetail[currentType]
|
||||
if(currentType)if(state.selectDetail.newDetail?.[currentType] && currentType != 'color')delete state.selectDetail.newDetail[currentType]
|
||||
}
|
||||
}
|
||||
if(value.fun)value.fun()
|
||||
|
||||
Reference in New Issue
Block a user