diff --git a/src/components.d.ts b/src/components.d.ts index 1844f30..408d21a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -7,14 +7,14 @@ export {} declare module "vue" { export interface GlobalComponents { + BarcodeDraw: (typeof import("./components/barcode-draw/index.vue"))["default"]; CodeView: (typeof import("./components/code-view/index.vue"))["default"]; - DrawBarcode: (typeof import("./components/draw-barcode/index.vue"))["default"]; - DrawQrcode: (typeof import("./components/draw-qrcode/index.vue"))["default"]; ExternalLinkPage: (typeof import("./components/external-link-page/index.vue"))["default"]; FillPage: (typeof import("./components/fill-page/index.vue"))["default"]; InternalLinkPage: (typeof import("./components/internal-link-page/index.vue"))["default"]; LangProvider: (typeof import("./components/lang-provider/index.vue"))["default"]; MainTransition: (typeof import("./components/main-transition/index.vue"))["default"]; + QrcodeDraw: (typeof import("./components/qrcode-draw/index.vue"))["default"]; RouterLink: (typeof import("vue-router"))["RouterLink"]; RouterView: (typeof import("vue-router"))["RouterView"]; SelectIcon: (typeof import("./components/select-icon/index.vue"))["default"]; diff --git a/src/components/draw-barcode/index.vue b/src/components/barcode-draw/index.vue similarity index 100% rename from src/components/draw-barcode/index.vue rename to src/components/barcode-draw/index.vue diff --git a/src/components/draw-qrcode/index.vue b/src/components/qrcode-draw/index.vue similarity index 100% rename from src/components/draw-qrcode/index.vue rename to src/components/qrcode-draw/index.vue diff --git a/src/layout/components/Header/components/Breadcrumb/index.vue b/src/layout/components/Header/components/Breadcrumb/index.vue index 3404b9f..23d3666 100644 --- a/src/layout/components/Header/components/Breadcrumb/index.vue +++ b/src/layout/components/Header/components/Breadcrumb/index.vue @@ -41,7 +41,13 @@ const breadcrumb = computed(() => { // 页面过渡 const transition = computed(() => { - return transitionPage.value === "fadeInOut" ? "fadeInOut-enter-active" : "cardInOut-enter-active"; + if (transitionPage.value === "fadeInOut") { + return "fadeInOut-enter-active"; + } else if (transitionPage.value === "cardInOut") { + return "cardInOut-enter-active"; + } else { + return "fadeOut-enter-active"; + } }); // 面包屑跳转 diff --git a/src/layout/components/Header/components/theme-settings/index.vue b/src/layout/components/Header/components/theme-settings/index.vue index e0d3bc1..9d860f5 100644 --- a/src/layout/components/Header/components/theme-settings/index.vue +++ b/src/layout/components/Header/components/theme-settings/index.vue @@ -42,7 +42,7 @@