mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-20 17:54:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix color is wrong in dark theme

Browse Source
This commit is contained in:
MaysWind
2023-08-26 17:11:29 +08:00
parent 4238bde13a
commit 9f2005622a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/desktop/ColorSelect.vue
+11 -3
View File
@@ -11,7 +11,7 @@
> >
<template #selection="{ item }"> <template #selection="{ item }">
<v-label class="cursor-pointer" style="padding-top: 3px"> <v-label class="cursor-pointer" style="padding-top: 3px">
<v-icon size="28" :icon="icons.square" :color="`#${item.raw}`" /> <v-icon size="28" :icon="icons.square" :color="getFinalColor(item.raw)"/>
</v-label> </v-label>
</template> </template>
@@ -23,12 +23,12 @@
<div class="text-center" :key="colorInfo.color" v-for="colorInfo in row"> <div class="text-center" :key="colorInfo.color" v-for="colorInfo in row">
<div class="cursor-pointer" @click="color = colorInfo.color"> <div class="cursor-pointer" @click="color = colorInfo.color">
<v-icon class="ma-2" size="28" <v-icon class="ma-2" size="28"
:icon="icons.square" :color="`#${colorInfo.color}`" :icon="icons.square" :color="getFinalColor(colorInfo.color)"
v-if="!modelValue || modelValue !== colorInfo.color" /> v-if="!modelValue || modelValue !== colorInfo.color" />
<v-badge class="right-bottom-icon" color="primary" <v-badge class="right-bottom-icon" color="primary"
location="bottom right" offset-x="8" offset-y="8" :icon="icons.checked" location="bottom right" offset-x="8" offset-y="8" :icon="icons.checked"
v-if="modelValue && modelValue === colorInfo.color"> v-if="modelValue && modelValue === colorInfo.color">
<v-icon class="ma-2" size="28" :icon="icons.square" :color="`#${colorInfo.color}`" /> <v-icon class="ma-2" size="28" :icon="icons.square" :color="getFinalColor(colorInfo.color)" />
</v-badge> </v-badge>
</div> </div>
</div> </div>
@@ -39,6 +39,7 @@
</template> </template>
<script> <script>
import colorConstants from '@/consts/color.js';
import { arrayContainsFieldValue } from '@/lib/common.js'; import { arrayContainsFieldValue } from '@/lib/common.js';
import { getColorsInRows } from '@/lib/color.js'; import { getColorsInRows } from '@/lib/color.js';
import { scrollToSelectedItem } from '@/lib/ui.desktop.js'; import { scrollToSelectedItem } from '@/lib/ui.desktop.js';
@@ -87,6 +88,13 @@ export default {
hasSelectedIcon(row) { hasSelectedIcon(row) {
return arrayContainsFieldValue(row, 'id', this.modelValue); return arrayContainsFieldValue(row, 'id', this.modelValue);
}, },
getFinalColor(color) {
if (color && color !== colorConstants.defaultAccountColor) {
return '#' + color;
} else {
return 'var(--default-icon-color)';
}
},
onMenuStateChanged(state) { onMenuStateChanged(state) {
const self = this; const self = this;