Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: rename icons and adjust loading table #178

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Fix: rename icons and adjust loading table #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b1fb64
chore: remove checkbox label node from dom if empty
tewshi Jan 17, 2024
facdd55
fix(DataTable): maintain column size on loading, set fixed size for c…
tewshi Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/components/forms/checkbox/Checkbox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ const { hasError, hasSuccess } = useFormTextDetail(
<Icon v-else-if="modelValue" name="checkbox-fill" :size="iconSize" />
<Icon v-else name="checkbox-blank-line" :size="iconSize" />
</span>
<span :class="css.label" class="text-body-1">
<span
v-if="label || $slots.default"
:class="css.label"
class="text-body-1"
>
<slot>{{ label }}</slot>
</span>
</label>
Expand Down
86 changes: 43 additions & 43 deletions src/components/tables/DataTable.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,22 +92,22 @@ const render: StoryFn<Props> = (args) => ({
};
},
template: `
<div class="flex flex-col space-y-4">
<div class="flex items-center space-x-4">
<TextField
v-if="search !== undefined"
v-model="search"
placeholder="search"
label="search"
class="w-1/2 lg:w-2/5"
variant="outlined"
color="primary"
hide-details
/>
<span v-if="modelValue">selected: {{ modelValue.length }}</span>
</div>
<DataTable
v-bind="
<div class="flex flex-col space-y-4">
<div class="flex items-center space-x-4">
<TextField
v-if="search !== undefined"
v-model="search"
placeholder="search"
label="search"
class="w-1/2 lg:w-2/5"
variant="outlined"
color="primary"
hide-details
/>
<span v-if="modelValue">selected: {{ modelValue.length }}</span>
</div>
<DataTable
v-bind="
objectOmit(args, [
'modelValue',
'pagination',
Expand All @@ -117,26 +117,26 @@ const render: StoryFn<Props> = (args) => ({
'collapsed',
])
"
v-model="modelValue"
v-model:pagination="pagination"
v-model:sort="sort"
:search="search"
v-model:expanded="args.expanded"
v-model:group="args.group"
v-model:collapsed="args.collapsed"
:row-attr="args.rowAttr"
:rows="args.rows"
>
<template #item.action>
<Button icon variant="text" size="sm">
<Icon name="more-fill" color="primary" />
</Button>
</template>
<template v-if="args.expanded" #expanded-item>
<Card>
<template #header> Expanded content</template>
<DataTable
v-bind="
v-model="modelValue"
v-model:pagination="pagination"
v-model:sort="sort"
:search="search"
v-model:expanded="args.expanded"
v-model:group="args.group"
v-model:collapsed="args.collapsed"
:row-attr="args.rowAttr"
:rows="args.rows"
>
<template #item.action>
<Button icon variant="text" size="sm">
<Icon name="more-fill" color="primary" />
</Button>
</template>
<template v-if="args.expanded" #expanded-item>
<Card>
<template #header> Expanded content</template>
<DataTable
v-bind="
objectOmit(args, [
'modelValue',
'pagination',
Expand All @@ -146,13 +146,13 @@ const render: StoryFn<Props> = (args) => ({
'collapsed',
])
"
:row-attr="args.rowAttr"
:rows="args.rows"
/>
</Card>
</template>
</DataTable>
</div>`,
:row-attr="args.rowAttr"
:rows="args.rows"
/>
</Card>
</template>
</DataTable>
</div>`,
});

const data = [
Expand Down
14 changes: 12 additions & 2 deletions src/components/tables/DataTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,12 @@ onMounted(() => {
{ [css.tr__selected]: isSelected(row[rowIdentifier]) },
]"
>
<td v-if="selectedData" :class="css.checkbox">
<td
v-if="selectedData"
:class="css.checkbox"
colspan="1"
rowspan="1"
>
<Checkbox
:data-cy="`table-toggle-check-${index}`"
:value="isSelected(row[rowIdentifier])"
Expand All @@ -990,6 +995,8 @@ onMounted(() => {
column.cellClass,
css[`align__${column.align ?? 'start'}`],
]"
:colspan="column.colspan ?? 1"
:rowspan="column.rowspan ?? 1"
>
<slot
v-if="column.key === 'expand'"
Expand Down Expand Up @@ -1183,7 +1190,10 @@ onMounted(() => {
}

.checkbox {
@apply ps-4 w-14;
@apply px-2 w-[3.625rem] max-w-[3.625rem];
label {
@apply ml-0;
}
}

&.dense {
Expand Down
19 changes: 16 additions & 3 deletions src/components/tables/TableHead.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ export interface BaseTableColumn<T> {
align?: 'start' | 'center' | 'end';
class?: string;
cellClass?: string;
colspan?: string | number;
rowspan?: string | number;

[key: string]: any;
}
Expand Down Expand Up @@ -153,7 +155,13 @@ const getSortDirection = (key: TableColumn<T>['key']) =>
]"
>
<tr :class="css.tr">
<th v-if="selectable" :class="css.checkbox" scope="col">
<th
v-if="selectable"
:class="css.checkbox"
scope="col"
colspan="1"
rowspan="1"
>
<Checkbox
:disabled="disableCheckAll"
:indeterminate="indeterminate"
Expand All @@ -178,6 +186,8 @@ const getSortDirection = (key: TableColumn<T>['key']) =>
},
]"
scope="col"
:colspan="column.colspan ?? 1"
:rowspan="column.rowspan ?? 1"
>
<slot :column="column" :name="`header.${column.key.toString()}`">
<Badge
Expand Down Expand Up @@ -335,13 +345,16 @@ const getSortDirection = (key: TableColumn<T>['key']) =>
}

.checkbox {
@apply ps-4 w-14;
@apply px-2 w-[3.625rem] max-w-[3.625rem];
label {
@apply ml-0;
}
}
}

&__loader {
.progress {
@apply relative w-full py-8;
@apply relative py-8;
}

&_linear {
Expand Down
Loading