Merge pull request #1466 from dataease/pr@dev@feat_filter_enum

backend/src/main/java/io/dataease/dto/chart/ChartFieldCustomFilterDTO.java

@@ -17,4 +17,6 @@ public class ChartFieldCustomFilterDTO extends ChartViewFieldBaseDTO implements
     private List<ChartCustomFilterItemDTO> filter;
 
     private DatasetTableField field;
+
+    private List<String> enumCheckField;
 }

backend/src/main/java/io/dataease/dto/chart/ChartViewFieldBaseDTO.java

@@ -48,4 +48,6 @@ public class ChartViewFieldBaseDTO implements Serializable {
     private ChartFieldCompareDTO compareCalc;
 
     private String logic;
+
+    private String filterType;
 }

backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java

@@ -735,15 +735,11 @@ public class MysqlQueryProvider extends QueryProvider {
         for (ChartFieldCustomFilterDTO request : requestList) {
             List<SQLObj> list = new ArrayList<>();
             DatasetTableField field = request.getField();
-            List<ChartCustomFilterItemDTO> filter = request.getFilter();
-            for (ChartCustomFilterItemDTO filterItemDTO : filter) {
+
             if (ObjectUtils.isEmpty(field)) {
                 continue;
             }
-                String value = filterItemDTO.getValue();
             String whereName = "";
-                String whereTerm = transMysqlFilterTerm(filterItemDTO.getTerm());
-                String whereValue = "";
             String originName;
             if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
                 // 解析origin name中有关联的字段生成sql表达式
@@ -767,6 +763,21 @@ public class MysqlQueryProvider extends QueryProvider {
             } else {
                 whereName = originName;
             }
+
+            if (StringUtils.equalsIgnoreCase(request.getFilterType(), "enum")) {
+                if (CollectionUtils.isNotEmpty(request.getEnumCheckField())) {
+                    res.add("(" + whereName + " IN ('" + String.join("','", request.getEnumCheckField()) + "'))");
+                }
+            } else {
+                List<ChartCustomFilterItemDTO> filter = request.getFilter();
+                for (ChartCustomFilterItemDTO filterItemDTO : filter) {
+                    if (ObjectUtils.isEmpty(field)) {
+                        continue;
+                    }
+                    String value = filterItemDTO.getValue();
+                    String whereTerm = transMysqlFilterTerm(filterItemDTO.getTerm());
+                    String whereValue = "";
+
                     if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) {
                         whereValue = "";
                     } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {
@@ -793,6 +804,7 @@ public class MysqlQueryProvider extends QueryProvider {
                     res.add("(" + String.join(" " + getLogic(request.getLogic()) + " ", strList) + ")");
                 }
             }
+        }
         return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null;
     }
 

frontend/src/lang/en.js

@@ -994,7 +994,11 @@ export default {
     data_percent: 'Percent',
     compare_calc_expression: 'Expression',
     and: 'And',
-    or: 'Or'
+    or: 'Or',
+    logic_exp: 'Logic',
+    enum_exp: 'Enum',
+    pls_slc: 'Please Select',
+    filter_exp: 'Filter Value'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',

frontend/src/lang/tw.js

@@ -994,7 +994,11 @@ export default {
     data_percent: '差值百分比',
     compare_calc_expression: '計算公式',
     and: '與',
-    or: '或'
+    or: '或',
+    logic_exp: '邏輯條件',
+    enum_exp: '枚舉條件',
+    pls_slc: '請選擇',
+    filter_exp: '過濾條件'
   },
   dataset: {
     sheet_warn: '有多個 Sheet 頁，默認抽取第一個',

frontend/src/lang/zh.js

@@ -997,7 +997,11 @@ export default {
     data_percent: '差值百分比',
     compare_calc_expression: '计算公式',
     and: '与',
-    or: '或'
+    or: '或',
+    logic_exp: '逻辑条件',
+    enum_exp: '枚举条件',
+    pls_slc: '请选择',
+    filter_exp: '过滤条件'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',

frontend/src/views/chart/components/filter/ResultFilterEditor.vue

 <template>
   <el-col>
+    <div v-if="item.deType === 0 || item.deType === 5">
+      <el-radio-group
+        v-model="filterType"
+        size="mini"
+        style="margin-bottom: 10px;"
+        @change="filterTypeChange"
+      >
+        <el-radio label="logic">{{ $t('chart.logic_exp') }}</el-radio>
+        <el-radio label="enum">{{ $t('chart.enum_exp') }}</el-radio>
+      </el-radio-group>
+    </div>
+
+    <div v-if="((item.deType === 0 || item.deType === 5) && filterType === 'logic') || item.deType === 1 || item.deType === 2 || item.deType === 3">
       <div style="display: inline-block;">
         <el-button icon="el-icon-plus" circle size="mini" style="margin-bottom: 10px;" @click="addFilter" />
         <el-radio-group
@@ -12,7 +25,6 @@
           <el-radio-button label="or">{{ $t('chart.or') }}</el-radio-button>
         </el-radio-group>
       </div>
-
       <div style="max-height: 50vh;overflow-y: auto;">
         <el-row v-for="(f,index) in item.filter" :key="index" class="filter-item">
           <el-col :span="4">
@@ -42,11 +54,31 @@
           </el-col>
         </el-row>
       </div>
+    </div>
+
+    <div v-if="(item.deType === 0 || item.deType === 5) && filterType === 'enum'">
+      <span style="margin-right: 10px;">{{ $t('chart.filter_exp') }}</span>
+      <el-select
+        v-model="enumCheckField"
+        filterable
+        multiple
+        :placeholder="$t('chart.pls_slc')"
+        size="mini"
+        @change="enumChange"
+      >
+        <el-option
+          v-for="field in fieldOptions"
+          :key="field.id"
+          :label="field.text"
+          :value="field.id"
+        />
+      </el-select>
+    </div>
   </el-col>
 </template>
 
 <script>
-// import { fieldList } from '../../../../api/dataset/dataset'
+import { multFieldValues } from '@/api/dataset/dataset'
 
 export default {
   name: 'ResultFilterEditor',
@@ -169,7 +201,10 @@ export default {
         }
       ],
       options: [],
-      logic: ''
+      logic: '',
+      filterType: '',
+      enumCheckField: [],
+      fieldOptions: []
     }
   },
   watch: {
@@ -195,6 +230,21 @@ export default {
     },
     init() {
       this.logic = this.item.logic
+      this.filterType = this.item.filterType
+      this.enumCheckField = this.item.enumCheckField
+      // 查找枚举的
+      multFieldValues([this.item.id]).then(res => {
+        this.fieldOptions = this.optionDatas(res.data)
+      })
+    },
+    optionDatas(datas) {
+      if (!datas) return null
+      return datas.filter(item => !!item).map(item => {
+        return {
+          id: item,
+          text: item
+        }
+      })
     },
     addFilter() {
       this.item.filter.push({
@@ -208,13 +258,19 @@ export default {
     },
     logicChange(val) {
       this.item.logic = val
+    },
+    filterTypeChange(val) {
+      this.item.filterType = val
+    },
+    enumChange(val) {
+      this.item.enumCheckField = this.enumCheckField
     }
   }
 }
 </script>
 
 <style scoped>
-.filter-item{
+  .filter-item{
     width: 100%;
     border-radius: 4px;
     border: 1px solid #DCDFE6;
@@ -223,10 +279,10 @@ export default {
     display: flex;
     justify-content: left;
     align-items: center;
-}
-.form-item>>>.el-form-item__label{
+  }
+  .form-item>>>.el-form-item__label{
     font-size: 12px;
-}
+  }
   span{
     font-size: 12px;
   }

frontend/src/views/chart/view/ChartEdit.vue

@@ -1656,12 +1656,22 @@ export default {
       if (!this.filterItem.logic) {
         this.filterItem.logic = 'and'
       }
+      if (!this.filterItem.filterType) {
+        this.filterItem.filterType = 'logic'
+      }
+      if (!this.filterItem.enumCheckField) {
+        this.filterItem.enumCheckField = []
+      }
       this.resultFilterEdit = true
     },
     closeResultFilter() {
       this.resultFilterEdit = false
     },
     saveResultFilter() {
+      if (((this.filterItem.deType === 0 || this.filterItem.deType === 5) && this.filterItem.filterType !== 'enum') ||
+          this.filterItem.deType === 1 ||
+          this.filterItem.deType === 2 ||
+          this.filterItem.deType === 3) {
         for (let i = 0; i < this.filterItem.filter.length; i++) {
           const f = this.filterItem.filter[i]
           if (!f.term.includes('null') && !f.term.includes('empty') && (!f.value || f.value === '')) {
@@ -1673,8 +1683,12 @@ export default {
             return
           }
         }
+      }
+
       this.view.customFilter[this.filterItem.index].filter = this.filterItem.filter
       this.view.customFilter[this.filterItem.index].logic = this.filterItem.logic
+      this.view.customFilter[this.filterItem.index].filterType = this.filterItem.filterType
+      this.view.customFilter[this.filterItem.index].enumCheckField = this.filterItem.enumCheckField
       this.calcData(true)
       this.closeResultFilter()
     },