From 744c9a2dd43b35ec0210bbd0c01c6ed7e8322371 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 21 May 2021 16:58:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E8=BF=87=E6=BB=A4=E5=99=A8=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=AF=B9=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=BF=9B=E8=A1=8C=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                     |  3 ++-
 frontend/src/lang/tw.js                     |  3 ++-
 frontend/src/lang/zh.js                     |  3 ++-
 frontend/src/views/chart/view/ChartEdit.vue | 11 +++++++++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index ec654784a8..e6abb09e2f 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -673,7 +673,8 @@ export default {
     dimension_show: 'Dimension Show',
     quota_show: 'Quota Show',
     title_limit: 'Title cannot be greater than 50 characters',
-    filter_condition: 'Filter Condition'
+    filter_condition: 'Filter Condition',
+    filter_field_can_null: 'Filter field must choose'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 2d7d6e44b7..acdd425484 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -672,7 +672,8 @@ export default {
     dimension_show: '維度顯示',
     quota_show: '指標顯示',
     title_limit: '標題不能大於50個字符',
-    filter_condition: '過濾條件'
+    filter_condition: '過濾條件',
+    filter_field_can_null: '過濾字段必填'
   },
   dataset: {
     sheet_warn: '有多個sheet頁面，默認抽取第一個',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 9aee869067..a810cbf8d3 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -674,7 +674,8 @@ export default {
     dimension_show: '维度显示',
     quota_show: '指标显示',
     title_limit: '标题不能大于50个字符',
-    filter_condition: '过滤条件'
+    filter_condition: '过滤条件',
+    filter_field_can_null: '过滤字段必填'
   },
   dataset: {
     sheet_warn: '有多个Sheet页，默认抽取第一个',
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index df922fe19d..a78eff2284 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -797,6 +797,17 @@ export default {
       this.resultFilterEdit = false
     },
     saveResultFilter() {
+      for (let i = 0; i < this.chartForFilter.customFilter.length; i++) {
+        const f = this.chartForFilter.customFilter[i]
+        if (!f.fieldId || f.fieldId === '') {
+          this.$message({
+            message: this.$t('chart.filter_field_can_null'),
+            type: 'error',
+            showClose: true
+          })
+          return
+        }
+      }
       this.view.customFilter = this.chartForFilter.customFilter
       this.save(true)
       this.closeResultFilter()