From e631ed9c4767527e45fdee86e2c53eda4b805070 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Mon, 8 Jul 2024 14:08:57 +0700 Subject: [PATCH] feat: refactor for path support --- .../01_branch-management/BranchCard.vue | 15 +++++++------ src/layouts/MainLayout.vue | 21 ++++++++++++------- src/pages/01_branch-management/MainPage.vue | 2 +- .../02_personnel-management/MainPage.vue | 2 +- src/pages/03_customer-management/MainPage.vue | 7 +++++-- src/pages/04_product-service/MainPage.vue | 6 +++--- src/pages/MainPage.vue | 2 +- src/stores/utils/index.ts | 12 +++++++++-- 8 files changed, 44 insertions(+), 23 deletions(-) diff --git a/src/components/01_branch-management/BranchCard.vue b/src/components/01_branch-management/BranchCard.vue index 180ac7e0..945474d5 100644 --- a/src/components/01_branch-management/BranchCard.vue +++ b/src/components/01_branch-management/BranchCard.vue @@ -35,12 +35,14 @@ defineProps<{ @click="$emit('open')" >
-
- +
+
+ +
{{ data.branchLabelName }} @@ -96,6 +98,7 @@ defineProps<{ padding: var(--size-1); position: relative; transform: rotate(45deg); + aspect-ratio: 1; &::after { content: ' '; diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index 7fa2b864..1a26d58f 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -259,13 +259,20 @@ onMounted(async () => { : 'Jobs Worker Service' }} - - {{ - utilsStore.currentTitle?.caption - ? $t(utilsStore.currentTitle?.caption) - : '' - }} - +
+ +
diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue index 50a547dc..45fdaa86 100644 --- a/src/pages/01_branch-management/MainPage.vue +++ b/src/pages/01_branch-management/MainPage.vue @@ -151,7 +151,7 @@ async function calculateStats() { onMounted(async () => { utilsStore.currentTitle.title = 'branchManagement'; - utilsStore.currentTitle.caption = 'branchManagementCaption'; + utilsStore.currentTitle.path = [{ text: 'branchManagementCaption' }]; await branchStore.fetchList({ pageSize: 99999 }); await calculateStats(); diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue index 70d769b7..0faf0fb6 100644 --- a/src/pages/02_personnel-management/MainPage.vue +++ b/src/pages/02_personnel-management/MainPage.vue @@ -453,7 +453,7 @@ async function assignFormData(idEdit: string) { onMounted(async () => { utilsStore.currentTitle.title = 'personnelManagement'; - utilsStore.currentTitle.caption = 'personnelManagementCaption'; + utilsStore.currentTitle.path = [{ text: 'personnelManagementCaption' }]; await fetchUserList(); diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue index ec1d819c..d19cff6e 100644 --- a/src/pages/03_customer-management/MainPage.vue +++ b/src/pages/03_customer-management/MainPage.vue @@ -1240,7 +1240,7 @@ async function fetchListStatsEmployeeGender() { onMounted(async () => { utilsStore.currentTitle.title = 'customerManagement'; - utilsStore.currentTitle.caption = 'customerManagementCaption'; + utilsStore.currentTitle.path = [{ text: 'customerManagementCaption' }]; const resultStats = await getStatsCustomer(); @@ -1493,7 +1493,10 @@ watch([inputSearch, currentStatus], async () => {
-
+
{ utilsStore.currentTitle.title = 'mainProductTitle'; - utilsStore.currentTitle.caption = 'mainProductCaption'; + utilsStore.currentTitle.path = [{ text: 'mainProductCaption' }]; calculateStats(); await fetchListGroups(); @@ -1229,7 +1229,7 @@ watch(inputSearchProductAndService, async () => { v-if="productMode === 'group' || productMode === 'type'" class="surface-1 col bordered rounded column no-wrap" > -
+
{{ $t('productAndServiceType') }}
@@ -1433,7 +1433,7 @@ watch(inputSearchProductAndService, async () => {