diff --git a/apps/web-ele/src/views/_core/authentication/login.vue b/apps/web-ele/src/views/_core/authentication/login.vue
index 3849a9c2..099e4c8c 100644
--- a/apps/web-ele/src/views/_core/authentication/login.vue
+++ b/apps/web-ele/src/views/_core/authentication/login.vue
@@ -2,9 +2,9 @@
 import type { VbenFormSchema } from '@vben/common-ui';
 import type { BasicOption } from '@vben/types';
 
-import { computed } from 'vue';
+import { computed, markRaw } from 'vue';
 
-import { AuthenticationLogin, z } from '@vben/common-ui';
+import { AuthenticationLogin, SliderCaptcha, z } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 
 import { useAuthStore } from '#/store';
@@ -78,6 +78,13 @@ const formSchema = computed((): VbenFormSchema[] => {
       label: $t('authentication.password'),
       rules: z.string().min(1, { message: $t('authentication.passwordTip') }),
     },
+    {
+      component: markRaw(SliderCaptcha),
+      fieldName: 'captcha',
+      rules: z.boolean().refine((value) => value, {
+        message: $t('authentication.verifyRequiredTip'),
+      }),
+    },
   ];
 });
 </script>
diff --git a/apps/web-naive/src/adapter/index.ts b/apps/web-naive/src/adapter/index.ts
index 698d687b..423f6308 100644
--- a/apps/web-naive/src/adapter/index.ts
+++ b/apps/web-naive/src/adapter/index.ts
@@ -1 +1,2 @@
 export * from './form';
+export * from './naive';
diff --git a/apps/web-naive/src/naive.ts b/apps/web-naive/src/adapter/naive.ts
similarity index 100%
rename from apps/web-naive/src/naive.ts
rename to apps/web-naive/src/adapter/naive.ts
diff --git a/apps/web-naive/src/api/request.ts b/apps/web-naive/src/api/request.ts
index 14d2b6dc..87207037 100644
--- a/apps/web-naive/src/api/request.ts
+++ b/apps/web-naive/src/api/request.ts
@@ -10,7 +10,7 @@ import {
 } from '@vben/request';
 import { useAccessStore } from '@vben/stores';
 
-import { message } from '#/naive';
+import { message } from '#/adapter';
 import { useAuthStore } from '#/store';
 
 import { refreshTokenApi } from './core';
diff --git a/apps/web-naive/src/router/access.ts b/apps/web-naive/src/router/access.ts
index dc90e891..37a12be9 100644
--- a/apps/web-naive/src/router/access.ts
+++ b/apps/web-naive/src/router/access.ts
@@ -6,10 +6,10 @@ import type {
 import { generateAccessible } from '@vben/access';
 import { preferences } from '@vben/preferences';
 
+import { message } from '#/adapter';
 import { getAllMenusApi } from '#/api';
 import { BasicLayout, IFrameView } from '#/layouts';
 import { $t } from '#/locales';
-import { message } from '#/naive';
 
 const forbiddenComponent = () => import('#/views/_core/fallback/forbidden.vue');
 
diff --git a/apps/web-naive/src/store/auth.ts b/apps/web-naive/src/store/auth.ts
index 85522526..2485a324 100644
--- a/apps/web-naive/src/store/auth.ts
+++ b/apps/web-naive/src/store/auth.ts
@@ -9,9 +9,9 @@ import { resetAllStores, useAccessStore, useUserStore } from '@vben/stores';
 
 import { defineStore } from 'pinia';
 
+import { notification } from '#/adapter';
 import { getAccessCodesApi, getUserInfoApi, loginApi, logoutApi } from '#/api';
 import { $t } from '#/locales';
-import { notification } from '#/naive';
 
 export const useAuthStore = defineStore('auth', () => {
   const accessStore = useAccessStore();
diff --git a/apps/web-naive/src/views/_core/authentication/login.vue b/apps/web-naive/src/views/_core/authentication/login.vue
index 3849a9c2..099e4c8c 100644
--- a/apps/web-naive/src/views/_core/authentication/login.vue
+++ b/apps/web-naive/src/views/_core/authentication/login.vue
@@ -2,9 +2,9 @@
 import type { VbenFormSchema } from '@vben/common-ui';
 import type { BasicOption } from '@vben/types';
 
-import { computed } from 'vue';
+import { computed, markRaw } from 'vue';
 
-import { AuthenticationLogin, z } from '@vben/common-ui';
+import { AuthenticationLogin, SliderCaptcha, z } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 
 import { useAuthStore } from '#/store';
@@ -78,6 +78,13 @@ const formSchema = computed((): VbenFormSchema[] => {
       label: $t('authentication.password'),
       rules: z.string().min(1, { message: $t('authentication.passwordTip') }),
     },
+    {
+      component: markRaw(SliderCaptcha),
+      fieldName: 'captcha',
+      rules: z.boolean().refine((value) => value, {
+        message: $t('authentication.verifyRequiredTip'),
+      }),
+    },
   ];
 });
 </script>
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectTrigger.vue b/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectTrigger.vue
index c117b07b..a7fa13a7 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectTrigger.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/ui/select/SelectTrigger.vue
@@ -27,7 +27,7 @@ const forwardedProps = useForwardProps(delegatedProps);
     v-bind="forwardedProps"
     :class="
       cn(
-        'border-input ring-offset-background placeholder:text-muted-foreground focus:ring-ring flex h-9 w-full items-center justify-between whitespace-nowrap rounded-md border bg-transparent px-3 py-2 text-sm shadow-sm focus:outline-none focus:ring-1 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1',
+        'border-input ring-offset-background placeholder:text-muted-foreground focus:ring-ring flex h-10 w-full items-center justify-between whitespace-nowrap rounded-md border bg-transparent px-3 py-2 text-sm shadow-sm focus:outline-none focus:ring-1 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1',
         props.class,
       )
     "
diff --git a/packages/effects/common-ui/src/components/captcha/slider-captcha/index.vue b/packages/effects/common-ui/src/components/captcha/slider-captcha/index.vue
index 7cec62e4..e48d98f0 100644
--- a/packages/effects/common-ui/src/components/captcha/slider-captcha/index.vue
+++ b/packages/effects/common-ui/src/components/captcha/slider-captcha/index.vue
@@ -70,9 +70,9 @@ watchEffect(() => {
 });
 
 function getEventPageX(e: MouseEvent | TouchEvent): number {
-  if (e instanceof MouseEvent) {
+  if ('pageX' in e) {
     return e.pageX;
-  } else if (e instanceof TouchEvent && e.touches[0]) {
+  } else if ('touches' in e && e.touches[0]) {
     return e.touches[0].pageX;
   }
   return 0;
@@ -183,6 +183,8 @@ function resume() {
   const barEl = unref(barRef);
   const contentEl = unref(contentRef);
   if (!actionEl || !barEl || !contentEl) return;
+
+  contentEl.getEl().style.width = '100%';
   state.toLeft = true;
   useTimeoutFn(() => {
     state.toLeft = false;
diff --git a/packages/effects/common-ui/src/components/captcha/slider-rotate-captcha/index.vue b/packages/effects/common-ui/src/components/captcha/slider-rotate-captcha/index.vue
index e855900a..88945892 100644
--- a/packages/effects/common-ui/src/components/captcha/slider-rotate-captcha/index.vue
+++ b/packages/effects/common-ui/src/components/captcha/slider-rotate-captcha/index.vue
@@ -66,6 +66,10 @@ const getImgWrapStyleRef = computed(() => {
 
 const getFactorRef = computed(() => {
   const { maxDegree, minDegree } = props;
+  if (minDegree > maxDegree) {
+    console.warn('minDegree should not be greater than maxDegree');
+  }
+
   if (minDegree === maxDegree) {
     return Math.floor(1 + Math.random() * 1) / 10 + 1;
   }
@@ -116,6 +120,7 @@ function handleDragEnd() {
     checkPass();
   }
   state.showTip = true;
+  state.dragging = false;
 }
 
 function setImgRotate(deg: number) {
@@ -162,7 +167,7 @@ defineExpose({
   <div class="relative flex flex-col items-center">
     <div
       :style="getImgWrapStyleRef"
-      class="border-border relative overflow-hidden rounded-full border shadow-md"
+      class="border-border relative cursor-pointer overflow-hidden rounded-full border shadow-md"
     >
       <img
         :class="imgCls"
@@ -185,7 +190,7 @@ defineExpose({
         >
           {{ verifyTip }}
         </div>
-        <div v-if="!state.showTip && !state.dragging" class="bg-black/30">
+        <div v-if="!state.dragging" class="bg-black/30">
           {{ defaultTip || $t('ui.captcha.sliderRotateDefaultTip') }}
         </div>
       </div>
diff --git a/packages/locales/src/langs/en-US.json b/packages/locales/src/langs/en-US.json
index 29c46261..693e19ba 100644
--- a/packages/locales/src/langs/en-US.json
+++ b/packages/locales/src/langs/en-US.json
@@ -112,6 +112,7 @@
     "passwordErrorTip": "Password is incorrect",
     "passwordTip": "Please enter password",
     "captchaTip": "Please enter captcha",
+    "verifyRequiredTip": "Please complete the verification first",
     "rememberMe": "Remember Me",
     "createAnAccount": "Create an Account",
     "createAccount": "Create Account",
diff --git a/packages/locales/src/langs/zh-CN.json b/packages/locales/src/langs/zh-CN.json
index 8c82d323..62315602 100644
--- a/packages/locales/src/langs/zh-CN.json
+++ b/packages/locales/src/langs/zh-CN.json
@@ -111,6 +111,7 @@
     "usernameTip": "请输入账号",
     "passwordTip": "请输入密码",
     "captchaTip": "请输入验证码",
+    "verifyRequiredTip": "请先完成验证",
     "passwordErrorTip": "密码错误",
     "rememberMe": "记住账号",
     "createAnAccount": "创建一个账号",
diff --git a/playground/src/views/_core/authentication/login.vue b/playground/src/views/_core/authentication/login.vue
index 6f300ef1..4f6f5649 100644
--- a/playground/src/views/_core/authentication/login.vue
+++ b/playground/src/views/_core/authentication/login.vue
@@ -2,9 +2,9 @@
 import type { VbenFormSchema } from '@vben/common-ui';
 import type { BasicOption } from '@vben/types';
 
-import { computed } from 'vue';
+import { computed, markRaw } from 'vue';
 
-import { AuthenticationLogin, z } from '@vben/common-ui';
+import { AuthenticationLogin, SliderCaptcha, z } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 
 import { useAuthStore } from '#/store';
@@ -95,6 +95,13 @@ const formSchema = computed((): VbenFormSchema[] => {
       label: $t('authentication.password'),
       rules: z.string().min(1, { message: $t('authentication.passwordTip') }),
     },
+    {
+      component: markRaw(SliderCaptcha),
+      fieldName: 'captcha',
+      rules: z.boolean().refine((value) => value, {
+        message: $t('authentication.verifyRequiredTip'),
+      }),
+    },
   ];
 });
 </script>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3fcde2f5..950a922c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -361,8 +361,8 @@ catalogs:
       specifier: ^6.0.1
       version: 6.0.1
     rollup:
-      specifier: ^4.22.2
-      version: 4.22.2
+      specifier: ^4.22.4
+      version: 4.22.4
     rollup-plugin-visualizer:
       specifier: ^5.12.0
       version: 5.12.0
@@ -805,11 +805,15 @@ importers:
     devDependencies:
       unplugin-element-plus:
         specifier: 'catalog:'
+<<<<<<< HEAD
 <<<<<<< HEAD
         version: 0.8.0(rollup@4.22.0)(webpack-sources@3.2.3)
 =======
         version: 0.8.0(rollup@4.22.2)
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+        version: 0.8.0(rollup@4.22.4)
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
 
   apps/web-naive:
     dependencies:
@@ -912,6 +916,7 @@ importers:
       '@vite-pwa/vitepress':
         specifier: 'catalog:'
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         version: 0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0))
       vitepress:
@@ -925,6 +930,9 @@ importers:
 >>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c
 =======
         version: 0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0))
+=======
+        version: 0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0))
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       vitepress:
         specifier: 'catalog:'
         version: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2)
@@ -1204,11 +1212,15 @@ importers:
     dependencies:
       '@intlify/unplugin-vue-i18n':
         specifier: 'catalog:'
+<<<<<<< HEAD
 <<<<<<< HEAD
         version: 5.0.0(@vue/compiler-dom@3.5.6)(eslint@9.10.0(jiti@1.21.6))(rollup@4.22.0)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3)
 =======
         version: 5.0.0(@vue/compiler-dom@3.5.7)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.2)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+        version: 5.0.0(@vue/compiler-dom@3.5.7)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.4)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       '@jspm/generator':
         specifier: 'catalog:'
         version: 2.3.1
@@ -1251,12 +1263,16 @@ importers:
         version: 0.20.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0)
       vite-plugin-vue-devtools:
         specifier: 'catalog:'
+<<<<<<< HEAD
 <<<<<<< HEAD
         version: 7.4.5(rollup@4.22.0)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2))
 >>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c
 =======
         version: 7.4.5(rollup@4.22.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2))
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+        version: 7.4.5(rollup@4.22.4)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2))
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     devDependencies:
       '@types/archiver':
         specifier: 'catalog:'
@@ -1295,10 +1311,10 @@ importers:
         version: 16.4.5
       rollup:
         specifier: 'catalog:'
-        version: 4.22.2
+        version: 4.22.4
       rollup-plugin-visualizer:
         specifier: 'catalog:'
-        version: 5.12.0(rollup@4.22.2)
+        version: 5.12.0(rollup@4.22.4)
       sass:
         specifier: 'catalog:'
         version: 1.79.3
@@ -1326,7 +1342,7 @@ importers:
         version: 0.5.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))
       vite-plugin-dts:
         specifier: 'catalog:'
-        version: 4.2.1(@types/node@22.5.5)(rollup@4.22.2)(typescript@5.6.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))
+        version: 4.2.1(@types/node@22.5.5)(rollup@4.22.4)(typescript@5.6.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))
       vite-plugin-html:
         specifier: 'catalog:'
 <<<<<<< HEAD
@@ -1862,11 +1878,15 @@ importers:
         version: 2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2))
       pinia-plugin-persistedstate:
         specifier: 'catalog:'
+<<<<<<< HEAD
 <<<<<<< HEAD
         version: 4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2)))(rollup@4.22.0)(webpack-sources@3.2.3)
 =======
         version: 4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)))(rollup@4.22.2)
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+        version: 4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)))(rollup@4.22.4)
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       vue:
         specifier: 3.5.7
         version: 3.5.7(typescript@5.6.2)
@@ -4592,6 +4612,7 @@ packages:
       rollup:
         optional: true
 
+<<<<<<< HEAD
   '@rollup/rollup-android-arm-eabi@4.21.3':
     resolution: {integrity: sha512-MmKSfaB9GX+zXl6E8z4koOr/xU63AMVleLEa64v7R0QF/ZloMs5vcD1sHgM64GXXS1csaJutG+ddtzcueI/BLg==}
     cpu: [arm]
@@ -4666,10 +4687,35 @@ packages:
 
   '@rollup/rollup-linux-arm-gnueabihf@4.22.0':
     resolution: {integrity: sha512-9pxQJSPwFsVi0ttOmqLY4JJ9pg9t1gKhK0JDbV1yUEETSx55fdyCjt39eBQ54OQCzAF0nVGO6LfEH1KnCPvelA==}
+=======
+  '@rollup/rollup-android-arm-eabi@4.22.4':
+    resolution: {integrity: sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==}
+    cpu: [arm]
+    os: [android]
+
+  '@rollup/rollup-android-arm64@4.22.4':
+    resolution: {integrity: sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==}
+    cpu: [arm64]
+    os: [android]
+
+  '@rollup/rollup-darwin-arm64@4.22.4':
+    resolution: {integrity: sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rollup/rollup-darwin-x64@4.22.4':
+    resolution: {integrity: sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rollup/rollup-linux-arm-gnueabihf@4.22.4':
+    resolution: {integrity: sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==}
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-linux-arm-musleabihf@4.21.3':
     resolution: {integrity: sha512-zmjbSphplZlau6ZTkxd3+NMtE4UKVy7U4aVFMmHcgO5CUbw17ZP6QCgyxhzGaU/wFFdTfiojjbLG3/0p9HhAqA==}
@@ -4686,10 +4732,15 @@ packages:
 
   '@rollup/rollup-linux-arm-musleabihf@4.22.0':
     resolution: {integrity: sha512-YJ5Ku5BmNJZb58A4qSEo3JlIG4d3G2lWyBi13ABlXzO41SsdnUKi3HQHe83VpwBVG4jHFTW65jOQb8qyoR+qzg==}
+=======
+  '@rollup/rollup-linux-arm-musleabihf@4.22.4':
+    resolution: {integrity: sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==}
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     cpu: [arm]
     os: [linux]
     libc: [musl]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-linux-arm64-gnu@4.21.3':
     resolution: {integrity: sha512-nSZfcZtAnQPRZmUkUQwZq2OjQciR6tEoJaZVFvLHsj0MF6QhNMg0fQ6mUOsiCUpTqxTx0/O6gX0V/nYc7LrgPw==}
@@ -4706,10 +4757,15 @@ packages:
 
   '@rollup/rollup-linux-arm64-gnu@4.22.0':
     resolution: {integrity: sha512-U4G4u7f+QCqHlVg1Nlx+qapZy+QoG+NV6ux+upo/T7arNGwKvKP2kmGM4W5QTbdewWFgudQxi3kDNST9GT1/mg==}
+=======
+  '@rollup/rollup-linux-arm64-gnu@4.22.4':
+    resolution: {integrity: sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==}
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-linux-arm64-musl@4.21.3':
     resolution: {integrity: sha512-MnvSPGO8KJXIMGlQDYfvYS3IosFN2rKsvxRpPO2l2cum+Z3exiExLwVU+GExL96pn8IP+GdH8Tz70EpBhO0sIQ==}
@@ -4726,10 +4782,15 @@ packages:
 
   '@rollup/rollup-linux-arm64-musl@4.22.0':
     resolution: {integrity: sha512-aQpNlKmx3amwkA3a5J6nlXSahE1ijl0L9KuIjVOUhfOh7uw2S4piR3mtpxpRtbnK809SBtyPsM9q15CPTsY7HQ==}
+=======
+  '@rollup/rollup-linux-arm64-musl@4.22.4':
+    resolution: {integrity: sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==}
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-linux-powerpc64le-gnu@4.21.3':
     resolution: {integrity: sha512-+W+p/9QNDr2vE2AXU0qIy0qQE75E8RTwTwgqS2G5CRQ11vzq0tbnfBd6brWhS9bCRjAjepJe2fvvkvS3dno+iw==}
@@ -4746,10 +4807,15 @@ packages:
 
   '@rollup/rollup-linux-powerpc64le-gnu@4.22.0':
     resolution: {integrity: sha512-9fx6Zj/7vve/Fp4iexUFRKb5+RjLCff6YTRQl4CoDhdMfDoobWmhAxQWV3NfShMzQk1Q/iCnageFyGfqnsmeqQ==}
+=======
+  '@rollup/rollup-linux-powerpc64le-gnu@4.22.4':
+    resolution: {integrity: sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==}
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-linux-riscv64-gnu@4.21.3':
     resolution: {integrity: sha512-yXH6K6KfqGXaxHrtr+Uoy+JpNlUlI46BKVyonGiaD74ravdnF9BUNC+vV+SIuB96hUMGShhKV693rF9QDfO6nQ==}
@@ -4764,10 +4830,15 @@ packages:
 
   '@rollup/rollup-linux-riscv64-gnu@4.22.0':
     resolution: {integrity: sha512-VWQiCcN7zBgZYLjndIEh5tamtnKg5TGxyZPWcN9zBtXBwfcGSZ5cHSdQZfQH/GB4uRxk0D3VYbOEe/chJhPGLQ==}
+=======
+  '@rollup/rollup-linux-riscv64-gnu@4.22.4':
+    resolution: {integrity: sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==}
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-linux-s390x-gnu@4.21.3':
     resolution: {integrity: sha512-R8cwY9wcnApN/KDYWTH4gV/ypvy9yZUHlbJvfaiXSB48JO3KpwSpjOGqO4jnGkLDSk1hgjYkTbTt6Q7uvPf8eg==}
@@ -4782,10 +4853,15 @@ packages:
 
   '@rollup/rollup-linux-s390x-gnu@4.22.0':
     resolution: {integrity: sha512-EHmPnPWvyYqncObwqrosb/CpH3GOjE76vWVs0g4hWsDRUVhg61hBmlVg5TPXqF+g+PvIbqkC7i3h8wbn4Gp2Fg==}
+=======
+  '@rollup/rollup-linux-s390x-gnu@4.22.4':
+    resolution: {integrity: sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==}
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-linux-x64-gnu@4.21.3':
     resolution: {integrity: sha512-kZPbX/NOPh0vhS5sI+dR8L1bU2cSO9FgxwM8r7wHzGydzfSjLRCFAT87GR5U9scj2rhzN3JPYVC7NoBbl4FZ0g==}
@@ -4800,10 +4876,15 @@ packages:
 
   '@rollup/rollup-linux-x64-gnu@4.22.0':
     resolution: {integrity: sha512-tsSWy3YQzmpjDKnQ1Vcpy3p9Z+kMFbSIesCdMNgLizDWFhrLZIoN21JSq01g+MZMDFF+Y1+4zxgrlqPjid5ohg==}
+=======
+  '@rollup/rollup-linux-x64-gnu@4.22.4':
+    resolution: {integrity: sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==}
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-linux-x64-musl@4.21.3':
     resolution: {integrity: sha512-S0Yq+xA1VEH66uiMNhijsWAafffydd2X5b77eLHfRmfLsRSpbiAWiRHV6DEpz6aOToPsgid7TI9rGd6zB1rhbg==}
@@ -4820,10 +4901,15 @@ packages:
 
   '@rollup/rollup-linux-x64-musl@4.22.0':
     resolution: {integrity: sha512-anr1Y11uPOQrpuU8XOikY5lH4Qu94oS6j0xrulHk3NkLDq19MlX8Ng/pVipjxBJ9a2l3+F39REZYyWQFkZ4/fw==}
+=======
+  '@rollup/rollup-linux-x64-musl@4.22.4':
+    resolution: {integrity: sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==}
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-win32-arm64-msvc@4.21.3':
     resolution: {integrity: sha512-9isNzeL34yquCPyerog+IMCNxKR8XYmGd0tHSV+OVx0TmE0aJOo9uw4fZfUuk2qxobP5sug6vNdZR6u7Mw7Q+Q==}
@@ -4876,6 +4962,20 @@ packages:
 
   '@rollup/rollup-win32-x64-msvc@4.22.2':
     resolution: {integrity: sha512-Yy8So+SoRz8I3NS4Bjh91BICPOSVgdompTIPYTByUqU66AXSIOgmW3Lv1ke3NORPqxdF+RdrZET+8vYai6f4aA==}
+=======
+  '@rollup/rollup-win32-arm64-msvc@4.22.4':
+    resolution: {integrity: sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rollup/rollup-win32-ia32-msvc@4.22.4':
+    resolution: {integrity: sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==}
+    cpu: [ia32]
+    os: [win32]
+
+  '@rollup/rollup-win32-x64-msvc@4.22.4':
+    resolution: {integrity: sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==}
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     cpu: [x64]
     os: [win32]
 
@@ -5324,27 +5424,15 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@vue/compiler-core@3.5.6':
-    resolution: {integrity: sha512-r+gNu6K4lrvaQLQGmf+1gc41p3FO2OUJyWmNqaIITaJU6YFiV5PtQSFZt8jfztYyARwqhoCayjprC7KMvT3nRA==}
-
   '@vue/compiler-core@3.5.7':
     resolution: {integrity: sha512-A0gay3lK71MddsSnGlBxRPOugIVdACze9L/rCo5X5srCyjQfZOfYtSFMJc3aOZCM+xN55EQpb4R97rYn/iEbSw==}
 
-  '@vue/compiler-dom@3.5.6':
-    resolution: {integrity: sha512-xRXqxDrIqK8v8sSScpistyYH0qYqxakpsIvqMD2e5sV/PXQ1mTwtXp4k42yHK06KXxKSmitop9e45Ui/3BrTEw==}
-
   '@vue/compiler-dom@3.5.7':
     resolution: {integrity: sha512-GYWl3+gO8/g0ZdYaJ18fYHdI/WVic2VuuUd1NsPp60DWXKy+XjdhFsDW7FbUto8siYYZcosBGn9yVBkjhq1M8Q==}
 
-  '@vue/compiler-sfc@3.5.6':
-    resolution: {integrity: sha512-pjWJ8Kj9TDHlbF5LywjVso+BIxCY5wVOLhkEXRhuCHDxPFIeX1zaFefKs8RYoHvkSMqRWt93a0f2gNJVJixHwg==}
-
   '@vue/compiler-sfc@3.5.7':
     resolution: {integrity: sha512-EjOJtCWJrC7HqoCEzOwpIYHm+JH7YmkxC1hG6VkqIukYRqj8KFUlTLK6hcT4nGgtVov2+ZfrdrRlcaqS78HnBA==}
 
-  '@vue/compiler-ssr@3.5.6':
-    resolution: {integrity: sha512-VpWbaZrEOCqnmqjE83xdwegtr5qO/2OPUC6veWgvNqTJ3bYysz6vY3VqMuOijubuUYPRpG3OOKIh9TD0Stxb9A==}
-
   '@vue/compiler-ssr@3.5.7':
     resolution: {integrity: sha512-oZx+jXP2k5arV/8Ly3TpQbfFyimMw2ANrRqvHJoKjPqtEzazxQGZjCLOfq8TnZ3wy2TOXdqfmVp4q7FyYeHV4g==}
 
@@ -5390,9 +5478,6 @@ packages:
     peerDependencies:
       vue: 3.5.7
 
-  '@vue/shared@3.5.6':
-    resolution: {integrity: sha512-eidH0HInnL39z6wAt6SFIwBrvGOpDWsDxlw3rCgo1B+CQ1781WzQUSU3YjxgdkcJo9Q8S6LmXTkvI+cLHGkQfA==}
-
   '@vue/shared@3.5.7':
     resolution: {integrity: sha512-NBE1PBIvzIedxIc2RZiKXvGbJkrZ2/hLf3h8GlS4/sP9xcXEZMFWOazFkNd6aGeUCMaproe5MHVYB3/4AW9q9g==}
 
@@ -6624,8 +6709,13 @@ packages:
     engines: {node: '>=0.10.0'}
     hasBin: true
 
+<<<<<<< HEAD
   electron-to-chromium@1.5.19:
     resolution: {integrity: sha512-kpLJJi3zxTR1U828P+LIUDZ5ohixyo68/IcYOHLqnbTPr/wdgn4i1ECvmALN9E16JPA6cvCG5UG79gVwVdEK5w==}
+=======
+  electron-to-chromium@1.5.27:
+    resolution: {integrity: sha512-o37j1vZqCoEgBuWWXLHQgTN/KDKe7zwpiY5CPeq2RvUqOyJw9xnrULzZAEVQ5p4h+zjMk7hgtOoPdnLxr7m/jw==}
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
 
   element-plus@2.8.3:
     resolution: {integrity: sha512-BXQOyDf0s7JHyNEV8iaO+iaOzTZPsBXVKMzMI967vLCodUBDLrtiY5vglAn1YEebQcUOEUMhGcttTpIvEkcBjQ==}
@@ -8542,8 +8632,8 @@ packages:
     resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
     engines: {node: '>= 0.4'}
 
-  ofetch@1.3.4:
-    resolution: {integrity: sha512-KLIET85ik3vhEfS+3fDlc/BAZiAp+43QEC/yCo5zkNoY2YaKvNkOaFr/6wCFgFH1kuYQM5pMNi0Tg8koiIemtw==}
+  ofetch@1.4.0:
+    resolution: {integrity: sha512-MuHgsEhU6zGeX+EMh+8mSMrYTnsqJQQrpM00Q6QHMKNqQ0bKy0B43tk8tL1wg+CnsSTy1kg4Ir2T5Ig6rD+dfQ==}
 
   ohash@1.1.3:
     resolution: {integrity: sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==}
@@ -8654,8 +8744,8 @@ packages:
     resolution: {integrity: sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==}
     engines: {node: '>=8'}
 
-  parse-imports@2.1.1:
-    resolution: {integrity: sha512-TDT4HqzUiTMO1wJRwg/t/hYk8Wdp3iF/ToMIlAoVQfL1Xs/sTxq1dKWSMjMbQmIarfWKymOyly40+zmPHXMqCA==}
+  parse-imports@2.2.1:
+    resolution: {integrity: sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ==}
     engines: {node: '>= 18'}
 
   parse-json@5.2.0:
@@ -9596,11 +9686,12 @@ packages:
     engines: {node: '>=10.0.0'}
     hasBin: true
 
-  rollup@3.29.4:
-    resolution: {integrity: sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==}
+  rollup@3.29.5:
+    resolution: {integrity: sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
 
+<<<<<<< HEAD
   rollup@4.21.3:
     resolution: {integrity: sha512-7sqRtBNnEbcBtMeRVc6VRsJMmpI+JU1z9VTvW8D4gXIYQFz0aLcsE6rRkyghZkLfEgUZgVvOG7A5CVz/VW5GIA==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
@@ -9613,6 +9704,10 @@ packages:
 
   rollup@4.22.2:
     resolution: {integrity: sha512-JWWpTrZmqQGQWt16xvNn6KVIUz16VtZwl984TKw0dfqqRpFwtLJYYk1/4BTgplndMQKWUk/yB4uOShYmMzA2Vg==}
+=======
+  rollup@4.22.4:
+    resolution: {integrity: sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==}
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -10685,37 +10780,6 @@ packages:
     peerDependencies:
       vite: ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0
 
-  vite@5.4.6:
-    resolution: {integrity: sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': ^18.0.0 || >=20.0.0
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      sass-embedded: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      sass-embedded:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-
   vite@5.4.7:
     resolution: {integrity: sha512-5l2zxqMEPVENgvzTuBpHer2awaetimj2BGkhBPdnwKbPNOlHsODU+oiazEZzLK7KhAnOrO+XGYJYn4ZlUhDtDQ==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -13480,17 +13544,21 @@ snapshots:
 
   '@intlify/shared@10.0.1': {}
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@intlify/unplugin-vue-i18n@5.0.0(@vue/compiler-dom@3.5.6)(eslint@9.10.0(jiti@1.21.6))(rollup@4.22.0)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3)':
 =======
   '@intlify/unplugin-vue-i18n@5.0.0(@vue/compiler-dom@3.5.7)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.2)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))':
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+  '@intlify/unplugin-vue-i18n@5.0.0(@vue/compiler-dom@3.5.7)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.4)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))':
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.0(jiti@1.21.6))
       '@intlify/bundle-utils': 9.0.0-beta.0(vue-i18n@10.0.1(vue@3.5.7(typescript@5.6.2)))
       '@intlify/shared': 10.0.0
       '@intlify/vue-i18n-extensions': 6.2.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.7)(vue-i18n@10.0.1(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))
-      '@rollup/pluginutils': 5.1.0(rollup@4.22.2)
+      '@rollup/pluginutils': 5.1.0(rollup@4.22.4)
       '@typescript-eslint/scope-manager': 7.18.0
       '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2)
       debug: 4.3.7
@@ -13848,6 +13916,7 @@ snapshots:
       mkdirp: 1.0.4
       rimraf: 3.0.2
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@nuxt/kit@3.13.2(rollup@4.22.0)(webpack-sources@3.2.3)':
     dependencies:
@@ -13857,6 +13926,11 @@ snapshots:
     dependencies:
       '@nuxt/schema': 3.13.2(rollup@4.22.2)
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+  '@nuxt/kit@3.13.2(rollup@4.22.4)':
+    dependencies:
+      '@nuxt/schema': 3.13.2(rollup@4.22.4)
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       c12: 1.11.2
       consola: 3.2.3
       defu: 6.1.4
@@ -13878,8 +13952,12 @@ snapshots:
       unimport: 3.12.0(rollup@4.22.0)(webpack-sources@3.2.3)
 =======
       unctx: 2.3.1
+<<<<<<< HEAD
       unimport: 3.12.0(rollup@4.22.2)
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+      unimport: 3.12.0(rollup@4.22.4)
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       untyped: 1.4.2
     transitivePeerDependencies:
       - magicast
@@ -13887,11 +13965,15 @@ snapshots:
       - supports-color
       - webpack-sources
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@nuxt/schema@3.13.2(rollup@4.22.0)(webpack-sources@3.2.3)':
 =======
   '@nuxt/schema@3.13.2(rollup@4.22.2)':
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+  '@nuxt/schema@3.13.2(rollup@4.22.4)':
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     dependencies:
       compatx: 0.1.8
       consola: 3.2.3
@@ -13903,11 +13985,15 @@ snapshots:
       std-env: 3.7.0
       ufo: 1.5.4
       uncrypto: 0.1.3
+<<<<<<< HEAD
 <<<<<<< HEAD
       unimport: 3.12.0(rollup@4.22.0)(webpack-sources@3.2.3)
 =======
       unimport: 3.12.0(rollup@4.22.2)
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+      unimport: 3.12.0(rollup@4.22.4)
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       untyped: 1.4.2
     transitivePeerDependencies:
       - rollup
@@ -14004,17 +14090,25 @@ snapshots:
     dependencies:
       vue: 3.5.7(typescript@5.6.2)
 
-  '@rollup/plugin-alias@5.1.0(rollup@3.29.4)':
+  '@rollup/plugin-alias@5.1.0(rollup@3.29.5)':
     dependencies:
       slash: 4.0.0
     optionalDependencies:
-      rollup: 3.29.4
+      rollup: 3.29.5
 
+<<<<<<< HEAD
   '@rollup/plugin-alias@5.1.0(rollup@4.21.3)':
     dependencies:
       slash: 4.0.0
     optionalDependencies:
       rollup: 4.21.3
+=======
+  '@rollup/plugin-alias@5.1.0(rollup@4.22.4)':
+    dependencies:
+      slash: 4.0.0
+    optionalDependencies:
+      rollup: 4.22.4
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
 
   '@rollup/plugin-babel@5.3.1(@babel/core@7.25.2)(rollup@2.79.1)':
     dependencies:
@@ -14025,26 +14119,33 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@rollup/plugin-commonjs@25.0.8(rollup@3.29.4)':
+  '@rollup/plugin-commonjs@25.0.8(rollup@3.29.5)':
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@3.29.4)
+      '@rollup/pluginutils': 5.1.0(rollup@3.29.5)
       commondir: 1.0.1
       estree-walker: 2.0.2
       glob: 8.1.0
       is-reference: 1.2.1
       magic-string: 0.30.11
     optionalDependencies:
-      rollup: 3.29.4
+      rollup: 3.29.5
 
+<<<<<<< HEAD
   '@rollup/plugin-commonjs@25.0.8(rollup@4.21.3)':
     dependencies:
       '@rollup/pluginutils': 5.1.0(rollup@4.21.3)
+=======
+  '@rollup/plugin-commonjs@25.0.8(rollup@4.22.4)':
+    dependencies:
+      '@rollup/pluginutils': 5.1.0(rollup@4.22.4)
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       commondir: 1.0.1
       estree-walker: 2.0.2
       glob: 8.1.0
       is-reference: 1.2.1
       magic-string: 0.30.11
     optionalDependencies:
+<<<<<<< HEAD
       rollup: 4.21.3
 
   '@rollup/plugin-inject@5.0.5(rollup@4.21.3)':
@@ -14054,18 +14155,37 @@ snapshots:
       magic-string: 0.30.11
     optionalDependencies:
       rollup: 4.21.3
+=======
+      rollup: 4.22.4
 
-  '@rollup/plugin-json@6.1.0(rollup@3.29.4)':
+  '@rollup/plugin-inject@5.0.5(rollup@4.22.4)':
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@3.29.4)
+      '@rollup/pluginutils': 5.1.0(rollup@4.22.4)
+      estree-walker: 2.0.2
+      magic-string: 0.30.11
     optionalDependencies:
-      rollup: 3.29.4
+      rollup: 4.22.4
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
 
+  '@rollup/plugin-json@6.1.0(rollup@3.29.5)':
+    dependencies:
+      '@rollup/pluginutils': 5.1.0(rollup@3.29.5)
+    optionalDependencies:
+      rollup: 3.29.5
+
+<<<<<<< HEAD
   '@rollup/plugin-json@6.1.0(rollup@4.21.3)':
     dependencies:
       '@rollup/pluginutils': 5.1.0(rollup@4.21.3)
     optionalDependencies:
       rollup: 4.21.3
+=======
+  '@rollup/plugin-json@6.1.0(rollup@4.22.4)':
+    dependencies:
+      '@rollup/pluginutils': 5.1.0(rollup@4.22.4)
+    optionalDependencies:
+      rollup: 4.22.4
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
 
   '@rollup/plugin-node-resolve@15.2.3(rollup@2.79.1)':
     dependencies:
@@ -14078,27 +14198,37 @@ snapshots:
     optionalDependencies:
       rollup: 2.79.1
 
-  '@rollup/plugin-node-resolve@15.2.3(rollup@3.29.4)':
+  '@rollup/plugin-node-resolve@15.2.3(rollup@3.29.5)':
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@3.29.4)
+      '@rollup/pluginutils': 5.1.0(rollup@3.29.5)
       '@types/resolve': 1.20.2
       deepmerge: 4.3.1
       is-builtin-module: 3.2.1
       is-module: 1.0.0
       resolve: 1.22.8
     optionalDependencies:
-      rollup: 3.29.4
+      rollup: 3.29.5
 
+<<<<<<< HEAD
   '@rollup/plugin-node-resolve@15.2.3(rollup@4.21.3)':
     dependencies:
       '@rollup/pluginutils': 5.1.0(rollup@4.21.3)
+=======
+  '@rollup/plugin-node-resolve@15.2.3(rollup@4.22.4)':
+    dependencies:
+      '@rollup/pluginutils': 5.1.0(rollup@4.22.4)
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       '@types/resolve': 1.20.2
       deepmerge: 4.3.1
       is-builtin-module: 3.2.1
       is-module: 1.0.0
       resolve: 1.22.8
     optionalDependencies:
+<<<<<<< HEAD
       rollup: 4.21.3
+=======
+      rollup: 4.22.4
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
 
   '@rollup/plugin-replace@2.4.2(rollup@2.79.1)':
     dependencies:
@@ -14106,19 +14236,28 @@ snapshots:
       magic-string: 0.25.9
       rollup: 2.79.1
 
-  '@rollup/plugin-replace@5.0.7(rollup@3.29.4)':
+  '@rollup/plugin-replace@5.0.7(rollup@3.29.5)':
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@3.29.4)
+      '@rollup/pluginutils': 5.1.0(rollup@3.29.5)
       magic-string: 0.30.11
     optionalDependencies:
-      rollup: 3.29.4
+      rollup: 3.29.5
 
+<<<<<<< HEAD
   '@rollup/plugin-replace@5.0.7(rollup@4.21.3)':
     dependencies:
       '@rollup/pluginutils': 5.1.0(rollup@4.21.3)
       magic-string: 0.30.11
     optionalDependencies:
       rollup: 4.21.3
+=======
+  '@rollup/plugin-replace@5.0.7(rollup@4.22.4)':
+    dependencies:
+      '@rollup/pluginutils': 5.1.0(rollup@4.22.4)
+      magic-string: 0.30.11
+    optionalDependencies:
+      rollup: 4.22.4
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
 
   '@rollup/plugin-terser@0.4.4(rollup@2.79.1)':
     dependencies:
@@ -14128,13 +14267,21 @@ snapshots:
     optionalDependencies:
       rollup: 2.79.1
 
+<<<<<<< HEAD
   '@rollup/plugin-terser@0.4.4(rollup@4.21.3)':
+=======
+  '@rollup/plugin-terser@0.4.4(rollup@4.22.4)':
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     dependencies:
       serialize-javascript: 6.0.2
       smob: 1.5.0
       terser: 5.32.0
     optionalDependencies:
+<<<<<<< HEAD
       rollup: 4.21.3
+=======
+      rollup: 4.22.4
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
 
   '@rollup/pluginutils@3.1.0(rollup@2.79.1)':
     dependencies:
@@ -14156,14 +14303,15 @@ snapshots:
     optionalDependencies:
       rollup: 2.79.1
 
-  '@rollup/pluginutils@5.1.0(rollup@3.29.4)':
+  '@rollup/pluginutils@5.1.0(rollup@3.29.5)':
     dependencies:
       '@types/estree': 1.0.5
       estree-walker: 2.0.2
       picomatch: 2.3.1
     optionalDependencies:
-      rollup: 3.29.4
+      rollup: 3.29.5
 
+<<<<<<< HEAD
   '@rollup/pluginutils@5.1.0(rollup@4.21.3)':
     dependencies:
       '@types/estree': 1.0.5
@@ -14173,13 +14321,17 @@ snapshots:
       rollup: 4.21.3
 
   '@rollup/pluginutils@5.1.0(rollup@4.22.0)':
+=======
+  '@rollup/pluginutils@5.1.0(rollup@4.22.4)':
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     dependencies:
       '@types/estree': 1.0.5
       estree-walker: 2.0.2
       picomatch: 2.3.1
     optionalDependencies:
-      rollup: 4.22.0
+      rollup: 4.22.4
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-android-arm-eabi@4.21.3':
     optional: true
@@ -14201,71 +14353,102 @@ snapshots:
 =======
   '@rollup/rollup-android-arm-eabi@4.22.2':
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+  '@rollup/rollup-android-arm-eabi@4.22.4':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.22.0':
+  '@rollup/rollup-android-arm64@4.22.4':
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     optional: true
 
+  '@rollup/rollup-darwin-arm64@4.22.4':
+    optional: true
+
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-darwin-arm64@4.21.3':
 =======
   '@rollup/rollup-android-arm64@4.22.2':
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+  '@rollup/rollup-darwin-x64@4.22.4':
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.22.0':
+  '@rollup/rollup-linux-arm-gnueabihf@4.22.4':
     optional: true
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-darwin-x64@4.21.3':
 =======
   '@rollup/rollup-darwin-arm64@4.22.2':
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+  '@rollup/rollup-linux-arm-musleabihf@4.22.4':
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.22.0':
+  '@rollup/rollup-linux-arm64-gnu@4.22.4':
     optional: true
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-linux-arm-gnueabihf@4.21.3':
 =======
   '@rollup/rollup-darwin-x64@4.22.2':
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+  '@rollup/rollup-linux-arm64-musl@4.22.4':
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.22.0':
+  '@rollup/rollup-linux-powerpc64le-gnu@4.22.4':
     optional: true
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-linux-arm-musleabihf@4.21.3':
 =======
   '@rollup/rollup-linux-arm-gnueabihf@4.22.2':
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+  '@rollup/rollup-linux-riscv64-gnu@4.22.4':
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.22.0':
+  '@rollup/rollup-linux-s390x-gnu@4.22.4':
     optional: true
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-linux-arm64-gnu@4.21.3':
 =======
   '@rollup/rollup-linux-arm-musleabihf@4.22.2':
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+  '@rollup/rollup-linux-x64-gnu@4.22.4':
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.22.0':
+  '@rollup/rollup-linux-x64-musl@4.22.4':
     optional: true
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-linux-arm64-musl@4.21.3':
 =======
   '@rollup/rollup-linux-arm64-gnu@4.22.2':
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+  '@rollup/rollup-win32-arm64-msvc@4.22.4':
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.22.0':
+  '@rollup/rollup-win32-ia32-msvc@4.22.4':
     optional: true
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   '@rollup/rollup-linux-powerpc64le-gnu@4.21.3':
 =======
@@ -14347,6 +14530,9 @@ snapshots:
     optional: true
 
   '@rollup/rollup-win32-x64-msvc@4.22.2':
+=======
+  '@rollup/rollup-win32-x64-msvc@4.22.4':
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     optional: true
 
   '@rushstack/node-core-library@5.7.0(@types/node@22.5.5)':
@@ -14813,6 +14999,7 @@ snapshots:
       - encoding
       - supports-color
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
   '@vite-pwa/vitepress@0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0))':
@@ -14825,8 +15012,11 @@ snapshots:
 =======
   '@vite-pwa/vitepress@0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0))':
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+  '@vite-pwa/vitepress@0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0))':
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     dependencies:
-      vite-plugin-pwa: 0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0)
+      vite-plugin-pwa: 0.20.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0)
 
 <<<<<<< HEAD
   '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2))':
@@ -14864,11 +15054,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue@5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2))':
-    dependencies:
-      vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)
-      vue: 3.5.7(typescript@5.6.2)
-
   '@vitejs/plugin-vue@5.1.4(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2))':
     dependencies:
       vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)
@@ -14973,14 +15158,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@vue/compiler-core@3.5.6':
-    dependencies:
-      '@babel/parser': 7.25.6
-      '@vue/shared': 3.5.6
-      entities: 4.5.0
-      estree-walker: 2.0.2
-      source-map-js: 1.2.1
-
   '@vue/compiler-core@3.5.7':
     dependencies:
       '@babel/parser': 7.25.6
@@ -14989,28 +15166,11 @@ snapshots:
       estree-walker: 2.0.2
       source-map-js: 1.2.1
 
-  '@vue/compiler-dom@3.5.6':
-    dependencies:
-      '@vue/compiler-core': 3.5.6
-      '@vue/shared': 3.5.6
-
   '@vue/compiler-dom@3.5.7':
     dependencies:
       '@vue/compiler-core': 3.5.7
       '@vue/shared': 3.5.7
 
-  '@vue/compiler-sfc@3.5.6':
-    dependencies:
-      '@babel/parser': 7.25.6
-      '@vue/compiler-core': 3.5.6
-      '@vue/compiler-dom': 3.5.6
-      '@vue/compiler-ssr': 3.5.6
-      '@vue/shared': 3.5.6
-      estree-walker: 2.0.2
-      magic-string: 0.30.11
-      postcss: 8.4.47
-      source-map-js: 1.2.1
-
   '@vue/compiler-sfc@3.5.7':
     dependencies:
       '@babel/parser': 7.25.6
@@ -15023,11 +15183,6 @@ snapshots:
       postcss: 8.4.47
       source-map-js: 1.2.1
 
-  '@vue/compiler-ssr@3.5.6':
-    dependencies:
-      '@vue/compiler-dom': 3.5.6
-      '@vue/shared': 3.5.6
-
   '@vue/compiler-ssr@3.5.7':
     dependencies:
       '@vue/compiler-dom': 3.5.7
@@ -15127,8 +15282,6 @@ snapshots:
       '@vue/shared': 3.5.7
       vue: 3.5.7(typescript@5.6.2)
 
-  '@vue/shared@3.5.6': {}
-
   '@vue/shared@3.5.7': {}
 
   '@vue/test-utils@2.4.6':
@@ -15561,8 +15714,13 @@ snapshots:
 
   browserslist@4.23.3:
     dependencies:
+<<<<<<< HEAD
       caniuse-lite: 1.0.30001660
       electron-to-chromium: 1.5.19
+=======
+      caniuse-lite: 1.0.30001662
+      electron-to-chromium: 1.5.27
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       node-releases: 2.0.18
       update-browserslist-db: 1.1.0(browserslist@4.23.3)
 
@@ -15740,7 +15898,7 @@ snapshots:
   circular-dependency-scanner@2.3.0:
     dependencies:
       '@ast-grep/napi': 0.27.1
-      '@vue/compiler-sfc': 3.5.6
+      '@vue/compiler-sfc': 3.5.7
       commander: 12.1.0
       get-tsconfig: 4.8.0
       graph-cycles: 3.0.0
@@ -16341,7 +16499,7 @@ snapshots:
     dependencies:
       '@babel/parser': 7.25.6
       '@babel/traverse': 7.25.6
-      '@vue/compiler-sfc': 3.5.6
+      '@vue/compiler-sfc': 3.5.7
       callsite: 1.0.0
       camelcase: 6.3.0
       cosmiconfig: 7.1.0
@@ -16490,7 +16648,11 @@ snapshots:
     dependencies:
       jake: 10.9.2
 
+<<<<<<< HEAD
   electron-to-chromium@1.5.19: {}
+=======
+  electron-to-chromium@1.5.27: {}
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
 
   element-plus@2.8.3(vue@3.5.7(typescript@5.6.2)):
     dependencies:
@@ -16848,7 +17010,7 @@ snapshots:
       eslint: 9.11.0(jiti@1.21.6)
       espree: 10.1.0
       esquery: 1.6.0
-      parse-imports: 2.1.1
+      parse-imports: 2.2.1
       semver: 7.6.3
       spdx-expression-parse: 4.0.0
       synckit: 0.9.1
@@ -18599,6 +18761,7 @@ snapshots:
     dependencies:
       '@cloudflare/kv-asset-handler': 0.3.4
       '@netlify/functions': 2.8.1
+<<<<<<< HEAD
       '@rollup/plugin-alias': 5.1.0(rollup@4.21.3)
       '@rollup/plugin-commonjs': 25.0.8(rollup@4.21.3)
       '@rollup/plugin-inject': 5.0.5(rollup@4.21.3)
@@ -18607,6 +18770,16 @@ snapshots:
       '@rollup/plugin-replace': 5.0.7(rollup@4.21.3)
       '@rollup/plugin-terser': 0.4.4(rollup@4.21.3)
       '@rollup/pluginutils': 5.1.0(rollup@4.21.3)
+=======
+      '@rollup/plugin-alias': 5.1.0(rollup@4.22.4)
+      '@rollup/plugin-commonjs': 25.0.8(rollup@4.22.4)
+      '@rollup/plugin-inject': 5.0.5(rollup@4.22.4)
+      '@rollup/plugin-json': 6.1.0(rollup@4.22.4)
+      '@rollup/plugin-node-resolve': 15.2.3(rollup@4.22.4)
+      '@rollup/plugin-replace': 5.0.7(rollup@4.22.4)
+      '@rollup/plugin-terser': 0.4.4(rollup@4.22.4)
+      '@rollup/pluginutils': 5.1.0(rollup@4.22.4)
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       '@types/http-proxy': 1.17.15
       '@vercel/nft': 0.26.5(encoding@0.1.13)
       archiver: 7.0.1
@@ -18641,16 +18814,26 @@ snapshots:
       mlly: 1.7.1
       mri: 1.2.0
       node-fetch-native: 1.6.4
+<<<<<<< HEAD
       ofetch: 1.3.4
       ohash: 1.1.3
+=======
+      ofetch: 1.4.0
+      ohash: 1.1.4
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       openapi-typescript: 6.7.6
       pathe: 1.1.2
       perfect-debounce: 1.0.0
       pkg-types: 1.2.0
       pretty-bytes: 6.1.1
       radix3: 1.1.2
+<<<<<<< HEAD
       rollup: 4.21.3
       rollup-plugin-visualizer: 5.12.0(rollup@4.21.3)
+=======
+      rollup: 4.22.4
+      rollup-plugin-visualizer: 5.12.0(rollup@4.22.4)
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       scule: 1.3.0
       semver: 7.6.3
       serve-placeholder: 2.0.2
@@ -18660,7 +18843,11 @@ snapshots:
       uncrypto: 0.1.3
       unctx: 2.3.1(webpack-sources@3.2.3)
       unenv: 1.10.0
+<<<<<<< HEAD
       unimport: 3.12.0(rollup@4.21.3)(webpack-sources@3.2.3)
+=======
+      unimport: 3.12.0(rollup@4.22.4)
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       unstorage: 1.12.0(ioredis@5.4.1)
       unwasm: 0.3.9(webpack-sources@3.2.3)
     transitivePeerDependencies:
@@ -18795,7 +18982,7 @@ snapshots:
       has-symbols: 1.0.3
       object-keys: 1.1.1
 
-  ofetch@1.3.4:
+  ofetch@1.4.0:
     dependencies:
       destr: 2.0.3
       node-fetch-native: 1.6.4
@@ -18928,7 +19115,7 @@ snapshots:
     dependencies:
       callsites: 3.1.0
 
-  parse-imports@2.1.1:
+  parse-imports@2.2.1:
     dependencies:
       es-module-lexer: 1.5.4
       slashes: 3.0.12
@@ -19014,6 +19201,7 @@ snapshots:
 
   pify@4.0.1: {}
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   pinia-plugin-persistedstate@4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2)))(rollup@4.22.0)(webpack-sources@3.2.3):
     dependencies:
@@ -19023,6 +19211,11 @@ snapshots:
     dependencies:
       '@nuxt/kit': 3.13.2(rollup@4.22.2)
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+  pinia-plugin-persistedstate@4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)))(rollup@4.22.4):
+    dependencies:
+      '@nuxt/kit': 3.13.2(rollup@4.22.4)
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       deep-pick-omit: 1.2.0
       defu: 6.1.4
       destr: 2.0.3
@@ -19801,14 +19994,15 @@ snapshots:
       glob: 11.0.0
       package-json-from-dist: 1.0.0
 
-  rollup-plugin-dts@6.1.1(rollup@3.29.4)(typescript@5.6.2):
+  rollup-plugin-dts@6.1.1(rollup@3.29.5)(typescript@5.6.2):
     dependencies:
       magic-string: 0.30.11
-      rollup: 3.29.4
+      rollup: 3.29.5
       typescript: 5.6.2
     optionalDependencies:
       '@babel/code-frame': 7.24.7
 
+<<<<<<< HEAD
   rollup-plugin-visualizer@5.12.0(rollup@4.21.3):
     dependencies:
       open: 8.4.2
@@ -19819,31 +20013,26 @@ snapshots:
       rollup: 4.21.3
 
   rollup-plugin-visualizer@5.12.0(rollup@4.22.0):
+=======
+  rollup-plugin-visualizer@5.12.0(rollup@4.22.4):
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     dependencies:
       open: 8.4.2
       picomatch: 2.3.1
       source-map: 0.7.4
       yargs: 17.7.2
     optionalDependencies:
-      rollup: 4.22.0
-
-  rollup-plugin-visualizer@5.12.0(rollup@4.22.2):
-    dependencies:
-      open: 8.4.2
-      picomatch: 2.3.1
-      source-map: 0.7.4
-      yargs: 17.7.2
-    optionalDependencies:
-      rollup: 4.22.2
+      rollup: 4.22.4
 
   rollup@2.79.1:
     optionalDependencies:
       fsevents: 2.3.3
 
-  rollup@3.29.4:
+  rollup@3.29.5:
     optionalDependencies:
       fsevents: 2.3.3
 
+<<<<<<< HEAD
   rollup@4.21.3:
     dependencies:
       '@types/estree': 1.0.5
@@ -19867,47 +20056,28 @@ snapshots:
       fsevents: 2.3.3
 
   rollup@4.22.0:
+=======
+  rollup@4.22.4:
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     dependencies:
       '@types/estree': 1.0.5
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.22.0
-      '@rollup/rollup-android-arm64': 4.22.0
-      '@rollup/rollup-darwin-arm64': 4.22.0
-      '@rollup/rollup-darwin-x64': 4.22.0
-      '@rollup/rollup-linux-arm-gnueabihf': 4.22.0
-      '@rollup/rollup-linux-arm-musleabihf': 4.22.0
-      '@rollup/rollup-linux-arm64-gnu': 4.22.0
-      '@rollup/rollup-linux-arm64-musl': 4.22.0
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.22.0
-      '@rollup/rollup-linux-riscv64-gnu': 4.22.0
-      '@rollup/rollup-linux-s390x-gnu': 4.22.0
-      '@rollup/rollup-linux-x64-gnu': 4.22.0
-      '@rollup/rollup-linux-x64-musl': 4.22.0
-      '@rollup/rollup-win32-arm64-msvc': 4.22.0
-      '@rollup/rollup-win32-ia32-msvc': 4.22.0
-      '@rollup/rollup-win32-x64-msvc': 4.22.0
-      fsevents: 2.3.3
-
-  rollup@4.22.2:
-    dependencies:
-      '@types/estree': 1.0.5
-    optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.22.2
-      '@rollup/rollup-android-arm64': 4.22.2
-      '@rollup/rollup-darwin-arm64': 4.22.2
-      '@rollup/rollup-darwin-x64': 4.22.2
-      '@rollup/rollup-linux-arm-gnueabihf': 4.22.2
-      '@rollup/rollup-linux-arm-musleabihf': 4.22.2
-      '@rollup/rollup-linux-arm64-gnu': 4.22.2
-      '@rollup/rollup-linux-arm64-musl': 4.22.2
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.22.2
-      '@rollup/rollup-linux-riscv64-gnu': 4.22.2
-      '@rollup/rollup-linux-s390x-gnu': 4.22.2
-      '@rollup/rollup-linux-x64-gnu': 4.22.2
-      '@rollup/rollup-linux-x64-musl': 4.22.2
-      '@rollup/rollup-win32-arm64-msvc': 4.22.2
-      '@rollup/rollup-win32-ia32-msvc': 4.22.2
-      '@rollup/rollup-win32-x64-msvc': 4.22.2
+      '@rollup/rollup-android-arm-eabi': 4.22.4
+      '@rollup/rollup-android-arm64': 4.22.4
+      '@rollup/rollup-darwin-arm64': 4.22.4
+      '@rollup/rollup-darwin-x64': 4.22.4
+      '@rollup/rollup-linux-arm-gnueabihf': 4.22.4
+      '@rollup/rollup-linux-arm-musleabihf': 4.22.4
+      '@rollup/rollup-linux-arm64-gnu': 4.22.4
+      '@rollup/rollup-linux-arm64-musl': 4.22.4
+      '@rollup/rollup-linux-powerpc64le-gnu': 4.22.4
+      '@rollup/rollup-linux-riscv64-gnu': 4.22.4
+      '@rollup/rollup-linux-s390x-gnu': 4.22.4
+      '@rollup/rollup-linux-x64-gnu': 4.22.4
+      '@rollup/rollup-linux-x64-musl': 4.22.4
+      '@rollup/rollup-win32-arm64-msvc': 4.22.4
+      '@rollup/rollup-win32-ia32-msvc': 4.22.4
+      '@rollup/rollup-win32-x64-msvc': 4.22.4
       fsevents: 2.3.3
 
   rotated-array-set@3.0.0: {}
@@ -20759,12 +20929,12 @@ snapshots:
 
   unbuild@2.0.0(sass@1.79.3)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)):
     dependencies:
-      '@rollup/plugin-alias': 5.1.0(rollup@3.29.4)
-      '@rollup/plugin-commonjs': 25.0.8(rollup@3.29.4)
-      '@rollup/plugin-json': 6.1.0(rollup@3.29.4)
-      '@rollup/plugin-node-resolve': 15.2.3(rollup@3.29.4)
-      '@rollup/plugin-replace': 5.0.7(rollup@3.29.4)
-      '@rollup/pluginutils': 5.1.0(rollup@3.29.4)
+      '@rollup/plugin-alias': 5.1.0(rollup@3.29.5)
+      '@rollup/plugin-commonjs': 25.0.8(rollup@3.29.5)
+      '@rollup/plugin-json': 6.1.0(rollup@3.29.5)
+      '@rollup/plugin-node-resolve': 15.2.3(rollup@3.29.5)
+      '@rollup/plugin-replace': 5.0.7(rollup@3.29.5)
+      '@rollup/pluginutils': 5.1.0(rollup@3.29.5)
       chalk: 5.3.0
       citty: 0.1.6
       consola: 3.2.3
@@ -20779,8 +20949,8 @@ snapshots:
       pathe: 1.1.2
       pkg-types: 1.2.0
       pretty-bytes: 6.1.1
-      rollup: 3.29.4
-      rollup-plugin-dts: 6.1.1(rollup@3.29.4)(typescript@5.6.2)
+      rollup: 3.29.5
+      rollup-plugin-dts: 6.1.1(rollup@3.29.5)(typescript@5.6.2)
       scule: 1.3.0
       untyped: 1.4.2
     optionalDependencies:
@@ -20832,6 +21002,7 @@ snapshots:
 
   unicorn-magic@0.3.0: {}
 
+<<<<<<< HEAD
   unimport@3.12.0(rollup@4.21.3)(webpack-sources@3.2.3):
     dependencies:
       '@rollup/pluginutils': 5.1.0(rollup@4.21.3)
@@ -20873,6 +21044,11 @@ snapshots:
   unimport@3.12.0(rollup@4.22.2):
     dependencies:
       '@rollup/pluginutils': 5.1.0(rollup@4.22.2)
+=======
+  unimport@3.12.0(rollup@4.22.4):
+    dependencies:
+      '@rollup/pluginutils': 5.1.0(rollup@4.22.4)
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       acorn: 8.12.1
       escape-string-regexp: 5.0.0
       estree-walker: 3.0.3
@@ -20930,13 +21106,17 @@ snapshots:
 
   universalify@2.0.1: {}
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   unplugin-element-plus@0.8.0(rollup@4.22.0)(webpack-sources@3.2.3):
 =======
   unplugin-element-plus@0.8.0(rollup@4.22.2):
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+  unplugin-element-plus@0.8.0(rollup@4.22.4):
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.22.2)
+      '@rollup/pluginutils': 5.1.0(rollup@4.22.4)
       es-module-lexer: 1.5.4
       magic-string: 0.30.11
       unplugin: 1.14.1(webpack-sources@3.2.3)
@@ -20988,7 +21168,7 @@ snapshots:
       lru-cache: 10.4.3
       mri: 1.2.0
       node-fetch-native: 1.6.4
-      ofetch: 1.3.4
+      ofetch: 1.4.0
       ufo: 1.5.4
     optionalDependencies:
       ioredis: 5.4.1
@@ -21167,10 +21347,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-dts@4.2.1(@types/node@22.5.5)(rollup@4.22.2)(typescript@5.6.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)):
+  vite-plugin-dts@4.2.1(@types/node@22.5.5)(rollup@4.22.4)(typescript@5.6.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)):
     dependencies:
       '@microsoft/api-extractor': 7.47.7(@types/node@22.5.5)
-      '@rollup/pluginutils': 5.1.0(rollup@4.22.2)
+      '@rollup/pluginutils': 5.1.0(rollup@4.22.4)
       '@volar/typescript': 2.4.5
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
       '@vue/language-core': 2.1.6(typescript@5.6.2)
@@ -21230,11 +21410,15 @@ snapshots:
 =======
       vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)
 
+<<<<<<< HEAD
   vite-plugin-inspect@0.8.7(rollup@4.22.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)):
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
+=======
+  vite-plugin-inspect@0.8.7(rollup@4.22.4)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)):
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
     dependencies:
       '@antfu/utils': 0.7.10
-      '@rollup/pluginutils': 5.1.0(rollup@4.22.2)
+      '@rollup/pluginutils': 5.1.0(rollup@4.22.4)
       debug: 4.3.7
       error-stack-parser-es: 0.1.5
       fs-extra: 11.2.0
@@ -21281,6 +21465,7 @@ snapshots:
 =======
       vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)
 
+<<<<<<< HEAD
   vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0):
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
     dependencies:
@@ -21312,6 +21497,8 @@ snapshots:
       '@vue/devtools-core': 7.4.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2))
 >>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c
 =======
+=======
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
   vite-plugin-pwa@0.20.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0):
     dependencies:
       debug: 4.3.7
@@ -21323,7 +21510,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vue-devtools@7.4.5(rollup@4.22.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2)):
+  vite-plugin-vue-devtools@7.4.5(rollup@4.22.4)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2)):
     dependencies:
       '@vue/devtools-core': 7.4.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2))
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
@@ -21343,7 +21530,7 @@ snapshots:
 >>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c
 =======
       vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)
-      vite-plugin-inspect: 0.8.7(rollup@4.22.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))
+      vite-plugin-inspect: 0.8.7(rollup@4.22.4)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))
       vite-plugin-vue-inspector: 5.2.0(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
     transitivePeerDependencies:
@@ -21394,6 +21581,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+<<<<<<< HEAD
   vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0):
     dependencies:
       esbuild: 0.21.5
@@ -21414,11 +21602,13 @@ snapshots:
       sass: 1.79.3
       terser: 5.33.0
 
+=======
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
   vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0):
     dependencies:
       esbuild: 0.21.5
       postcss: 8.4.47
-      rollup: 4.22.2
+      rollup: 4.22.4
     optionalDependencies:
       '@types/node': 22.5.5
       fsevents: 2.3.3
@@ -21457,6 +21647,7 @@ snapshots:
       '@shikijs/core': 1.18.0
       '@shikijs/transformers': 1.18.0
       '@types/markdown-it': 14.1.2
+<<<<<<< HEAD
 <<<<<<< HEAD
       '@vitejs/plugin-vue': 5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2))
 >>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c
@@ -21467,6 +21658,9 @@ snapshots:
       focus-trap: 7.5.4
 =======
       '@vitejs/plugin-vue': 5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2))
+=======
+      '@vitejs/plugin-vue': 5.1.4(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2))
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       '@vue/devtools-api': 7.4.5
       '@vue/shared': 3.5.7
       '@vueuse/core': 11.1.0(vue@3.5.7(typescript@5.6.2))
@@ -21480,12 +21674,16 @@ snapshots:
       vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)
 =======
       shiki: 1.18.0
+<<<<<<< HEAD
 <<<<<<< HEAD
       vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)
 >>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c
       vue: 3.5.6(typescript@5.6.2)
 =======
       vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)
+=======
+      vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)
+>>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9
       vue: 3.5.7(typescript@5.6.2)
 >>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153
     optionalDependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 5bac8de6..eb94450d 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -134,7 +134,7 @@ catalog:
   radix-vue: ^1.9.6
   resolve.exports: ^2.0.2
   rimraf: ^6.0.1
-  rollup: ^4.22.2
+  rollup: ^4.22.4
   rollup-plugin-visualizer: ^5.12.0
   sass: ^1.79.3
   sortablejs: ^1.15.3