diff --git a/apps/backend-mock/utils/mock-data.ts b/apps/backend-mock/utils/mock-data.ts index 192f30a0068..689de2a1612 100644 --- a/apps/backend-mock/utils/mock-data.ts +++ b/apps/backend-mock/utils/mock-data.ts @@ -276,7 +276,7 @@ export const MOCK_MENU_LIST = [ children: [ { id: 20_401, - pid: 201, + pid: 202, name: 'SystemDeptCreate', status: 1, type: 'button', @@ -285,7 +285,7 @@ export const MOCK_MENU_LIST = [ }, { id: 20_402, - pid: 201, + pid: 202, name: 'SystemDeptEdit', status: 1, type: 'button', @@ -294,7 +294,7 @@ export const MOCK_MENU_LIST = [ }, { id: 20_403, - pid: 201, + pid: 202, name: 'SystemDeptDelete', status: 1, type: 'button', diff --git a/packages/@core/base/design/src/css/ui.css b/packages/@core/base/design/src/css/ui.css index 0cf842a0786..a1bf0242366 100644 --- a/packages/@core/base/design/src/css/ui.css +++ b/packages/@core/base/design/src/css/ui.css @@ -1,5 +1,5 @@ .side-content { - animation-duration: 0.2s; + animation-duration: 0.3s; animation-timing-function: cubic-bezier(0.16, 1, 0.3, 1); } @@ -37,7 +37,7 @@ @keyframes slide-down { from { opacity: 0; - transform: translateY(-10px); + transform: translateY(50px); } to { @@ -49,7 +49,7 @@ @keyframes slide-left { from { opacity: 0; - transform: translateX(-10px); + transform: translateX(-50px); } to { @@ -61,7 +61,7 @@ @keyframes slide-right { from { opacity: 0; - transform: translateX(-10px); + transform: translateX(50px); } to { @@ -73,7 +73,7 @@ @keyframes slide-up { from { opacity: 0; - transform: translateY(10px); + transform: translateY(-50px); } to { diff --git a/packages/@core/ui-kit/layout-ui/src/vben-layout.vue b/packages/@core/ui-kit/layout-ui/src/vben-layout.vue index e9e98dd4dde..3ae529eebc7 100644 --- a/packages/@core/ui-kit/layout-ui/src/vben-layout.vue +++ b/packages/@core/ui-kit/layout-ui/src/vben-layout.vue @@ -10,7 +10,7 @@ import { useLayoutFooterStyle, useLayoutHeaderStyle, } from '@vben-core/composables'; -import { Menu } from '@vben-core/icons'; +import { IconifyIcon } from '@vben-core/icons'; import { VbenIconButton } from '@vben-core/shadcn-ui'; import { ELEMENT_ID_MAIN_CONTENT } from '@vben-core/shared/constants'; @@ -559,7 +559,8 @@ const idMainContent = ELEMENT_ID_MAIN_CONTENT; class="my-0 mr-1 rounded-md" @click="handleHeaderToggle" > - + + diff --git a/packages/@core/ui-kit/popup-ui/src/modal/modal.vue b/packages/@core/ui-kit/popup-ui/src/modal/modal.vue index 89184750cc1..a44a616ce64 100644 --- a/packages/@core/ui-kit/popup-ui/src/modal/modal.vue +++ b/packages/@core/ui-kit/popup-ui/src/modal/modal.vue @@ -180,7 +180,7 @@ function escapeKeyDown(e: KeyboardEvent) { } } -function handerOpenAutoFocus(e: Event) { +function handleOpenAutoFocus(e: Event) { if (!openAutoFocus.value) { e?.preventDefault(); } @@ -209,6 +209,12 @@ const getForceMount = computed(() => { return !unref(destroyOnClose) && unref(firstOpened); }); +const handleOpened = () => { + requestAnimationFrame(() => { + props.modalApi?.onOpened(); + }); +}; + function handleClosed() { isClosed.value = true; props.modalApi?.onClosed(); @@ -253,8 +259,8 @@ function handleClosed() { @escape-key-down="escapeKeyDown" @focus-outside="handleFocusOutside" @interact-outside="interactOutside" - @open-auto-focus="handerOpenAutoFocus" - @opened="() => modalApi?.onOpened()" + @open-auto-focus="handleOpenAutoFocus" + @opened="handleOpened" @pointer-down-outside="pointerDownOutside" > { v-bind="delegatedProps" :class=" cn( - 'bg-muted text-muted-foreground inline-flex h-9 items-center justify-center rounded-lg p-1', + 'bg-muted text-muted-foreground inline-flex h-9 items-center justify-center rounded-md p-1', props.class, ) " diff --git a/packages/effects/layouts/src/authentication/authentication.vue b/packages/effects/layouts/src/authentication/authentication.vue index e66954278da..72e31bd3a89 100644 --- a/packages/effects/layouts/src/authentication/authentication.vue +++ b/packages/effects/layouts/src/authentication/authentication.vue @@ -50,7 +50,7 @@ const { authPanelCenter, authPanelLeft, authPanelRight, isDark } =