diff --git a/frontend/src/components/business/ms-menu/index.vue b/frontend/src/components/business/ms-menu/index.vue index a018acd34f..acdd6812cd 100644 --- a/frontend/src/components/business/ms-menu/index.vue +++ b/frontend/src/components/business/ms-menu/index.vue @@ -376,7 +376,10 @@ }} > { @@ -384,14 +387,14 @@ class={[ collapsed.value ? 'relative flex h-full items-center justify-center hover:!bg-transparent' - : 'relative flex items-center gap-[8px] hover:!bg-transparent', + : 'relative flex flex-1 items-center gap-[8px] overflow-hidden hover:!bg-transparent', ]} > - - {collapsed.value ? null : userStore.name} + +
{collapsed.value ? null : userStore.name}
} - {collapsed.value ? null : } + {collapsed.value ? null : }
); diff --git a/frontend/src/components/pure/ms-minder-editor/main/mainEditor.vue b/frontend/src/components/pure/ms-minder-editor/main/mainEditor.vue index 2e330837c7..c89e368c1f 100644 --- a/frontend/src/components/pure/ms-minder-editor/main/mainEditor.vue +++ b/frontend/src/components/pure/ms-minder-editor/main/mainEditor.vue @@ -9,13 +9,15 @@
- - - {{ crumb.text }} - - + + + +
{{ crumb.text }}
+
+
+
i <= index) || []; } + const selectedBreadcrumbKeys = computed({ + get: () => [currentTreePath.value[currentTreePath.value.length - 1]?.id], + set: (val) => { + return val; + }, + }); + /** * 切换脑图展示的节点层级 * @param node 切换的节点 */ - async function switchNode(node?: MinderJsonNode | MinderJsonNodeData) { - if (!props.minderKey) return; + async function switchNode(node?: MinderJsonNode | MinderJsonNodeData, index?: number) { + if (!props.minderKey || index === currentTreePath.value.length - 1) return; if (minderStore.minderUnsaved) { // 切换前,如果脑图未保存,先把更改的节点信息同步一次 replaceNodeInTree( @@ -275,6 +284,7 @@ diff --git a/frontend/src/views/setting/system/user/index.vue b/frontend/src/views/setting/system/user/index.vue index 79f34ee1c7..2a6be3b193 100644 --- a/frontend/src/views/setting/system/user/index.vue +++ b/frontend/src/views/setting/system/user/index.vue @@ -362,6 +362,7 @@ title: 'system.user.tableColumnPhone', dataIndex: 'phone', showDrag: true, + showTooltip: true, width: 140, }, {