From 41871db738aadef9b9ec40d73c8dfe5975b8ec79 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Fri, 11 Nov 2022 17:12:14 +0800
Subject: [PATCH] comparators are used for filtering

---
 .../Table/src/components/AdvancedSearch.vue   | 19 ++++++++++++++++++-
 .../Table/src/types/advancedSearch.ts         |  2 ++
 .../appsettings.Development.json              |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/apps/vue/src/components/Table/src/components/AdvancedSearch.vue b/apps/vue/src/components/Table/src/components/AdvancedSearch.vue
index ee8ab6938..80241bfee 100644
--- a/apps/vue/src/components/Table/src/components/AdvancedSearch.vue
+++ b/apps/vue/src/components/Table/src/components/AdvancedSearch.vue
@@ -34,7 +34,7 @@
             <Select
               style="width: 100%;"
               v-model:value="record.comparison"
-              :options="comparisonOptions"
+              :options="getAvailableComparisonOptions(record)"
             />
           </template>
           <template v-else-if="column.dataIndex==='value'">
@@ -231,6 +231,23 @@
     return defineParams.filter(dp => !formMdel.paramters.some(fp => fp.field === dp.name));
   });
 
+  const getAvailableComparisonOptions = computed(() => {
+    return (paramter: DynamicParamter) => {
+      const defineParams = unref(defineParamsRef);
+      const defineParam = defineParams.find(p => p.name === paramter.field);
+      if (!defineParam) {
+        return comparisonOptions;
+      }
+      const availableComparator = defineParam.availableComparator ?? [];
+      if (availableComparator.length === 0) {
+        return comparisonOptions;
+      }
+      // 过滤可用比较符
+      return comparisonOptions
+        .filter(c => availableComparator.includes(c.value));
+    }
+  });
+
   const filterOption = (input: string, option: any) => {
     return option.description.toLowerCase().indexOf(input.toLowerCase()) >= 0;
   };
diff --git a/apps/vue/src/components/Table/src/types/advancedSearch.ts b/apps/vue/src/components/Table/src/types/advancedSearch.ts
index bd6a1b01d..b06251301 100644
--- a/apps/vue/src/components/Table/src/types/advancedSearch.ts
+++ b/apps/vue/src/components/Table/src/types/advancedSearch.ts
@@ -30,6 +30,8 @@ export interface DefineParamter {
   type: string;
   /** 数据类型(js) */
   javaScriptType: string;
+  /** 可用运算条件列表, 用于进一步约束字段可用比较符 */
+  availableComparator?: DynamicComparison[];
 }
 
 /** 连接条件 */
diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json
index c03b0e207..57d86bdca 100644
--- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json
+++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json
@@ -1,6 +1,6 @@
 {
   "AgileConfig": {
-    "IsEnabled": false,
+    "IsEnabled": true,
     "env": "DEV",
     "appId": "LINGYUN.Abp.TaskManagement",
     "secret": "1q2w3E*",