From acdfd5015f0b5b3b2187bdfd9592c57040e10730 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 9 Apr 2021 11:58:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=A7=E6=94=B9=E5=89=8D=E5=AD=98?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/widget/DeWidget/DeDrawingWidget.vue |  1 -
 frontend/src/components/widget/DeWidget/DeSelect.vue   |  7 +++++--
 frontend/src/views/panel/edit/index.vue                |  8 ++++----
 frontend/src/views/panel/filter/filterDialog.vue       | 10 +++++++---
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeDrawingWidget.vue b/frontend/src/components/widget/DeWidget/DeDrawingWidget.vue
index f558671d0d..ab37b9d57d 100644
--- a/frontend/src/components/widget/DeWidget/DeDrawingWidget.vue
+++ b/frontend/src/components/widget/DeWidget/DeDrawingWidget.vue
@@ -13,7 +13,6 @@ export default {
     const item = context.props.item
     return createElement(item.component, {
       props: {
-        options: item.options,
         element: item
       },
       on: {
diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue
index eaa45bff21..90e4c70c47 100644
--- a/frontend/src/components/widget/DeWidget/DeSelect.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelect.vue
@@ -15,16 +15,19 @@
 export default {
 
   props: {
-    options: {
+    element: {
       type: Object,
       default: null
     }
   },
   data() {
     return {
-
+      options: null
     }
   },
+  created() {
+    this.options = this.element.options
+  },
   mounted() {
     this.$nextTick(() => {
 
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 4b0354f0ea..d226d1db9c 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -74,7 +74,7 @@
       :visible.sync="filterVisible"
       custom-class="de-filter-dialog"
     >
-      <filter-dialog v-if="filterVisible" :widget-id="currentWidgetId" @re-fresh-component="reFreshComponent">
+      <filter-dialog v-if="filterVisible" :component-info="currentComponent" :widget-id="currentWidgetId" @re-fresh-component="reFreshComponent">
         <de-drawing-widget
           v-if="filterVisible && currentComponent"
           :id="'component' + currentComponent.id"
@@ -272,7 +272,7 @@ export default {
           this.currentComponent.style.top = e.offsetY
           this.currentComponent.style.left = e.offsetX
           this.currentComponent.id = newComponentId
-          this.openFilterDiolog(componentInfo.id)
+          this.openFilterDiolog()
           return
         }
         component = deepCopy(this.currentWidget)
@@ -308,8 +308,8 @@ export default {
         this.$store.commit('hideContextMenu')
       }
     },
-    openFilterDiolog(widgetId) {
-      this.currentWidgetId = widgetId
+    openFilterDiolog() {
+      this.currentWidgetId = this.currentComponent.name
       this.filterVisible = true
     },
     cancelFilter() {
diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue
index 53e5075300..d7c0b6c72e 100644
--- a/frontend/src/views/panel/filter/filterDialog.vue
+++ b/frontend/src/views/panel/filter/filterDialog.vue
@@ -159,6 +159,10 @@ export default {
     widgetId: {
       type: String,
       default: null
+    },
+    componentInfo: {
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -185,12 +189,12 @@ export default {
       if (values && values.length > 0) {
         const value = values[0]
         const fieldId = value.id
-        this.widget && this.widget.setOptionDatas && fieldValues(fieldId).then(res => {
+        this.componentInfo && this.componentInfo.setOptionDatas && fieldValues(fieldId).then(res => {
           const datas = res.data.map(item => {
             return { id: item, text: item }
           })
-          this.widget.setOptionDatas(datas)
-          this.$emit('re-fresh-component', this.widget)
+          this.componentInfo.setOptionDatas(datas)
+          this.$emit('re-fresh-component', this.componentInfo)
         })
       }
     }