Merge branch 'main' into feature/fix_defects_router

2026-07-18 03:54:49 +08:00
parent 263d8e5b52 8ac66a96bc
commit eae6771554
4 changed files with 3 additions and 1 deletions
--- a/apps/web-antd/src/adapter/component/index.ts
+++ b/apps/web-antd/src/adapter/component/index.ts
@@ -360,6 +360,7 @@ function cropImage(file: File, aspectRatio: string | undefined) {
              ]),
              centered: true,
              width: 548,
+              zIndex: 9999,
              keyboard: false,
              maskClosable: false,
              closable: false,
--- a/apps/web-antdv-next/src/adapter/component/index.ts
+++ b/apps/web-antdv-next/src/adapter/component/index.ts
@@ -379,6 +379,7 @@ function cropImage(file: File, aspectRatio: string | undefined) {
              ]),
              centered: true,
              width: 548,
+              zIndex: 9999,
              keyboard: false,
              maskClosable: false,
              closable: false,
--- a/packages/effects/layouts/src/basic/content/content.vue
+++ b/packages/effects/layouts/src/basic/content/content.vue
@@ -44,7 +44,6 @@ const showComponent = (route: RouteLocationNormalizedLoadedGeneric) => {
        v-if="getEnabledTransition"
        :name="getTransitionName(route)"
        appear
-        mode="out-in"
      >
        <KeepAlive
          v-if="keepAlive"
--- a/playground/src/adapter/component/index.ts
+++ b/playground/src/adapter/component/index.ts
@@ -379,6 +379,7 @@ function cropImage(file: File, aspectRatio: string | undefined) {
              ]),
              centered: true,
              width: 548,
+              zIndex: 9999,
              keyboard: false,
              maskClosable: false,
              closable: false,