From 2e2abec4c2cae76e7cde5e00e7f4f868bab97c65 Mon Sep 17 00:00:00 2001 From: ShineKOT <1917095344@qq.com> Date: Wed, 10 Sep 2025 14:12:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=89=93=E5=BC=80=E8=8F=9C=E5=8D=95=E9=A1=B9?= =?UTF-8?q?=E6=97=A0=E6=9D=83=E9=99=90=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/runtime/CHANGELOG.md | 1 + .../control/app-menu/app-menu.controller.ts | 23 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/packages/runtime/CHANGELOG.md b/packages/runtime/CHANGELOG.md index 8018ddef8..687374862 100644 --- a/packages/runtime/CHANGELOG.md +++ b/packages/runtime/CHANGELOG.md @@ -28,6 +28,7 @@ - 修复树选中异常 - 修复导入请求路径不正确异常 +- 修复菜单默认打开菜单项无权限显示问题 ## [0.7.41-alpha.23] - 2025-09-04 diff --git a/packages/runtime/src/controller/control/app-menu/app-menu.controller.ts b/packages/runtime/src/controller/control/app-menu/app-menu.controller.ts index ec1f56426..8378a43f0 100644 --- a/packages/runtime/src/controller/control/app-menu/app-menu.controller.ts +++ b/packages/runtime/src/controller/control/app-menu/app-menu.controller.ts @@ -343,15 +343,26 @@ export class AppMenuController } /** - * 获取默认打开视图 - * - * @return {*} {(string | undefined)} + * @description 获取默认打开菜单项 + * @returns {*} {(IAppMenuItem | undefined)} * @memberof AppMenuController */ - getDefaultOpenView(): string | undefined { - const menu = this.getAllItems().find( - item => item.openDefault && !item.hidden, + getDefaultOpenMenuItem(): IAppMenuItem | undefined { + return this.getAllItems().find( + item => + item.openDefault && + !item.hidden && + this.state.menuItemsState[item.id!].visible, ); + } + + /** + * @description 获取默认打开视图 + * @returns {*} {(string | undefined)} + * @memberof AppMenuController + */ + getDefaultOpenView(): string | undefined { + const menu = this.getDefaultOpenMenuItem(); if (!menu || !menu.appFuncId) return; const appFunc = ibiz.hub.getApp(menu.appId).getAppFunc(menu.appFuncId); return appFunc?.appFuncType === 'APPVIEW' ? appFunc.appViewId : undefined; -- Gitee From beeaa2bec7642b42735ac52aaea38bf08f7a0466 Mon Sep 17 00:00:00 2001 From: ShineKOT <1917095344@qq.com> Date: Wed, 10 Sep 2025 14:47:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=88=90=E5=91=98=E7=82=B9=E5=87=BB=E6=9C=AA=E4=BC=A0=E9=80=92?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/vue3-util/CHANGELOG.md | 4 ++++ .../panel-container-image/panel-container-image.tsx | 4 +--- .../panel-component/panel-container/panel-container.tsx | 4 +--- .../panel-ctrl-view-page-caption.tsx | 4 +--- .../src/panel-component/panel-field/panel-field.tsx | 4 +--- .../panel-item-render/panel-item-render.tsx | 8 +++++++- .../src/panel-component/panel-rawitem/panel-rawitem.tsx | 8 ++------ 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/packages/vue3-util/CHANGELOG.md b/packages/vue3-util/CHANGELOG.md index edce150c9..e4008ba8e 100644 --- a/packages/vue3-util/CHANGELOG.md +++ b/packages/vue3-util/CHANGELOG.md @@ -7,6 +7,10 @@ ## [Unreleased] +### Fixed + +- 修复面板成员点击未传递事件源 + ## [0.7.41-alpha.22] - 2025-08-29 ### Added diff --git a/packages/vue3-util/src/panel-component/panel-container-image/panel-container-image.tsx b/packages/vue3-util/src/panel-component/panel-container-image/panel-container-image.tsx index 62330860f..608a77cee 100644 --- a/packages/vue3-util/src/panel-component/panel-container-image/panel-container-image.tsx +++ b/packages/vue3-util/src/panel-component/panel-container-image/panel-container-image.tsx @@ -93,9 +93,7 @@ export const PanelContainerImage = defineComponent({ return (
{ - this.controller.onClick(); - }} + onClick={event => this.controller.onClick(event)} style={this.backgroundStyle} > {this.controller.model.cssStyle ? ( diff --git a/packages/vue3-util/src/panel-component/panel-container/panel-container.tsx b/packages/vue3-util/src/panel-component/panel-container/panel-container.tsx index 0d989d92a..106542380 100644 --- a/packages/vue3-util/src/panel-component/panel-container/panel-container.tsx +++ b/packages/vue3-util/src/panel-component/panel-container/panel-container.tsx @@ -110,9 +110,7 @@ export const PanelContainer = defineComponent({ return (
{ - this.controller.onClick(); - }} + onClick={event => this.controller.onClick(event)} > {this.controller.model.cssStyle ? ( diff --git a/packages/vue3-util/src/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.tsx b/packages/vue3-util/src/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.tsx index 72d188a35..85d04bd9d 100644 --- a/packages/vue3-util/src/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.tsx +++ b/packages/vue3-util/src/panel-component/panel-ctrl-view-page-caption/panel-ctrl-view-page-caption.tsx @@ -56,9 +56,7 @@ export const PanelCtrlViewPageCaption = defineComponent({ return (
{ - this.controller.onClick(); - }} + onClick={event => this.controller.onClick(event)} > {editor}
diff --git a/packages/vue3-util/src/panel-component/panel-field/panel-field.tsx b/packages/vue3-util/src/panel-component/panel-field/panel-field.tsx index 8c4253e1d..68c9bdd3a 100644 --- a/packages/vue3-util/src/panel-component/panel-field/panel-field.tsx +++ b/packages/vue3-util/src/panel-component/panel-field/panel-field.tsx @@ -90,9 +90,7 @@ export const PanelField = defineComponent({ return (
{ - this.controller.onClick(); - }} + onClick={event => this.controller.onClick(event)} > {editor} {this.controller.state.error && ( diff --git a/packages/vue3-util/src/panel-component/panel-item-render/panel-item-render.tsx b/packages/vue3-util/src/panel-component/panel-item-render/panel-item-render.tsx index 89a51121a..093b3eb82 100644 --- a/packages/vue3-util/src/panel-component/panel-item-render/panel-item-render.tsx +++ b/packages/vue3-util/src/panel-component/panel-item-render/panel-item-render.tsx @@ -56,6 +56,12 @@ export const PanelItemRender = defineComponent({ return { ns, classArr, htmlCode }; }, render() { - return
; + return ( +
this.controller.onClick(event)} + >
+ ); }, }); diff --git a/packages/vue3-util/src/panel-component/panel-rawitem/panel-rawitem.tsx b/packages/vue3-util/src/panel-component/panel-rawitem/panel-rawitem.tsx index e90ced0ec..e796af6eb 100644 --- a/packages/vue3-util/src/panel-component/panel-rawitem/panel-rawitem.tsx +++ b/packages/vue3-util/src/panel-component/panel-rawitem/panel-rawitem.tsx @@ -88,16 +88,12 @@ export const PanelRawItem = defineComponent({ }, render() { // 动态控制显示 - if (!this.controller.state.visible) { - return; - } + if (!this.controller.state.visible) return; return (
{ - this.controller.onClick(event); - }} + onClick={event => this.controller.onClick(event)} >