diff --git a/CHANGELOG.md b/CHANGELOG.md index ee250ce4e16e3dff97e1f9b56294dddeb02a7409..fabe75a82ca5db35cd43c10f061a9c1a57b129ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ ### Changed - 看板项样式调整 +- 用户消息弹框样式调整 +- 门户快捷菜单项绘制调整 ### Fixed diff --git a/src/control/dashboard/portlet/menu-portlet/app-menu-portlet/app-menu-portlet.scss b/src/control/dashboard/portlet/menu-portlet/app-menu-portlet/app-menu-portlet.scss index 54bd196ae1d53880b317f7d1797b90045aef82ca..910f6592d12e0ce15da1b6a63009c860a14e2e8f 100644 --- a/src/control/dashboard/portlet/menu-portlet/app-menu-portlet/app-menu-portlet.scss +++ b/src/control/dashboard/portlet/menu-portlet/app-menu-portlet/app-menu-portlet.scss @@ -9,8 +9,9 @@ $control-appmenu-portlet: ('icon-width': 20px, @include set-component-css-var('control-appmenu-portlet', $control-appmenu-portlet); @include e(content) { + display: flex; + flex-wrap: wrap; width: 100%; - height: 100%; } } @@ -39,6 +40,8 @@ $control-appmenu-portlet: ('icon-width': 20px, } @include b(control-appmenu-portlet-group) { + width: 100%; + .el-collapse-item__content { display: flex; flex-wrap: wrap; diff --git a/src/control/dashboard/portlet/menu-portlet/app-menu-portlet/app-menu-portlet.tsx b/src/control/dashboard/portlet/menu-portlet/app-menu-portlet/app-menu-portlet.tsx index 35ae6bc43919a82cbe22827a06c1d255e42738d9..fe1889062c37eb0f6ca5bb4950ee131e5856d4bc 100644 --- a/src/control/dashboard/portlet/menu-portlet/app-menu-portlet/app-menu-portlet.tsx +++ b/src/control/dashboard/portlet/menu-portlet/app-menu-portlet/app-menu-portlet.tsx @@ -67,6 +67,9 @@ export const AppMenuPortletControl = defineComponent({ if (!state.visible) { return null; } + if (!item.appMenuItems) { + return renderItem(item); + } return (