diff --git a/CHANGELOG.md b/CHANGELOG.md
index 220eb36515a7314dc602e7cf48a9741502780d10..aa5e992ffaa13c311b9a7c25476418a0ebbf8373 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,12 +18,14 @@
 
 ### Changed
 
+- 更新dashboard滚动样式
 - 适配全局参数disableHomeTabs（是否禁用分页导航栏）逻辑，该参数为true时首页不显示分页导航栏
 - 适配表单多数据部件对全局参数mdCtrlConfirmBeforeRemove（多数据部件删除前是否需要确认）的支持，并统一多数据部件删除确认弹框的显示样式
 - 调整表单项组件中处理编辑器额外参数逻辑，将其迁移到控制器中处理
 
 ### Fixed
 
+- 修复数据看板引擎挂载完成时上下文无主键的情况下就去请求实体数据的问题
 - 修复树选中异常
 - 修复导入请求路径不正确异常
 - 修复菜单默认打开菜单项无权限显示问题
diff --git a/src/control/dashboard/dashboard.scss b/src/control/dashboard/dashboard.scss
index ae43a0a6db1524437d01ff7ed88870b1cd4fa3bf..81a8744e7e6e630f14f8ca530b0d69510086b74e 100644
--- a/src/control/dashboard/dashboard.scss
+++ b/src/control/dashboard/dashboard.scss
@@ -2,7 +2,7 @@
   position: relative;
   align-content:flex-start;
   height: 100%;
-  overflow-y: scroll;  
+  overflow-y: auto;  
   @include b(control-dashboard-build-btn){
     position: absolute;
     right: 0;
diff --git a/src/view-engine/portal-view-engine.ts b/src/view-engine/portal-view-engine.ts
index bc0b6b2a5da172f43046979a8d0c1270b4bba26c..21170ca42b7080e5c948883d66afafa1c79ce77c 100644
--- a/src/view-engine/portal-view-engine.ts
+++ b/src/view-engine/portal-view-engine.ts
@@ -8,6 +8,7 @@ import {
   IDashboardController,
   DEMainViewEngine,
   IApiPortalViewCall,
+  calcDeCodeNameById,
 } from '@ibiz-template/runtime';
 import { IAppView } from '@ibiz/model-core';
 
@@ -89,6 +90,10 @@ export class PortalViewEngine extends DEMainViewEngine {
     await super.onMounted();
     // 实体看板视图加载主数据
     if (this.view.model.appDataEntityId) {
+      const deName = calcDeCodeNameById(this.view.model.appDataEntityId!);
+      if (!this.view.context[deName]) {
+        return;
+      }
       await this.loadEntityData();
     }
   }