修复颜色bug
This commit is contained in:
@@ -100,7 +100,6 @@ export default defineComponent({
|
|||||||
tcxToColor:'',
|
tcxToColor:'',
|
||||||
})
|
})
|
||||||
watch(()=>colorData.selectColor,async (newVal,oldVal)=>{
|
watch(()=>colorData.selectColor,async (newVal,oldVal)=>{
|
||||||
console.log('=======',123)
|
|
||||||
if((newVal.rgba && newVal.rgba?.r != null) || newVal.gradient != null){
|
if((newVal.rgba && newVal.rgba?.r != null) || newVal.gradient != null){
|
||||||
console.log('=======',123)
|
console.log('=======',123)
|
||||||
let data :any = {}
|
let data :any = {}
|
||||||
@@ -130,11 +129,12 @@ export default defineComponent({
|
|||||||
})
|
})
|
||||||
watch(()=>colorData.selectDetail.id,(newVal,oldVal)=>{
|
watch(()=>colorData.selectDetail.id,(newVal,oldVal)=>{
|
||||||
if(!newVal)return
|
if(!newVal)return
|
||||||
if(!colorData.colorList?.list?.[newVal]){
|
|
||||||
colorData.colorList.list[newVal] = []
|
colorData.colorList.list[newVal] = []
|
||||||
}else{
|
// if(!colorData.colorList?.list?.[newVal]){
|
||||||
return
|
// colorData.colorList.list[newVal] = []
|
||||||
}
|
// }else{
|
||||||
|
// // return
|
||||||
|
// }
|
||||||
let isNoSelect = false
|
let isNoSelect = false
|
||||||
let pushIndex = 0
|
let pushIndex = 0
|
||||||
for (let index = 0; index < 9; index++) {
|
for (let index = 0; index < 9; index++) {
|
||||||
@@ -151,6 +151,7 @@ export default defineComponent({
|
|||||||
(JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient) && colorData.selectDetail.color.gradient)
|
(JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient) && colorData.selectDetail.color.gradient)
|
||||||
){
|
){
|
||||||
isNoSelect = true
|
isNoSelect = true
|
||||||
|
console.log('=======',123)
|
||||||
colorData.selectColor = item
|
colorData.selectColor = item
|
||||||
colorData.colorList.index = index
|
colorData.colorList.index = index
|
||||||
}else if(color?.rgba?.r){
|
}else if(color?.rgba?.r){
|
||||||
@@ -174,6 +175,7 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
colorData.colorList.list[newVal].push(item)
|
colorData.colorList.list[newVal].push(item)
|
||||||
}
|
}
|
||||||
|
console.log('=======',isNoSelect)
|
||||||
if(!isNoSelect){
|
if(!isNoSelect){
|
||||||
let color = colorData.selectDetail.newDetail?.color?.rgba?.r != null?colorData.selectDetail.newDetail?.color:colorData.selectDetail.color
|
let color = colorData.selectDetail.newDetail?.color?.rgba?.r != null?colorData.selectDetail.newDetail?.color:colorData.selectDetail.color
|
||||||
let item:any = {}
|
let item:any = {}
|
||||||
|
|||||||
Reference in New Issue
Block a user