diff --git a/.vscode/settings.json b/.vscode/settings.json index 5a96859..9482083 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,7 @@ { "cSpell.words": [ - "heroicons" + "heroicons", + "lucide", + "pinia" ] } \ No newline at end of file diff --git a/app/app.vue b/app/app.vue index 2b1be09..f8eacfa 100644 --- a/app/app.vue +++ b/app/app.vue @@ -1,5 +1,5 @@ diff --git a/app/components/Table/CellCompare.vue b/app/components/Table/CellCompare.vue index 9475b83..4c7b933 100644 --- a/app/components/Table/CellCompare.vue +++ b/app/components/Table/CellCompare.vue @@ -71,7 +71,7 @@ watch(
diff --git a/app/components/Table/NewTablePagination.vue b/app/components/Table/NewTablePagination.vue index 810ed8a..386f1c2 100644 --- a/app/components/Table/NewTablePagination.vue +++ b/app/components/Table/NewTablePagination.vue @@ -2,6 +2,7 @@ import { ChevronLeftIcon, ChevronRightIcon } from "@heroicons/vue/24/outline"; import { MoreHorizontal } from "lucide-vue-next"; +import { Button } from "@/components/ui/button"; import { Pagination, PaginationContent, @@ -40,7 +41,7 @@ const pageCount = computed(() => Math.ceil(props.total / props.pageSize)); @update:page="(val: number) => emits('update:page', val)" > - + - + diff --git a/app/components/Table/TableCom.vue b/app/components/Table/TableCom.vue index 7070610..0782f16 100644 --- a/app/components/Table/TableCom.vue +++ b/app/components/Table/TableCom.vue @@ -3,21 +3,22 @@ import { PlayIcon } from "@heroicons/vue/24/solid"; import { ChevronUpDownIcon } from "@/assets/Icons"; -import { cn } from "@/lib/utils"; -import { useSortableTable } from "@/utils"; - -import type { TableColumn, TableProps } from "./type"; - +import { Skeleton } from "@/components/ui/skeleton"; import { Table, TableBody, TableCell, + TableEmpty, TableFooter, TableHead, TableHeader, - TableEmpty, TableRow } from "@/components/ui/table"; +import { cn } from "@/lib/utils"; +import { useSortableTable } from "@/utils"; + +import NewTablePagination from "./NewTablePagination.vue"; +import type { TableColumn, TableProps } from "./type"; const props = defineProps>(); @@ -271,12 +272,12 @@ onMounted(() => { :class="[ cn( 'before:absolute before:top-0 before:bottom-0 before:left-0 before:w-2', - 'before:bg-linear-to-r before:from-blue-600/5 before:to-transparent', + 'before:bg-linear-to-r before:from-border before:to-transparent', 'before:pointer-events-none before:z-10 before:transition-opacity', 'before:shadow-[inset_5px_0_4px_-3px_rgba(37,99,235,0.05)]', 'after:absolute after:top-0 after:bottom-0 after:right-0 after:w-2', - 'after:bg-linear-to-l after:from-blue-600/5 after:to-transparent', + 'after:bg-linear-to-l after:from-border after:to-transparent', 'after:pointer-events-none after:z-10 after:transition-opacity', 'after:shadow-[inset_-5px_0_4px_-3px_rgba(37,99,235,0.05)]', { @@ -294,13 +295,13 @@ onMounted(() => { ref="tableEl" :class="[ cn( - 'relative bg-[#FCFDFF] text-xs 2xl:text-sm rounded-lg overflow-hidden', + 'relative bg-card text-xs 2xl:text-sm rounded-2xl overflow-hidden', props.class ) ]" > - - + + { { - +