From d0a89b28fbb3ce031f4762ee9ab931fb7eda1212 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Mon, 10 Oct 2022 10:18:57 +0800
Subject: [PATCH] advanced queries allow fields to be used more than once

---
 .../components/Table/src/components/AdvancedSearch.vue   | 9 +++++++--
 apps/vue/src/components/Table/src/hooks/useDataSource.ts | 2 --
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/vue/src/components/Table/src/components/AdvancedSearch.vue b/apps/vue/src/components/Table/src/components/AdvancedSearch.vue
index 103b8c09c..eeffdc913 100644
--- a/apps/vue/src/components/Table/src/components/AdvancedSearch.vue
+++ b/apps/vue/src/components/Table/src/components/AdvancedSearch.vue
@@ -202,9 +202,14 @@
   ]);
 
   const getAvailableParams = computed(() => {
+    // 如果每个字段只允许出现一次则取消注释
+    // const defineParams = unref(defineParamsRef);
+    // if (!defineParams.length) return[];
+    // return defineParams.filter(dp => !formMdel.paramters.some(fp => fp.field === dp.name));
+
+    // 允许字段出现多次,用于区间查询
     const defineParams = unref(defineParamsRef);
-    if (!defineParams.length) return[];
-    return defineParams.filter(dp => !formMdel.paramters.some(fp => fp.field === dp.name));
+    return defineParams;
   });
 
   onMounted(fetch);
diff --git a/apps/vue/src/components/Table/src/hooks/useDataSource.ts b/apps/vue/src/components/Table/src/hooks/useDataSource.ts
index f86511b18..903b8e9c4 100644
--- a/apps/vue/src/components/Table/src/hooks/useDataSource.ts
+++ b/apps/vue/src/components/Table/src/hooks/useDataSource.ts
@@ -256,7 +256,6 @@ export function useDataSource(
     // 高级查询条件支持
     if (advancedSearchConfig?.useAdvancedSearch) {
       const searchInput = getFieldsValue();
-      console.log(searchInput);
       if (Reflect.has(searchInput, 'queryable') &&
           Array.isArray(searchInput.queryable?.paramters) &&
           searchInput.queryable.paramters.length > 0)
@@ -294,7 +293,6 @@ export function useDataSource(
         opt?.sortInfo ?? {},
         opt?.filterInfo ?? {},
       );
-      console.log(params);
       if (beforeFetch && isFunction(beforeFetch)) {
         params = (await beforeFetch(params)) || params;
       }