From 9ed4a3647562fe5cab11894ad08463d07757e889 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Mon, 26 Feb 2024 14:27:08 +0800
Subject: [PATCH] [Core] [DataSet] Supports filters `>`, `>=`

---
 core/datacap-web/src/i18n/langs/en/dataset.ts                 | 2 ++
 core/datacap-web/src/i18n/langs/zhCn/dataset.ts               | 2 ++
 core/datacap-web/src/views/admin/dataset/Expression.ts        | 4 ++--
 .../admin/dataset/components/adhoc/DatasetColumnConfigure.vue | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/datacap-web/src/i18n/langs/en/dataset.ts b/core/datacap-web/src/i18n/langs/en/dataset.ts
index 01aad636..b2e52a92 100644
--- a/core/datacap-web/src/i18n/langs/en/dataset.ts
+++ b/core/datacap-web/src/i18n/langs/en/dataset.ts
@@ -84,6 +84,8 @@ export default {
   columnExpressionIsLike: 'Is Like',
   columnExpressionIsNotLike: 'Is Not Like',
   columnExpressionIsContains: 'Is Contains',
+  columnExpressionGreaterThan: 'Greater Than',
+  columnExpressionGreaterThanOrEquals: 'Greater Than Or Equals',
   columnExpressionIsNotContains: 'Is Not Contains',
   validatorSamplingTip: 'The order by key must contain a sampling key',
   customFunction: 'Custom Function',
diff --git a/core/datacap-web/src/i18n/langs/zhCn/dataset.ts b/core/datacap-web/src/i18n/langs/zhCn/dataset.ts
index e55db65c..027476b0 100644
--- a/core/datacap-web/src/i18n/langs/zhCn/dataset.ts
+++ b/core/datacap-web/src/i18n/langs/zhCn/dataset.ts
@@ -85,6 +85,8 @@ export default {
   columnExpressionIsNotLike: '不像',
   columnExpressionIsContains: '包含',
   columnExpressionIsNotContains: '不包含',
+  columnExpressionGreaterThan: '大于',
+  columnExpressionGreaterThanOrEquals: '大于等于',
   validatorSamplingTip: '排序键中必须包含抽样键',
   customFunction: '自定义函数',
 }
diff --git a/core/datacap-web/src/views/admin/dataset/Expression.ts b/core/datacap-web/src/views/admin/dataset/Expression.ts
index 5197cd45..2faf5ba1 100644
--- a/core/datacap-web/src/views/admin/dataset/Expression.ts
+++ b/core/datacap-web/src/views/admin/dataset/Expression.ts
@@ -12,8 +12,8 @@ export enum Expression
   IS_NOT_NULL = 'NNULL',
   IS_LIKE = 'LIKE',
   IS_NOT_LIKE = 'NLIKE',
-  IS_IN = 'IS_IN',
-  IS_NOT_IN = 'IS_NOT_IN',
+  GT = 'GT',
+  GTE = 'GTE',
   IS_CONTAINS = 'IS_CONTAINS',
   IS_NOT_CONTAINS = 'IS_NOT_CONTAINS',
 }
diff --git a/core/datacap-web/src/views/admin/dataset/components/adhoc/DatasetColumnConfigure.vue b/core/datacap-web/src/views/admin/dataset/components/adhoc/DatasetColumnConfigure.vue
index f519cc50..4add7088 100644
--- a/core/datacap-web/src/views/admin/dataset/components/adhoc/DatasetColumnConfigure.vue
+++ b/core/datacap-web/src/views/admin/dataset/components/adhoc/DatasetColumnConfigure.vue
@@ -17,6 +17,8 @@
               <Option :value="Expression.IS_NOT_LIKE">{{ $t('dataset.columnExpressionIsNotLike') }}</Option>
               <Option :value="Expression.EQ">{{ $t('dataset.columnExpressionEquals') }}</Option>
               <Option :value="Expression.NE">{{ $t('dataset.columnExpressionNotEquals') }}</Option>
+              <Option :value="Expression.GT">{{ $t('dataset.columnExpressionGreaterThan') }}</Option>
+              <Option :value="Expression.GTE">{{ $t('dataset.columnExpressionGreaterThanOrEquals') }}</Option>
             </Select>
           </FormItem>
           <FormItem v-if="formState.expression