完善企业编辑页面并修复采购建单重试
This commit is contained in:
@@ -5,6 +5,7 @@ import {
|
||||
clientNavigation,
|
||||
filterNavigationByPermissions,
|
||||
getNavigationParentKeys,
|
||||
getNavigationLeaves,
|
||||
} from '@/navigation/clientNavigation'
|
||||
import { useAuthStore } from '@/modules/auth/public'
|
||||
import { useCustomsPendingStore } from '@/modules/first-leg/public'
|
||||
@@ -40,8 +41,11 @@ onBeforeUnmount(() => {
|
||||
})
|
||||
|
||||
const visibleNavigation = computed(() => filterNavigationByPermissions(clientNavigation, auth.permissionCodes))
|
||||
const activeNavigationPath = computed(() => getNavigationLeaves(visibleNavigation.value)
|
||||
.filter(node => node.path === props.activePath || (node.path !== '/' && props.activePath.startsWith(`${node.path}/`)))
|
||||
.sort((left, right) => right.path.length - left.path.length)[0]?.path ?? props.activePath)
|
||||
|
||||
const activeParentKeys = computed(() => new Set(getNavigationParentKeys(visibleNavigation.value, props.activePath)))
|
||||
const activeParentKeys = computed(() => new Set(getNavigationParentKeys(visibleNavigation.value, activeNavigationPath.value)))
|
||||
const openedKeys = ref<ReadonlySet<string>>(new Set(activeParentKeys.value))
|
||||
// Expand the order group by default so the three customer order shortcuts are visible.
|
||||
openedKeys.value = new Set([...openedKeys.value, 'order-center'])
|
||||
@@ -73,7 +77,7 @@ function handleSelect(path: string) {
|
||||
:key="node.key"
|
||||
:node="node"
|
||||
:badges="badges"
|
||||
:active-path="activePath"
|
||||
:active-path="activeNavigationPath"
|
||||
:opened-keys="openedKeys"
|
||||
:active-parent-keys="activeParentKeys"
|
||||
:level="0"
|
||||
|
||||
@@ -27,6 +27,7 @@ const groupId = computed(() => `client-nav-group-${props.node.key}`)
|
||||
<li
|
||||
class="client-nav-node"
|
||||
v-if="node.children"
|
||||
:data-nav-key="node.key"
|
||||
:class="{
|
||||
'has-divider-before': node.dividerBefore,
|
||||
'is-active-parent': activeParentKeys.has(node.key),
|
||||
@@ -69,7 +70,7 @@ const groupId = computed(() => `client-nav-group-${props.node.key}`)
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li v-else class="client-nav-node" :class="{ 'has-divider-before': node.dividerBefore }">
|
||||
<li v-else class="client-nav-node" :data-nav-key="node.key" :class="{ 'has-divider-before': node.dividerBefore }">
|
||||
<RouterLink
|
||||
:to="node.path"
|
||||
class="client-sidebar-link"
|
||||
|
||||
Reference in New Issue
Block a user