From 6aab3097412dbeda7a9656ceb2567409f0347eb6 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 20 May 2021 17:44:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/widget/DeWidget/DeSelect.vue   | 19 ++++++++++++-----
 .../src/views/panel/filter/filterDialog.vue   | 21 ++++++++++++-------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue
index 1fc694bb0a..7037fae96f 100644
--- a/frontend/src/components/widget/DeWidget/DeSelect.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelect.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <el-select v-if="options!== null && options.attrs!==null" v-model="options.value" clearable :multiple="options.attrs.multiple" :placeholder="options.attrs.placeholder" @change="changeValue">
+  <el-select v-if="options!== null && options.attrs!==null" v-model="options.value" :clearable="!options.attrs.multiple" :multiple="options.attrs.multiple" :placeholder="options.attrs.placeholder" @change="changeValue">
     <el-option
       v-for="item in options.attrs.datas"
       :key="item[options.attrs.key]"
@@ -28,10 +28,15 @@ export default {
   data() {
     return {
       options: null,
-      operator: 'eq',
+      //   operator: 'eq',
       values: null
     }
   },
+  computed: {
+    operator() {
+      return this.options.attrs.multiple ? 'in' : 'eq'
+    }
+  },
   watch: {
     'options.attrs.multiple': function(value) {
       if (value) {
@@ -41,7 +46,6 @@ export default {
       }
     }
   },
-
   created() {
     this.options = this.element.options
     this.setCondition()
@@ -54,11 +58,16 @@ export default {
   methods: {
     changeValue(value) {
       this.setCondition()
-      this.inDraw && this.$emit('set-condition-value', { component: this.element, value: [value], operator: this.operator })
+      // this.inDraw && this.$emit('set-condition-value', { component: this.element, value: [value], operator: this.operator })
     },
 
     setCondition() {
-      this.inDraw && this.$store.dispatch('conditions/add', { component: this.element, value: [this.options.value], operator: this.operator })
+      const param = {
+        component: this.element,
+        value: Array.isArray(this.options.value) ? this.options.value : [this.options.value],
+        operator: this.operator
+      }
+      this.inDraw && this.$store.dispatch('conditions/add', param)
     }
   }
 }
diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue
index 169a4c90d9..1204ffe6c1 100644
--- a/frontend/src/views/panel/filter/filterDialog.vue
+++ b/frontend/src/views/panel/filter/filterDialog.vue
@@ -157,16 +157,16 @@
             </div>
           </el-col>
           <el-col :span="16"><div class="filter-options-right">
-            <el-checkbox v-model="customRange"><span>  {{ $t('panel.custom_scope') }} </span> </el-checkbox>
+            <el-checkbox v-model="componentInfo.options.attrs.enableRange" @change="enableRangeChange"><span>  {{ $t('panel.custom_scope') }} </span> </el-checkbox>
 
             <el-popover
               v-model="popovervisible"
               placement="bottom-end"
-              :disabled="!customRange"
+              :disabled="!componentInfo.options.attrs.enableRange"
               width="200"
             >
               <div class="view-container-class">
-                <el-checkbox-group v-model="checkedViews" @change="checkedViewsChange">
+                <el-checkbox-group v-model="componentInfo.options.attrs.viewIds" @change="checkedViewsChange">
                   <el-checkbox v-for="(item ) in viewInfos" :key="item.id" :label="item.id">
                     <span>
                       <svg-icon :icon-class="item.type" class="chart-icon" />
@@ -176,7 +176,7 @@
                 </el-checkbox-group>
               </div>
 
-              <i slot="reference" :class="{'i-filter-active': customRange, 'i-filter-inactive': !customRange}" class="el-icon-setting i-filter" />
+              <i slot="reference" :class="{'i-filter-active': componentInfo.options.attrs.enableRange, 'i-filter-inactive': !componentInfo.options.attrs.enableRange}" class="el-icon-setting i-filter" />
             </el-popover>
             <!-- <el-checkbox disabled>备选项</el-checkbox> -->
           </div>
@@ -257,10 +257,8 @@ export default {
       selectField: [],
       widget: null,
       fieldValues: [],
-      customRange: false,
       popovervisible: false,
-      viewInfos: [],
-      checkedViews: []
+      viewInfos: []
     }
   },
   computed: {
@@ -478,7 +476,14 @@ export default {
     },
 
     checkedViewsChange(values) {
-      this.componentInfo.options.attrs.viewIds = values
+      // this.componentInfo.options.attrs.viewIds = values
+      this.$emit('re-fresh-component', this.componentInfo)
+    },
+    enableRangeChange(value) {
+      if (!value) {
+        this.componentInfo.options.attrs.viewIds = []
+      }
+      // this.componentInfo.options.attrs.enableRange = value
       this.$emit('re-fresh-component', this.componentInfo)
     }
   }