This commit is contained in:
X1627315083
2026-01-15 17:26:56 +08:00
parent 6780c0fbb1
commit 0c995054a2

View File

@@ -100,7 +100,6 @@ export default defineComponent({
tcxToColor:'', tcxToColor:'',
}) })
watch(()=>colorData.selectColor,async (newVal,oldVal)=>{ watch(()=>colorData.selectColor,async (newVal,oldVal)=>{
console.log(newVal)
if(newVal.rgba && newVal.rgba?.r){ if(newVal.rgba && newVal.rgba?.r){
let data:any = await getColorName(newVal.rgba) let data:any = await getColorName(newVal.rgba)
newVal.name = data.name newVal.name = data.name
@@ -138,13 +137,12 @@ export default defineComponent({
item = colorData.allBoardData.colorBoards[index] item = colorData.allBoardData.colorBoards[index]
let color = colorData.allBoardData.colorBoards?.[index] let color = colorData.allBoardData.colorBoards?.[index]
if(!color?.rgba && color?.rgbValue)color.rgba = color.rgbValue if(!color?.rgba && color?.rgbValue)color.rgba = color.rgbValue
if( if(
colorData.allBoardData.colorBoards?.[index] && colorData.allBoardData.colorBoards?.[index] &&
colorData.selectDetail.color.rgba?.r == color?.rgba?.r && colorData.selectDetail.color.rgba?.r == color?.rgba?.r &&
colorData.selectDetail.color.rgba?.g == color?.rgba?.g && colorData.selectDetail.color.rgba?.g == color?.rgba?.g &&
colorData.selectDetail.color.rgba?.b == color?.rgba?.b && colorData.selectDetail.color.rgba?.b == color?.rgba?.b ||
JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient) (JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient) && JSON.stringify(colorData.selectDetail.color.gradient))
&& colorData.selectDetail.color.rgba?.r && colorData.selectDetail.color.rgba?.r
){ ){
isNoSelect = true isNoSelect = true