From 19c7a52c482df026e70b5125f719f0a6578b1ad7 Mon Sep 17 00:00:00 2001 From: colin Date: Mon, 9 Oct 2023 14:23:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(table):=20=E4=BF=AE=E5=A4=8D=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E6=9F=A5=E8=AF=A2=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/Table/src/components/AdvancedSearch.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/vue/src/components/Table/src/components/AdvancedSearch.vue b/apps/vue/src/components/Table/src/components/AdvancedSearch.vue index 68a443166..ec55e789b 100644 --- a/apps/vue/src/components/Table/src/components/AdvancedSearch.vue +++ b/apps/vue/src/components/Table/src/components/AdvancedSearch.vue @@ -105,6 +105,7 @@ import { BasicModal, useModalInner } from '/@/components/Modal'; import { useI18n } from '/@/hooks/web/useI18n'; import { DefineParamter, DynamicLogic, DynamicComparison, DynamicQueryable, DynamicParamter } from '../types/advancedSearch'; + import { isNullOrWhiteSpace } from '/@/utils/strings'; import { isFunction } from '/@/utils/is'; import { get } from 'lodash-es'; @@ -280,7 +281,9 @@ }); const filterOption = (input: string, option: any) => { - return option.description.toLowerCase().indexOf(input.toLowerCase()) >= 0; + if (isNullOrWhiteSpace(option.label) && isNullOrWhiteSpace(option.value)) return false; + return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 || + option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0 ; }; onMounted(fetch); From ca9318ed9d0025f0f01478809f8237c203beff1f Mon Sep 17 00:00:00 2001 From: colin Date: Mon, 9 Oct 2023 14:24:51 +0800 Subject: [PATCH 2/2] feat(table): remove console log --- apps/vue/src/components/Table/src/components/AdvancedSearch.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/vue/src/components/Table/src/components/AdvancedSearch.vue b/apps/vue/src/components/Table/src/components/AdvancedSearch.vue index ec55e789b..0456a8b4f 100644 --- a/apps/vue/src/components/Table/src/components/AdvancedSearch.vue +++ b/apps/vue/src/components/Table/src/components/AdvancedSearch.vue @@ -303,7 +303,6 @@ const isArrayResult = Array.isArray(res); resultItems = isArrayResult ? res : get(res, listField || 'items'); } - console.log(resultItems); defineParamsRef.value = resultItems; }).finally(() => { setLoading(false);