diff --git a/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js
index 2f2638c14e..597eb4cb32 100644
--- a/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js
@@ -42,6 +42,12 @@ class TimeYearServiceImpl extends WidgetService {
   beforeToDraw() {
 
   }
+
+  filterFieldMethod(fields) {
+    return fields.filter(field => {
+      return field['deType'] === 1
+    })
+  }
 }
 const timeYearServiceImpl = new TimeYearServiceImpl({ name: 'timeYearWidget' })
 export default timeYearServiceImpl
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 5601493a5c..bb7a718048 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -164,3 +164,10 @@ div:focus {
 .de-filter-data-table::before {
     height: 0px !important;
 }
+
+.custom-component-class {
+    width: 100%;
+    div {
+      width: 100% !important;
+    }
+}
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 058c591897..09ea451d50 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -69,13 +69,31 @@
     </de-container>
 
     <el-dialog
+      v-if="filterVisible"
       title="过滤组件"
       :visible.sync="filterVisible"
       custom-class="de-filter-dialog"
     >
-      <filter-dialog>
-        <h1>aaaaaaaaa</h1>
+      <filter-dialog v-if="filterVisible" :widget-id="currentWidgetId">
+        <de-drawing-widget
+          v-if="filterVisible && currentComponent"
+          :id="'component' + currentComponent.id"
+          style="width: 100% !important;"
+          class="component"
+          :element="currentComponent"
+          :item="currentComponent"
+        />
       </filter-dialog>
+      <!-- <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="editPasswordVisible = false">{{ $t('commons.cancel') }}</el-button>
+        <el-button type="primary" @click="editUserPassword('editPasswordForm')">确认</el-button>
+      </div> -->
+      <div style="text-align: end !important;margin: 0 15px !important;">
+        <span slot="footer">
+          <el-button @click="cancelFilter">取 消</el-button>
+          <el-button type="primary" @click="sureFilter">确 定</el-button>
+        </span>
+      </div>
     </el-dialog>
 
   </el-container>
@@ -125,7 +143,10 @@ export default {
       showIndex: -1,
       activeName: 'attr',
       reSelectAnimateIndex: undefined,
-      filterVisible: false
+      filterVisible: false,
+      currentWidgetId: null,
+      currentWidget: null,
+      currentComponent: null
     }
   },
 
@@ -263,13 +284,17 @@ export default {
           }
         })
       } else {
-        const wd = ApplicationContext.getService(componentInfo.id)
-        if (wd.filterDialog) {
+        this.currentWidget = ApplicationContext.getService(componentInfo.id)
+        if (this.currentWidget.filterDialog) {
           this.show = false
-          this.openFilterDiolog()
+          this.currentComponent = deepCopy(this.currentWidget)
+          this.currentComponent.style.top = e.offsetY
+          this.currentComponent.style.left = e.offsetX
+          this.currentComponent.id = newComponentId
+          this.openFilterDiolog(componentInfo.id)
           return
         }
-        component = deepCopy(wd)
+        component = deepCopy(this.currentWidget)
       }
 
       component.style.top = e.offsetY
@@ -302,10 +327,22 @@ export default {
         this.$store.commit('hideContextMenu')
       }
     },
-    openFilterDiolog() {
+    openFilterDiolog(widgetId) {
+      this.currentWidgetId = widgetId
       this.filterVisible = true
+    },
+    cancelFilter() {
+      this.filterVisible = false
+      this.currentWidgetId = null
+      this.currentWidget = null
+      this.currentComponent = null
+    },
+    sureFilter() {
+      const component = deepCopy(this.currentComponent)
+      this.$store.commit('addComponent', { component })
+      this.$store.commit('recordSnapshot')
+      this.cancelFilter()
     }
-
   }
 }
 </script>
@@ -373,7 +410,6 @@ export default {
   .leftPanel {
     transform: translate(0);
   }
-
 }
 
 </style>
diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue
index 469b276624..3fdb715c38 100644
--- a/frontend/src/views/panel/filter/filterDialog.vue
+++ b/frontend/src/views/panel/filter/filterDialog.vue
@@ -122,7 +122,12 @@
           <el-col :span="24">
             <div class="filter-content">
               <el-card class="box-card">
-                <slot />
+                <div style="margin-bottom: 10px;">
+                  <span> {{ widget.label }}</span>
+                </div>
+                <div class="custom-component-class">
+                  <slot />
+                </div>
               </el-card>
 
             </div>
@@ -139,6 +144,7 @@ import DeContainer from '@/components/dataease/DeContainer'
 import DeAsideContainer from '@/components/dataease/DeAsideContainer'
 import draggable from 'vuedraggable'
 import DragItem from '@/components/DragItem'
+import { ApplicationContext } from '@/utils/ApplicationContext'
 import { groupTree, loadTable, fieldList } from '@/api/dataset/dataset'
 export default {
   name: 'FilterDialog',
@@ -149,6 +155,12 @@ export default {
     draggable,
     DragItem
   },
+  props: {
+    widgetId: {
+      type: String,
+      default: null
+    }
+  },
   data() {
     return {
       activeName: 'dataset',
@@ -163,10 +175,12 @@ export default {
         children: 'children',
         label: 'label'
       },
-      selectField: []
+      selectField: [],
+      widget: null
     }
   },
   created() {
+    this.widget = ApplicationContext.getService(this.widgetId)
     this.loadDataSetTree()
   },
 
@@ -178,7 +192,11 @@ export default {
     },
     loadDataSetTree() {
       groupTree({}).then(res => {
-        this.data = res.data
+        let datas = res.data
+        if (this.widget && this.widget.filterFieldMethod) {
+          datas = this.widget.filterFieldMethod(datas)
+        }
+        this.data = datas
       })
     },
     renderNode(h, { node, data, store }) {
@@ -414,4 +432,5 @@ export default {
       width: 100%;
       height: 100%;
   }
+
 </style>