diff --git a/src/assets/css/components/views/entityExplorer/entityList/entityList.scss b/src/assets/css/components/views/entityExplorer/entityList/entityList.scss
index 4c84feae..2b0f3d42 100644
--- a/src/assets/css/components/views/entityExplorer/entityList/entityList.scss
+++ b/src/assets/css/components/views/entityExplorer/entityList/entityList.scss
@@ -16,8 +16,8 @@
       justify-content: flex-start;
       border-radius: 2px;
       width: calc(100% - 10px);
-      height: calc(100% - 40px);
-      overflow: inherit;
+      height: 100%;
+      overflow: auto;
     }
     .entity-list--list {
       display: flex;
diff --git a/src/views/entityExplorer/entityList/EntityList.vue b/src/views/entityExplorer/entityList/EntityList.vue
index 4446632e..5c6feab8 100644
--- a/src/views/entityExplorer/entityList/EntityList.vue
+++ b/src/views/entityExplorer/entityList/EntityList.vue
@@ -7,6 +7,7 @@
       <!-- 列表式 -->
       <template v-if="listMode === 'list'">
         <div class="entity-list--list">
+          <div class="no-data" v-if="noData">No data</div>
           <div v-if="!isCollapse" @click="collapse" class="cn-entity__shadow"></div>
           <entity-row
               v-for="(data, index) in listData"
@@ -23,6 +24,7 @@
       <!-- 卡片式 -->
       <template v-else-if="listMode === 'block'">
         <div class="entity-list--block">
+          <div class="no-data" v-if="noData">No data</div>
           <entity-card
               v-for="(data, index) in listData"
               :entity="data"
@@ -63,7 +65,8 @@ export default {
       isCollapse: true,
       collapseIndex: 0,
       tableId: 'entityList',
-      listDataCopy: []
+      listDataCopy: [],
+      noData: false
     }
   },
   methods: {
@@ -78,6 +81,21 @@ export default {
       this.isCollapse = true
       this.$refs[`entityRow${this.collapseIndex}`].collapse()
     }
+  },
+  watch: {
+    listData: {
+      deep: true,
+      handler (n) {
+        if (!n || n.length === 0) {
+          this.timeout = setTimeout(() => {
+            this.noData = true
+          }, 500)
+        } else {
+          clearTimeout(this.timeout)
+          this.noData = false
+        }
+      }
+    }
   }
 }
 </script>