From e2a5a2f440cb177038ed65bcea5314084347a483 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 19 Apr 2021 11:51:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/widget/DeWidget/DeSelect.vue   |  2 +-
 .../widget/drawServiceImpl/MySelectImpl.js    |  1 +
 .../src/views/panel/filter/filterDialog.vue   | 32 ++++++++++++++++---
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue
index ac6e7f230e..d08e699d3f 100644
--- a/frontend/src/components/widget/DeWidget/DeSelect.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelect.vue
@@ -47,7 +47,7 @@ export default {
   },
   methods: {
     changeValue(value) {
-      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 })
     }
   }
 }
diff --git a/frontend/src/components/widget/drawServiceImpl/MySelectImpl.js b/frontend/src/components/widget/drawServiceImpl/MySelectImpl.js
index 96efa05c0e..03ab4b8abe 100644
--- a/frontend/src/components/widget/drawServiceImpl/MySelectImpl.js
+++ b/frontend/src/components/widget/drawServiceImpl/MySelectImpl.js
@@ -44,6 +44,7 @@ class MySelectImpl extends DrawWidgetService {
     Object.assign(options, { name: 'mySelectWidget' })
     super(options)
     this.filterDialog = true
+    this.showSwitch = true
   }
 
   initLeftPanel() {
diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue
index bd9ef8a2da..cb5c2460eb 100644
--- a/frontend/src/views/panel/filter/filterDialog.vue
+++ b/frontend/src/views/panel/filter/filterDialog.vue
@@ -106,14 +106,17 @@
           <el-col :span="8">
             <div class="filter-options-left">
               <el-switch
-                active-text="单选"
-                inactive-text="多选"
+                v-if="widget.showSwitch"
+                v-model="componentInfo.options.attrs.multiple"
+                active-text="多选"
+                inactive-text="单选"
               />
             </div>
           </el-col>
           <el-col :span="16"><div class="filter-options-right">
-            <el-checkbox disabled>备选项1</el-checkbox>
-            <el-checkbox disabled>备选项</el-checkbox>
+            <el-checkbox v-model="customRange"><span> 自定义控制范围 </span> </el-checkbox>
+            <i :class="{'i-filter-active': customRange, 'i-filter-inactive': !customRange}" class="el-icon-setting i-filter" @click="showFilterRange" />
+            <!-- <el-checkbox disabled>备选项</el-checkbox> -->
           </div>
 
           </el-col>
@@ -182,7 +185,8 @@ export default {
       },
       selectField: [],
       widget: null,
-      fieldValues: []
+      fieldValues: [],
+      customRange: false
     }
   },
 
@@ -329,6 +333,12 @@ export default {
     closeItem(tag) {
       const index = tag.index
       this.selectField.splice(index, 1)
+    },
+    showFilterRange() {
+      // 如果不是自定义范围 直接返回
+      if (!this.customRange) {
+        return
+      }
     }
   }
 }
@@ -461,5 +471,17 @@ export default {
       width: 100%;
       height: 100%;
   }
+  .i-filter {
+    text-align: center;
+    margin-left: 5px;
+    margin-top: 1px;
+  }
+  .i-filter-inactive {
+      color: #9ea6b2!important;
+      cursor: not-allowed!important;
+  }
+  .i-filter-active {
+      cursor: pointer!important;
+  }
 
 </style>