From ad08a6b4d51ff2c31054019771e84435415a5def Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Thu, 26 Jan 2023 12:10:13 +0300 Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D0=B0=D0=B3=D0=B8=D0=BD=D0=B0=D1=86=D0=B8=D1=8E?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BA=D0=B2=D0=B0=D0=B7=D0=B0=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D1=81=D0=BA=D1=83=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/BasePagination.vue | 15 +- .../components/ClientTablePagination.vue | 147 ------------------ src/pages/clients/components/ClientsTable.vue | 27 ++-- 3 files changed, 23 insertions(+), 166 deletions(-) delete mode 100644 src/pages/clients/components/ClientTablePagination.vue diff --git a/src/components/base/BasePagination.vue b/src/components/base/BasePagination.vue index abcea0a..f51ccbb 100644 --- a/src/components/base/BasePagination.vue +++ b/src/components/base/BasePagination.vue @@ -3,9 +3,12 @@ q-pagination( v-model="value", :max="max", + :min="min", :max-pages="maxPages", + :size="`${size}px`", :boundary-numbers="boundaryNumbers", - :direction-links="directionLinks" + :direction-links="directionLinks", + @click="chCurrentPage" ) @@ -18,6 +21,10 @@ export default { default: 1, type: Number, }, + min: { + default: 1, + type: Number, + }, maxPages: { default: 6, type: Number, @@ -30,6 +37,12 @@ export default { default: false, type: Boolean, }, + size: Number, + }, + methods: { + chCurrentPage() { + this.$emit("st-current-page", this.value); + }, }, }; diff --git a/src/pages/clients/components/ClientTablePagination.vue b/src/pages/clients/components/ClientTablePagination.vue deleted file mode 100644 index 5480ccf..0000000 --- a/src/pages/clients/components/ClientTablePagination.vue +++ /dev/null @@ -1,147 +0,0 @@ - - - - - diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue index a0b03b4..21616fe 100644 --- a/src/pages/clients/components/ClientsTable.vue +++ b/src/pages/clients/components/ClientsTable.vue @@ -36,18 +36,14 @@ :created-client-name="createdClientName", @recover-client="clearDeletedRowId", ) - client-table-pagination( + base-pagination( v-if="paginationInfo.length > 1" - :pagination-info="paginationInfo" - @previous-page="switchPreviousPage", - @next-page="switchNextPage", - @set-current-page="changeCurrentTablePage" + :max="paginationInfo.length", + :value="currentTablePage", + :size="18" + @st-current-page="changeCurrentTablePage", + directionLinks ) - //- base-pagination( - //- :max="paginationInfo.length", - //- :value="currentTablePage", - //- directionLinks - //- ) base-modal( v-model="showModal", :title="titleModal" @@ -68,12 +64,13 @@ import ClientsTableHeader from "@/pages/clients/components/ClientsTableHeader"; import ClientsTableHat from "@/pages/clients/components/ClientsTableHat"; import ClientsTableRow from "@/pages/clients/components/ClientsTableRow"; import ClientsTableCheckbox from "@/pages/clients/components/ClientsTableCheckbox"; -import ClientTablePagination from "./ClientTablePagination.vue"; +import BaseClientFormCreate from "@/components/base/BaseClientFormCreate"; import BaseModal from "@/components/base/BaseModal.vue"; import ClientTableModal from "./ClientTableModal.vue"; import FormCreateMedicalCard from "@/pages/clients/components/FormCreateMedicalCard"; import BaseLoader from "@/components/Loader/BaseLoader.vue"; import BasePagination from "@/components/base/BasePagination.vue"; + export default { name: "ClientsTable", components: { @@ -81,7 +78,7 @@ export default { ClientsTableRow, ClientsTableHat, ClientsTableHeader, - ClientTablePagination, + BaseClientFormCreate, BaseModal, ClientTableModal, FormCreateMedicalCard, @@ -250,12 +247,6 @@ export default { } } }, - switchPreviousPage() { - this.currentTablePage -= 1; - }, - switchNextPage() { - this.currentTablePage += 1; - }, changeCurrentTablePage(value) { this.currentTablePage = value; },