Merge pull request #969 from q1139168548/pengdehua

feat: add NotBetween FilterSqlOperator #962

Author: Cuiyansong

frontend/src/app/pages/ChartWorkbenchPage/components/ChartOperationPanel/components/ChartFieldAction/FilterAction/SingleFilterRow.tsx

@@ -41,6 +41,7 @@ const SingleFilter: FC<{
     const t = useI18NPrefix('viz.common.enum.filterOperator');
     const operators = [
       FilterSqlOperator.Between,
+      FilterSqlOperator.NotBetween,
       FilterSqlOperator.Equal,
       FilterSqlOperator.NotEqual,
       FilterSqlOperator.GreaterThanOrEqual,
@@ -76,7 +77,7 @@ const SingleFilter: FC<{
       if (op === FilterSqlOperator.Null || op === FilterSqlOperator.NotNull) {
         return null;
       }
-      if (op === FilterSqlOperator.Between) {
+      if (op === FilterSqlOperator.Between || op === FilterSqlOperator.NotBetween) {
         return (
           <>
             <InputNumber

frontend/src/globalConstants.ts

@@ -179,6 +179,7 @@ export enum FilterSqlOperator {
   NotSuffixContain = 'SUFFIX_NOT_LIKE',
 
   Between = 'BETWEEN',
+  NotBetween = 'NOT_BETWEEN',
   In = 'IN',
   NotIn = 'NOT_IN',
   LessThan = 'LT',

frontend/src/locales/en/translation.json

@@ -309,6 +309,7 @@
           "SUFFIX_LIKE": "Suffix Contain",
           "SUFFIX_NOT_LIKE": "Not Suffix Contain",
           "BETWEEN": "Between",
+          "NOT_BETWEEN": "Not Between",
           "IN": "In",
           "NOT_IN": "Not In",
           "LT": "Less Than",

frontend/src/locales/zh/translation.json

@@ -308,7 +308,8 @@
           "PREFIX_NOT_LIKE": "前缀不包含",
           "SUFFIX_LIKE": "后缀包含",
           "SUFFIX_NOT_LIKE": "后缀不包含",
-          "BETWEEN": "区间",
+          "BETWEEN": "区间内",
+          "NOT_BETWEEN": "区间外",
           "IN": "包括",
           "NOT_IN": "不包括",
           "LT": "小于",
@@ -1342,4 +1343,4 @@
       "haveCharts": "仪表板中已有该图表，不能重复添加"
     }
   }
-}
+}