From 400675660a0a886536625f04a826c2e73f7e2627 Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Wed, 10 Sep 2025 21:08:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0dashboard?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/control/dashboard/dashboard.scss | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 220eb3651..476fcd167 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ ### Changed +- 更新dashboard滚动样式 - 适配全局参数disableHomeTabs（是否禁用分页导航栏）逻辑，该参数为true时首页不显示分页导航栏 - 适配表单多数据部件对全局参数mdCtrlConfirmBeforeRemove（多数据部件删除前是否需要确认）的支持，并统一多数据部件删除确认弹框的显示样式 - 调整表单项组件中处理编辑器额外参数逻辑，将其迁移到控制器中处理 diff --git a/src/control/dashboard/dashboard.scss b/src/control/dashboard/dashboard.scss index ae43a0a6d..81a8744e7 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; -- Gitee From a89831519e02b74a8946dbfd0d817dd671ff832a Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Wed, 10 Sep 2025 21:14:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=BC=95=E6=93=8E=E6=8C=82=E8=BD=BD=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=97=B6=E4=B8=8A=E4=B8=8B=E6=96=87=E6=97=A0=E4=B8=BB?= =?UTF-8?q?=E9=94=AE=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E5=B0=B1=E5=8E=BB?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=AE=9E=E4=BD=93=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/view-engine/portal-view-engine.ts | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 476fcd167..aa5e992ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ ### Fixed +- 修复数据看板引擎挂载完成时上下文无主键的情况下就去请求实体数据的问题 - 修复树选中异常 - 修复导入请求路径不正确异常 - 修复菜单默认打开菜单项无权限显示问题 diff --git a/src/view-engine/portal-view-engine.ts b/src/view-engine/portal-view-engine.ts index bc0b6b2a5..21170ca42 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(); } } -- Gitee