refactor: color, data structure

This commit is contained in:
Methapon2001 2024-04-10 17:22:33 +07:00
parent 4ef5499242
commit 2fb2c3bc3d
4 changed files with 15 additions and 23 deletions

View file

@ -11,6 +11,7 @@ const open = defineModel('open', { type: Boolean, default: false });
<template> <template>
<q-drawer <q-drawer
overlay overlay
behavior="mobile"
bordered bordered
class="q-pa-md" class="q-pa-md"
side="right" side="right"

View file

@ -8,6 +8,7 @@ const color: string[] = ['pink', 'violet'];
const props = defineProps<{ const props = defineProps<{
subBranch?: boolean; subBranch?: boolean;
rows: { rows: {
id: string;
name: string; name: string;
branchName: string; branchName: string;
address: string; address: string;
@ -65,8 +66,7 @@ const filter = ref('');
class="bordered" class="bordered"
:class="`table-card-color-${subBranch ? color[1] : color[0]} ${$q.dark.isActive ? 'dark-table-card' : ''} ${i === 0 ? 'color-table-header' : ''} ${i % 2 === 0 && i !== 0 ? 'color-table-row' : ''}`" :class="`table-card-color-${subBranch ? color[1] : color[0]} ${$q.dark.isActive ? 'dark-table-card' : ''} ${i === 0 ? 'color-table-header' : ''} ${i % 2 === 0 && i !== 0 ? 'color-table-row' : ''}`"
:key="i" :key="i"
v-for="([k, v], i) in Object.entries(prop.row)" v-for="([k, v], i) in Object.entries(prop.row).slice(1)"
:style="` `"
> >
<q-item-section <q-item-section
avatar avatar
@ -126,9 +126,9 @@ const filter = ref('');
} }
.table-card-color-violet { .table-card-color-violet {
--bg-table-card-header: var(--violet-4-hsl); --bg-table-card-header: var(--purple-11-hsl);
--color-table-card-header: var(--violet-0-hsl); --color-table-card-header: var(--violet-0-hsl);
--bg-table-card-row: hsla(var(--violet-4-hsl) / 0.08); --bg-table-card-row: hsla(var(--purple-11-hsl) / 0.08);
&.dark-table-card { &.dark-table-card {
--bg-table-card-row: hsla(var(--gray-9-hsl) / 1); --bg-table-card-row: hsla(var(--gray-9-hsl) / 1);
} }

View file

@ -8,7 +8,7 @@ const props = defineProps<{
}[]; }[];
}>(); }>();
const color = ['purple', 'pink', 'yellow', 'green', 'blue']; const color = ['pink', 'purple'];
</script> </script>
<template> <template>
@ -21,7 +21,7 @@ const color = ['purple', 'pink', 'yellow', 'green', 'blue'];
v-for="(v, i) in props.branch" v-for="(v, i) in props.branch"
:key="v.label" :key="v.label"
class="bordered wave col-12" class="bordered wave col-12"
:class="`color-${color[i % 5]}`" :class="`color-${color[i % 2]}`"
style=" style="
width: 200px; width: 200px;
min-width: 150px; min-width: 150px;
@ -71,23 +71,11 @@ svg {
width: 200px; width: 200px;
} }
.color-blue {
--_color-stat-card: var(--blue-5);
}
.color-purple { .color-purple {
--_color-stat-card: var(--purple-8); --_color-stat-card: var(--violet-11);
} }
.color-pink { .color-pink {
--_color-stat-card: var(--pink-8); --_color-stat-card: var(--pink-6);
}
.color-yellow {
--_color-stat-card: var(--yellow-8);
}
.color-green {
--_color-stat-card: var(--green-8);
} }
</style> </style>

View file

@ -116,6 +116,7 @@ const treeData = ref<BranchWithChildren[]>([]);
const subBranch = ref<boolean>(false); const subBranch = ref<boolean>(false);
const rowsBranch = ref< const rowsBranch = ref<
{ {
id: string;
name: string; name: string;
branchName: string; branchName: string;
address: string; address: string;
@ -164,7 +165,8 @@ async function getTree() {
rowsBranch.value = treeData.value rowsBranch.value = treeData.value
.filter((v) => v.isHeadOffice) .filter((v) => v.isHeadOffice)
.map((v) => ({ .map((v) => ({
name: v.id, id: v.id,
name: v.code,
branchName: v.name, branchName: v.name,
address: v.address, address: v.address,
telephoneNo: v.telephoneNo, telephoneNo: v.telephoneNo,
@ -362,7 +364,8 @@ async function fetchSubBranch(id: string) {
if (result) { if (result) {
rowsBranch.value = result.branch.map((v) => ({ rowsBranch.value = result.branch.map((v) => ({
name: v.id, id: v.id,
name: v.code,
branchName: v.name, branchName: v.name,
address: v.address, address: v.address,
telephoneNo: v.telephoneNo, telephoneNo: v.telephoneNo,
@ -666,7 +669,7 @@ onMounted(async () => {
<AppBox> <AppBox>
<TableCardComponent <TableCardComponent
@navigate="(v) => fetchSubBranch(v.name)" @navigate="(v) => fetchSubBranch(v.id)"
@showCard="(v) => fetchCard(v.name)" @showCard="(v) => fetchCard(v.name)"
:sub-branch="subBranch" :sub-branch="subBranch"
:rows="rowsBranch" :rows="rowsBranch"