From f60670cb87958d2c9012ad156a8ae40e45eb526a Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 8 Apr 2024 10:49:53 +0200 Subject: [PATCH 1/5] refs #7172 change vnselectfilter --- src/pages/Claim/Card/ClaimBasicData.vue | 36 ++++++++++++++++++------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue index c7c5ab8a2..aad003031 100644 --- a/src/pages/Claim/Card/ClaimBasicData.vue +++ b/src/pages/Claim/Card/ClaimBasicData.vue @@ -2,7 +2,7 @@ import { ref } from 'vue'; import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; - +import VnSelectFilter from 'src/components/common/VnSelectFilter.vue'; import FetchData from 'components/FetchData.vue'; import FormModel from 'components/FormModel.vue'; import VnRow from 'components/ui/VnRow.vue'; @@ -40,11 +40,7 @@ const workers = ref([]); const workersCopy = ref([]); const claimStates = ref([]); const claimStatesCopy = ref([]); - -function setWorkers(data) { - workers.value = data; - workersCopy.value = data; -} +const workersOptions = ref([]); function setClaimStates(data) { claimStates.value = data; @@ -89,8 +85,9 @@ const statesFilter = {
- - + --> + + +
Date: Wed, 10 Apr 2024 14:16:20 +0200 Subject: [PATCH 2/5] refs #7172 fix vnSelectFilter --- src/pages/Claim/Card/ClaimBasicData.vue | 47 +------------------------ 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue index aad003031..26175dab9 100644 --- a/src/pages/Claim/Card/ClaimBasicData.vue +++ b/src/pages/Claim/Card/ClaimBasicData.vue @@ -36,8 +36,6 @@ const claimFilter = { ], }; -const workers = ref([]); -const workersCopy = ref([]); const claimStates = ref([]); const claimStatesCopy = ref([]); const workersOptions = ref([]); @@ -47,25 +45,6 @@ function setClaimStates(data) { claimStatesCopy.value = data; } -const workerFilter = { - options: workers, - filterFn: (options, value) => { - const search = value.toLowerCase(); - - if (value === '') return workersCopy.value; - - return options.value.filter((row) => { - const id = row.id; - const name = row.name.toLowerCase(); - - const idMatches = id == search; - const nameMatches = name.indexOf(search) > -1; - - return idMatches || nameMatches; - }); - }, -}; - const statesFilter = { options: claimStates, filterFn: (options, value) => { @@ -87,7 +66,6 @@ const statesFilter = { :filter="{ where: { role: 'salesPerson' } }" @on-fetch="(data) => (workersOptions = data)" auto-load - limit="30" />
- - +
Date: Mon, 29 Apr 2024 09:35:57 +0200 Subject: [PATCH 4/5] refs #7172 refact VnSelect --- src/components/common/VnSelect.vue | 1 + src/pages/Claim/Card/ClaimBasicData.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue index 480d36e4f..76e7cd81f 100644 --- a/src/components/common/VnSelect.vue +++ b/src/components/common/VnSelect.vue @@ -169,6 +169,7 @@ watch(modelValue, (newValue) => { ref="vnSelectRef" :class="{ required: $attrs.required }" :rules="$attrs.required ? [requiredFieldRule] : null" + virtual-scroll-slice-size >