fix: 修改echarts组件导入地址

2024-08-29 16:25:41 +08:00
parent 00c95c373d
commit 9056f6a543
8 changed files with 49 additions and 222 deletions
--- a/apps/web-antd/src/views/monitor/cache/components/CommandChart.vue
+++ b/apps/web-antd/src/views/monitor/cache/components/CommandChart.vue
@@ -3,7 +3,11 @@ import type { EChartsOption } from 'echarts';

 import { defineComponent, onMounted, ref, watch } from 'vue';

-import { EchartsUI, type EchartsUIType, useEcharts } from '@vben/chart-ui';
+import {
+  EchartsUI,
+  type EchartsUIType,
+  useEcharts,
+} from '@vben/plugins/echarts';

 export default defineComponent({
  components: { EchartsUI },
--- a/apps/web-antd/src/views/monitor/cache/components/MemoryChart.vue
+++ b/apps/web-antd/src/views/monitor/cache/components/MemoryChart.vue
@@ -3,7 +3,11 @@ import type { EChartsOption } from 'echarts';

 import { defineComponent, onMounted, ref, watch } from 'vue';

-import { EchartsUI, type EchartsUIType, useEcharts } from '@vben/chart-ui';
+import {
+  EchartsUI,
+  type EchartsUIType,
+  useEcharts,
+} from '@vben/plugins/echarts';

 export default defineComponent({
  components: { EchartsUI },
--- a/apps/web-antd/src/views/演示使用自行删除/visit/pages/browser.vue
+++ b/apps/web-antd/src/views/演示使用自行删除/visit/pages/browser.vue
@@ -4,7 +4,11 @@ import type { EChartsOption } from 'echarts';
 // import * as echarts from 'echarts';
 import { onMounted, ref } from 'vue';

-import { EchartsUI, type EchartsUIType, useEcharts } from '@vben/chart-ui';
+import {
+  EchartsUI,
+  type EchartsUIType,
+  useEcharts,
+} from '@vben/plugins/echarts';

 import { browserInfoList } from '../api';

--- a/apps/web-antd/src/views/演示使用自行删除/visit/pages/device.vue
+++ b/apps/web-antd/src/views/演示使用自行删除/visit/pages/device.vue
@@ -4,7 +4,11 @@ import type { EChartsOption } from 'echarts';
 // import * as echarts from 'echarts';
 import { onMounted, ref } from 'vue';

-import { EchartsUI, type EchartsUIType, useEcharts } from '@vben/chart-ui';
+import {
+  EchartsUI,
+  type EchartsUIType,
+  useEcharts,
+} from '@vben/plugins/echarts';

 import { deviceInfoList } from '../api';

--- a/apps/web-antd/src/views/演示使用自行删除/visit/pages/isp.vue
+++ b/apps/web-antd/src/views/演示使用自行删除/visit/pages/isp.vue
@@ -4,7 +4,11 @@ import type { EChartsOption } from 'echarts';
 // import * as echarts from 'echarts';
 import { onMounted, ref } from 'vue';

-import { EchartsUI, type EchartsUIType, useEcharts } from '@vben/chart-ui';
+import {
+  EchartsUI,
+  type EchartsUIType,
+  useEcharts,
+} from '@vben/plugins/echarts';

 import { ispInfoList } from '../api';

--- a/apps/web-antd/src/views/演示使用自行删除/visit/pages/loginLine.vue
+++ b/apps/web-antd/src/views/演示使用自行删除/visit/pages/loginLine.vue
@@ -4,7 +4,11 @@ import type { EChartsOption } from 'echarts';
 // import * as echarts from 'echarts';
 import { onMounted, ref } from 'vue';

-import { EchartsUI, type EchartsUIType, useEcharts } from '@vben/chart-ui';
+import {
+  EchartsUI,
+  type EchartsUIType,
+  useEcharts,
+} from '@vben/plugins/echarts';

 import { loginLine } from '../api';

--- a/apps/web-antd/src/views/演示使用自行删除/visit/pages/map.vue
+++ b/apps/web-antd/src/views/演示使用自行删除/visit/pages/map.vue
@@ -4,7 +4,11 @@ import type { EChartsOption } from 'echarts';
 // import * as echarts from 'echarts';
 import { onMounted, ref } from 'vue';

-import { EchartsUI, type EchartsUIType, useEcharts } from '@vben/chart-ui';
+import {
+  EchartsUI,
+  type EchartsUIType,
+  useEcharts,
+} from '@vben/plugins/echarts';

 import * as echarts from 'echarts/core';

--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -219,7 +219,7 @@ importers:
        version: 4.17.12
      unplugin-vue-components:
        specifier: ^0.27.3
-        version: 0.27.4(@babel/parser@7.25.4)(rollup@4.21.0)(vue@3.4.38(typescript@5.5.4))
+        version: 0.27.4(@babel/parser@7.25.4)(rollup@4.21.1)(vue@3.4.38(typescript@5.5.4))

  apps/web-ele:
    dependencies:
@@ -3473,7 +3473,6 @@ packages:

  '@ls-lint/ls-lint@2.2.3':
    resolution: {integrity: sha512-ekM12jNm/7O2I/hsRv9HvYkRdfrHpiV1epVuI2NP+eTIcEgdIdKkKCs9KgQydu/8R5YXTov9aHdOgplmCHLupw==}
-    cpu: [x64, arm64, s390x]
    os: [darwin, linux, win32]
    hasBin: true

@@ -3771,214 +3770,169 @@ packages:
    cpu: [arm]
    os: [android]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-android-arm-eabi@4.21.1':
    resolution: {integrity: sha512-2thheikVEuU7ZxFXubPDOtspKn1x0yqaYQwvALVtEcvFhMifPADBrgRPyHV0TF3b+9BgvgjgagVyvA/UqPZHmg==}
    cpu: [arm]
    os: [android]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-android-arm64@4.21.0':
    resolution: {integrity: sha512-a1sR2zSK1B4eYkiZu17ZUZhmUQcKjk2/j9Me2IDjk1GHW7LB5Z35LEzj9iJch6gtUfsnvZs1ZNyDW2oZSThrkA==}
    cpu: [arm64]
    os: [android]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-android-arm64@4.21.1':
    resolution: {integrity: sha512-t1lLYn4V9WgnIFHXy1d2Di/7gyzBWS8G5pQSXdZqfrdCGTwi1VasRMSS81DTYb+avDs/Zz4A6dzERki5oRYz1g==}
    cpu: [arm64]
    os: [android]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-darwin-arm64@4.21.0':
    resolution: {integrity: sha512-zOnKWLgDld/svhKO5PD9ozmL6roy5OQ5T4ThvdYZLpiOhEGY+dp2NwUmxK0Ld91LrbjrvtNAE0ERBwjqhZTRAA==}
    cpu: [arm64]
    os: [darwin]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-darwin-arm64@4.21.1':
    resolution: {integrity: sha512-AH/wNWSEEHvs6t4iJ3RANxW5ZCK3fUnmf0gyMxWCesY1AlUj8jY7GC+rQE4wd3gwmZ9XDOpL0kcFnCjtN7FXlA==}
    cpu: [arm64]
    os: [darwin]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-darwin-x64@4.21.0':
    resolution: {integrity: sha512-7doS8br0xAkg48SKE2QNtMSFPFUlRdw9+votl27MvT46vo44ATBmdZdGysOevNELmZlfd+NEa0UYOA8f01WSrg==}
    cpu: [x64]
    os: [darwin]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-darwin-x64@4.21.1':
    resolution: {integrity: sha512-dO0BIz/+5ZdkLZrVgQrDdW7m2RkrLwYTh2YMFG9IpBtlC1x1NPNSXkfczhZieOlOLEqgXOFH3wYHB7PmBtf+Bg==}
    cpu: [x64]
    os: [darwin]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-linux-arm-gnueabihf@4.21.0':
    resolution: {integrity: sha512-pWJsfQjNWNGsoCq53KjMtwdJDmh/6NubwQcz52aEwLEuvx08bzcy6tOUuawAOncPnxz/3siRtd8hiQ32G1y8VA==}
    cpu: [arm]
    os: [linux]
    libc: [glibc]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-linux-arm-gnueabihf@4.21.1':
    resolution: {integrity: sha512-sWWgdQ1fq+XKrlda8PsMCfut8caFwZBmhYeoehJ05FdI0YZXk6ZyUjWLrIgbR/VgiGycrFKMMgp7eJ69HOF2pQ==}
    cpu: [arm]
    os: [linux]
    libc: [glibc]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-linux-arm-musleabihf@4.21.0':
    resolution: {integrity: sha512-efRIANsz3UHZrnZXuEvxS9LoCOWMGD1rweciD6uJQIx2myN3a8Im1FafZBzh7zk1RJ6oKcR16dU3UPldaKd83w==}
    cpu: [arm]
    os: [linux]
    libc: [musl]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-linux-arm-musleabihf@4.21.1':
    resolution: {integrity: sha512-9OIiSuj5EsYQlmwhmFRA0LRO0dRRjdCVZA3hnmZe1rEwRk11Jy3ECGGq3a7RrVEZ0/pCsYWx8jG3IvcrJ6RCew==}
    cpu: [arm]
    os: [linux]
    libc: [musl]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-linux-arm64-gnu@4.21.0':
    resolution: {integrity: sha512-ZrPhydkTVhyeGTW94WJ8pnl1uroqVHM3j3hjdquwAcWnmivjAwOYjTEAuEDeJvGX7xv3Z9GAvrBkEzCgHq9U1w==}
    cpu: [arm64]
    os: [linux]
    libc: [glibc]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-linux-arm64-gnu@4.21.1':
    resolution: {integrity: sha512-0kuAkRK4MeIUbzQYu63NrJmfoUVicajoRAL1bpwdYIYRcs57iyIV9NLcuyDyDXE2GiZCL4uhKSYAnyWpjZkWow==}
    cpu: [arm64]
    os: [linux]
    libc: [glibc]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-linux-arm64-musl@4.21.0':
    resolution: {integrity: sha512-cfaupqd+UEFeURmqNP2eEvXqgbSox/LHOyN9/d2pSdV8xTrjdg3NgOFJCtc1vQ/jEke1qD0IejbBfxleBPHnPw==}
    cpu: [arm64]
    os: [linux]
    libc: [musl]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-linux-arm64-musl@4.21.1':
    resolution: {integrity: sha512-/6dYC9fZtfEY0vozpc5bx1RP4VrtEOhNQGb0HwvYNwXD1BBbwQ5cKIbUVVU7G2d5WRE90NfB922elN8ASXAJEA==}
    cpu: [arm64]
    os: [linux]
    libc: [musl]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-linux-powerpc64le-gnu@4.21.0':
    resolution: {integrity: sha512-ZKPan1/RvAhrUylwBXC9t7B2hXdpb/ufeu22pG2psV7RN8roOfGurEghw1ySmX/CmDDHNTDDjY3lo9hRlgtaHg==}
    cpu: [ppc64]
    os: [linux]
    libc: [glibc]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-linux-powerpc64le-gnu@4.21.1':
    resolution: {integrity: sha512-ltUWy+sHeAh3YZ91NUsV4Xg3uBXAlscQe8ZOXRCVAKLsivGuJsrkawYPUEyCV3DYa9urgJugMLn8Z3Z/6CeyRQ==}
    cpu: [ppc64]
    os: [linux]
    libc: [glibc]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-linux-riscv64-gnu@4.21.0':
    resolution: {integrity: sha512-H1eRaCwd5E8eS8leiS+o/NqMdljkcb1d6r2h4fKSsCXQilLKArq6WS7XBLDu80Yz+nMqHVFDquwcVrQmGr28rg==}
    cpu: [riscv64]
    os: [linux]
    libc: [glibc]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-linux-riscv64-gnu@4.21.1':
    resolution: {integrity: sha512-BggMndzI7Tlv4/abrgLwa/dxNEMn2gC61DCLrTzw8LkpSKel4o+O+gtjbnkevZ18SKkeN3ihRGPuBxjaetWzWg==}
    cpu: [riscv64]
    os: [linux]
    libc: [glibc]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-linux-s390x-gnu@4.21.0':
    resolution: {integrity: sha512-zJ4hA+3b5tu8u7L58CCSI0A9N1vkfwPhWd/puGXwtZlsB5bTkwDNW/+JCU84+3QYmKpLi+XvHdmrlwUwDA6kqw==}
    cpu: [s390x]
    os: [linux]
    libc: [glibc]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-linux-s390x-gnu@4.21.1':
    resolution: {integrity: sha512-z/9rtlGd/OMv+gb1mNSjElasMf9yXusAxnRDrBaYB+eS1shFm6/4/xDH1SAISO5729fFKUkJ88TkGPRUh8WSAA==}
    cpu: [s390x]
    os: [linux]
    libc: [glibc]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-linux-x64-gnu@4.21.0':
    resolution: {integrity: sha512-e2hrvElFIh6kW/UNBQK/kzqMNY5mO+67YtEh9OA65RM5IJXYTWiXjX6fjIiPaqOkBthYF1EqgiZ6OXKcQsM0hg==}
    cpu: [x64]
    os: [linux]
    libc: [glibc]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-linux-x64-gnu@4.21.1':
    resolution: {integrity: sha512-kXQVcWqDcDKw0S2E0TmhlTLlUgAmMVqPrJZR+KpH/1ZaZhLSl23GZpQVmawBQGVhyP5WXIsIQ/zqbDBBYmxm5w==}
    cpu: [x64]
    os: [linux]
    libc: [glibc]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-linux-x64-musl@4.21.0':
    resolution: {integrity: sha512-1vvmgDdUSebVGXWX2lIcgRebqfQSff0hMEkLJyakQ9JQUbLDkEaMsPTLOmyccyC6IJ/l3FZuJbmrBw/u0A0uCQ==}
    cpu: [x64]
    os: [linux]
    libc: [musl]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-linux-x64-musl@4.21.1':
    resolution: {integrity: sha512-CbFv/WMQsSdl+bpX6rVbzR4kAjSSBuDgCqb1l4J68UYsQNalz5wOqLGYj4ZI0thGpyX5kc+LLZ9CL+kpqDovZA==}
    cpu: [x64]
    os: [linux]
    libc: [musl]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-win32-arm64-msvc@4.21.0':
    resolution: {integrity: sha512-s5oFkZ/hFcrlAyBTONFY1TWndfyre1wOMwU+6KCpm/iatybvrRgmZVM+vCFwxmC5ZhdlgfE0N4XorsDpi7/4XQ==}
    cpu: [arm64]
    os: [win32]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-win32-arm64-msvc@4.21.1':
    resolution: {integrity: sha512-3Q3brDgA86gHXWHklrwdREKIrIbxC0ZgU8lwpj0eEKGBQH+31uPqr0P2v11pn0tSIxHvcdOWxa4j+YvLNx1i6g==}
    cpu: [arm64]
    os: [win32]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-win32-ia32-msvc@4.21.0':
    resolution: {integrity: sha512-G9+TEqRnAA6nbpqyUqgTiopmnfgnMkR3kMukFBDsiyy23LZvUCpiUwjTRx6ezYCjJODXrh52rBR9oXvm+Fp5wg==}
    cpu: [ia32]
    os: [win32]

-<<<<<<< HEAD
-=======
  '@rollup/rollup-win32-ia32-msvc@4.21.1':
    resolution: {integrity: sha512-tNg+jJcKR3Uwe4L0/wY3Ro0H+u3nrb04+tcq1GSYzBEmKLeOQF2emk1whxlzNqb6MMrQ2JOcQEpuuiPLyRcSIw==}
    cpu: [ia32]
    os: [win32]

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-win32-x64-msvc@4.21.0':
    resolution: {integrity: sha512-2jsCDZwtQvRhejHLfZ1JY6w6kEuEtfF9nzYsZxzSlNVKDX+DpsDJ+Rbjkm74nvg2rdx0gwBS+IMdvwJuq3S9pQ==}
    cpu: [x64]
@@ -4247,17 +4201,12 @@ packages:
    resolution: {integrity: sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==}
    engines: {node: ^18.18.0 || >=20.0.0}

-<<<<<<< HEAD
  '@typescript-eslint/scope-manager@8.2.0':
    resolution: {integrity: sha512-OFn80B38yD6WwpoHU2Tz/fTz7CgFqInllBoC3WP+/jLbTb4gGPTy9HBSTsbDWkMdN55XlVU0mMDYAtgvlUspGw==}
-=======
-  '@typescript-eslint/scope-manager@8.1.0':
-    resolution: {integrity: sha512-DsuOZQji687sQUjm4N6c9xABJa7fjvfIdjqpSIIVOgaENf2jFXiM9hIBZOL3hb6DHK9Nvd2d7zZnoMLf9e0OtQ==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

  '@typescript-eslint/scope-manager@8.3.0':
    resolution: {integrity: sha512-mz2X8WcN2nVu5Hodku+IR8GgCOl4C0G/Z1ruaWN4dgec64kDBabuXyPAr+/RgJtumv8EEkqIzf3X2U5DUKB2eg==}
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

  '@typescript-eslint/type-utils@8.3.0':
@@ -4273,17 +4222,12 @@ packages:
    resolution: {integrity: sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==}
    engines: {node: ^18.18.0 || >=20.0.0}

-<<<<<<< HEAD
  '@typescript-eslint/types@8.2.0':
    resolution: {integrity: sha512-6a9QSK396YqmiBKPkJtxsgZZZVjYQ6wQ/TlI0C65z7vInaETuC6HAHD98AGLC8DyIPqHytvNuS8bBVvNLKyqvQ==}
-=======
-  '@typescript-eslint/types@8.1.0':
-    resolution: {integrity: sha512-q2/Bxa0gMOu/2/AKALI0tCKbG2zppccnRIRCW6BaaTlRVaPKft4oVYPp7WOPpcnsgbr0qROAVCVKCvIQ0tbWog==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

  '@typescript-eslint/types@8.3.0':
    resolution: {integrity: sha512-y6sSEeK+facMaAyixM36dQ5NVXTnKWunfD1Ft4xraYqxP0lC0POJmIaL/mw72CUMqjY9qfyVfXafMeaUj0noWw==}
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

  '@typescript-eslint/typescript-estree@7.18.0':
@@ -4295,12 +4239,8 @@ packages:
      typescript:
        optional: true

-<<<<<<< HEAD
  '@typescript-eslint/typescript-estree@8.2.0':
    resolution: {integrity: sha512-kiG4EDUT4dImplOsbh47B1QnNmXSoUqOjWDvCJw/o8LgfD0yr7k2uy54D5Wm0j4t71Ge1NkynGhpWdS0dEIAUA==}
-=======
-  '@typescript-eslint/typescript-estree@8.1.0':
-    resolution: {integrity: sha512-NTHhmufocEkMiAord/g++gWKb0Fr34e9AExBRdqgWdVBaKoei2dIyYKD9Q0jBnvfbEA5zaf8plUFMUH6kQ0vGg==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
    peerDependencies:
      typescript: '*'
@@ -4310,7 +4250,6 @@ packages:

  '@typescript-eslint/typescript-estree@8.3.0':
    resolution: {integrity: sha512-Mq7FTHl0R36EmWlCJWojIC1qn/ZWo2YiWYc1XVtasJ7FIgjo0MVv9rZWXEE7IK2CGrtwe1dVOxWwqXUdNgfRCA==}
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
    peerDependencies:
      typescript: '*'
@@ -4324,19 +4263,14 @@ packages:
    peerDependencies:
      eslint: ^8.56.0

-<<<<<<< HEAD
  '@typescript-eslint/utils@8.2.0':
    resolution: {integrity: sha512-O46eaYKDlV3TvAVDNcoDzd5N550ckSe8G4phko++OCSC1dYIb9LTc3HDGYdWqWIAT5qDUKphO6sd9RrpIJJPfg==}
-=======
-  '@typescript-eslint/utils@8.1.0':
-    resolution: {integrity: sha512-ypRueFNKTIFwqPeJBfeIpxZ895PQhNyH4YID6js0UoBImWYoSjBsahUn9KMiJXh94uOjVBgHD9AmkyPsPnFwJA==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
    peerDependencies:
      eslint: ^8.57.0 || ^9.0.0

  '@typescript-eslint/utils@8.3.0':
    resolution: {integrity: sha512-F77WwqxIi/qGkIGOGXNBLV7nykwfjLsdauRB/DOFPdv6LTF3BHHkBpq81/b5iMPSF055oO2BiivDJV4ChvNtXA==}
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
    peerDependencies:
      eslint: ^8.57.0 || ^9.0.0
@@ -4345,17 +4279,12 @@ packages:
    resolution: {integrity: sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==}
    engines: {node: ^18.18.0 || >=20.0.0}

-<<<<<<< HEAD
  '@typescript-eslint/visitor-keys@8.2.0':
    resolution: {integrity: sha512-sbgsPMW9yLvS7IhCi8IpuK1oBmtbWUNP+hBdwl/I9nzqVsszGnNGti5r9dUtF5RLivHUFFIdRvLiTsPhzSyJ3Q==}
-=======
-  '@typescript-eslint/visitor-keys@8.1.0':
-    resolution: {integrity: sha512-ba0lNI19awqZ5ZNKh6wCModMwoZs457StTebQ0q1NP58zSi2F6MOZRXwfKZy+jB78JNJ/WH8GSh2IQNzXX8Nag==}
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

  '@typescript-eslint/visitor-keys@8.3.0':
    resolution: {integrity: sha512-RmZwrTbQ9QveF15m/Cl28n0LXD6ea2CjkhH5rQ55ewz3H24w+AMCJHPVYaZ8/0HoG8Z3cLLFFycRXxeO2tz9FA==}
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}

  '@vercel/nft@0.26.5':
@@ -4492,24 +4421,14 @@ packages:
  '@vueuse/core@10.11.1':
    resolution: {integrity: sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==}

-<<<<<<< HEAD
-  '@vueuse/core@11.0.1':
-    resolution: {integrity: sha512-YTrekI18WwEyP3h168Fir94G/HNC27wvXJI21Alm0sPOwvhihfkrvHIe+5PNJq+MpgWdRcsjvE/38JaoKrgZhQ==}
-=======
  '@vueuse/core@11.0.3':
    resolution: {integrity: sha512-RENlh64+SYA9XMExmmH1a3TPqeIuJBNNB/63GT35MZI+zpru3oMRUA6cEFr9HmGqEgUisurwGwnIieF6qu3aXw==}
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5

  '@vueuse/core@9.13.0':
    resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==}

-<<<<<<< HEAD
-  '@vueuse/integrations@11.0.1':
-    resolution: {integrity: sha512-V/FQTS/aiV6RTFXOj8cXgqhtNJBvxvbHeLElOUR7N7F3Kr0btS+dkymLB54mFd0Or6uEGpgwwb41cs/q2/rdOg==}
-=======
  '@vueuse/integrations@11.0.3':
    resolution: {integrity: sha512-w6CDisaxs19S5Fd+NPPLFaA3GoX5gxuxrbTTBu0EYap7oH13w75L6C/+7e9mcoF9akhcR6GyYajwVMQEjdapJg==}
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
    peerDependencies:
      async-validator: ^4
      axios: ^1
@@ -4552,13 +4471,8 @@ packages:
  '@vueuse/metadata@10.11.1':
    resolution: {integrity: sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==}

-<<<<<<< HEAD
-  '@vueuse/metadata@11.0.1':
-    resolution: {integrity: sha512-dTFvuHFAjLYOiSd+t9Sk7xUiuL6jbfay/eX+g+jaipXXlwKur2VCqBCZX+jfu+2vROUGcUsdn3fJR9KkpadIOg==}
-=======
  '@vueuse/metadata@11.0.3':
    resolution: {integrity: sha512-+FtbO4SD5WpsOcQTcC0hAhNlOid6QNLzqedtquTtQ+CRNBoAt9GuV07c6KNHK1wCmlq8DFPwgiLF2rXwgSHX5Q==}
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5

  '@vueuse/metadata@9.13.0':
    resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}
@@ -4566,13 +4480,8 @@ packages:
  '@vueuse/shared@10.11.1':
    resolution: {integrity: sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==}

-<<<<<<< HEAD
-  '@vueuse/shared@11.0.1':
-    resolution: {integrity: sha512-eAPf5CQB3HR0S76HqrhjBqFYstZfiHWZq8xF9EQmobGBkrhPfErJEhr8aMNQMqd6MkENIx2pblIEfJGlHpClug==}
-=======
  '@vueuse/shared@11.0.3':
    resolution: {integrity: sha512-0rY2m6HS5t27n/Vp5cTDsKTlNnimCqsbh/fmT2LgE+aaU42EMfXo8+bNX91W9I7DDmxfuACXMmrd7d79JxkqWA==}
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5

  '@vueuse/shared@9.13.0':
    resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}
@@ -8687,14 +8596,11 @@ packages:

  rollup@4.21.0:
    resolution: {integrity: sha512-vo+S/lfA2lMS7rZ2Qoubi6I5hwZwzXeUIctILZLbHI+laNtvhhOIon2S1JksA5UEDQ7l3vberd0fxK44lTYjbQ==}
-<<<<<<< HEAD
-=======
    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
    hasBin: true

  rollup@4.21.1:
    resolution: {integrity: sha512-ZnYyKvscThhgd3M5+Qt3pmhO4jIRR5RGzaSovB6Q7rGNrK5cUncrtLmcTTJVSdcKXyZjW8X8MB0JMSuH9bcAJg==}
->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
    hasBin: true

@@ -12895,53 +12801,6 @@ snapshots:
    optionalDependencies:
      rollup: 4.21.0

-<<<<<<< HEAD
-  '@rollup/rollup-android-arm-eabi@4.21.0':
-    optional: true
-
-  '@rollup/rollup-android-arm64@4.21.0':
-    optional: true
-
-  '@rollup/rollup-darwin-arm64@4.21.0':
-    optional: true
-
-  '@rollup/rollup-darwin-x64@4.21.0':
-    optional: true
-
-  '@rollup/rollup-linux-arm-gnueabihf@4.21.0':
-    optional: true
-
-  '@rollup/rollup-linux-arm-musleabihf@4.21.0':
-    optional: true
-
-  '@rollup/rollup-linux-arm64-gnu@4.21.0':
-    optional: true
-
-  '@rollup/rollup-linux-arm64-musl@4.21.0':
-    optional: true
-
-  '@rollup/rollup-linux-powerpc64le-gnu@4.21.0':
-    optional: true
-
-  '@rollup/rollup-linux-riscv64-gnu@4.21.0':
-    optional: true
-
-  '@rollup/rollup-linux-s390x-gnu@4.21.0':
-    optional: true
-
-  '@rollup/rollup-linux-x64-gnu@4.21.0':
-    optional: true
-
-  '@rollup/rollup-linux-x64-musl@4.21.0':
-    optional: true
-
-  '@rollup/rollup-win32-arm64-msvc@4.21.0':
-    optional: true
-
-  '@rollup/rollup-win32-ia32-msvc@4.21.0':
-    optional: true
-
-=======
  '@rollup/pluginutils@5.1.0(rollup@4.21.1)':
    dependencies:
      '@types/estree': 1.0.5
@@ -13040,7 +12899,6 @@ snapshots:
  '@rollup/rollup-win32-ia32-msvc@4.21.1':
    optional: true

->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
  '@rollup/rollup-win32-x64-msvc@4.21.0':
    optional: true

@@ -13325,16 +13183,12 @@ snapshots:
      '@typescript-eslint/types': 7.18.0
      '@typescript-eslint/visitor-keys': 7.18.0

-<<<<<<< HEAD
  '@typescript-eslint/scope-manager@8.2.0':
-=======
-  '@typescript-eslint/scope-manager@8.1.0':
    dependencies:
-      '@typescript-eslint/types': 8.1.0
-      '@typescript-eslint/visitor-keys': 8.1.0
+      '@typescript-eslint/types': 8.2.0
+      '@typescript-eslint/visitor-keys': 8.2.0

  '@typescript-eslint/scope-manager@8.3.0':
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
    dependencies:
      '@typescript-eslint/types': 8.3.0
      '@typescript-eslint/visitor-keys': 8.3.0
@@ -13353,13 +13207,9 @@ snapshots:

  '@typescript-eslint/types@7.18.0': {}

-<<<<<<< HEAD
  '@typescript-eslint/types@8.2.0': {}
-=======
-  '@typescript-eslint/types@8.1.0': {}

  '@typescript-eslint/types@8.3.0': {}
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5

  '@typescript-eslint/typescript-estree@7.18.0(typescript@5.5.4)':
    dependencies:
@@ -13376,13 +13226,10 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-<<<<<<< HEAD
  '@typescript-eslint/typescript-estree@8.2.0(typescript@5.5.4)':
-=======
-  '@typescript-eslint/typescript-estree@8.1.0(typescript@5.5.4)':
    dependencies:
-      '@typescript-eslint/types': 8.1.0
-      '@typescript-eslint/visitor-keys': 8.1.0
+      '@typescript-eslint/types': 8.2.0
+      '@typescript-eslint/visitor-keys': 8.2.0
      debug: 4.3.6
      globby: 11.1.0
      is-glob: 4.0.3
@@ -13395,7 +13242,6 @@ snapshots:
      - supports-color

  '@typescript-eslint/typescript-estree@8.3.0(typescript@5.5.4)':
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
    dependencies:
      '@typescript-eslint/types': 8.3.0
      '@typescript-eslint/visitor-keys': 8.3.0
@@ -13421,22 +13267,18 @@ snapshots:
      - supports-color
      - typescript

-<<<<<<< HEAD
-  '@typescript-eslint/utils@8.2.0(eslint@9.9.0(jiti@1.21.6))(typescript@5.5.4)':
-=======
-  '@typescript-eslint/utils@8.1.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.5.4)':
+  '@typescript-eslint/utils@8.2.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.5.4)':
    dependencies:
      '@eslint-community/eslint-utils': 4.4.0(eslint@9.9.1(jiti@1.21.6))
-      '@typescript-eslint/scope-manager': 8.1.0
-      '@typescript-eslint/types': 8.1.0
-      '@typescript-eslint/typescript-estree': 8.1.0(typescript@5.5.4)
+      '@typescript-eslint/scope-manager': 8.2.0
+      '@typescript-eslint/types': 8.2.0
+      '@typescript-eslint/typescript-estree': 8.2.0(typescript@5.5.4)
      eslint: 9.9.1(jiti@1.21.6)
    transitivePeerDependencies:
      - supports-color
      - typescript

  '@typescript-eslint/utils@8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.5.4)':
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
    dependencies:
      '@eslint-community/eslint-utils': 4.4.0(eslint@9.9.1(jiti@1.21.6))
      '@typescript-eslint/scope-manager': 8.3.0
@@ -13452,16 +13294,12 @@ snapshots:
      '@typescript-eslint/types': 7.18.0
      eslint-visitor-keys: 3.4.3

-<<<<<<< HEAD
  '@typescript-eslint/visitor-keys@8.2.0':
-=======
-  '@typescript-eslint/visitor-keys@8.1.0':
    dependencies:
-      '@typescript-eslint/types': 8.1.0
+      '@typescript-eslint/types': 8.2.0
      eslint-visitor-keys: 3.4.3

  '@typescript-eslint/visitor-keys@8.3.0':
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
    dependencies:
      '@typescript-eslint/types': 8.3.0
      eslint-visitor-keys: 3.4.3
@@ -13696,19 +13534,11 @@ snapshots:
      - '@vue/composition-api'
      - vue

-<<<<<<< HEAD
-  '@vueuse/core@11.0.1(vue@3.4.38(typescript@5.5.4))':
-    dependencies:
-      '@types/web-bluetooth': 0.0.20
-      '@vueuse/metadata': 11.0.1
-      '@vueuse/shared': 11.0.1(vue@3.4.38(typescript@5.5.4))
-=======
  '@vueuse/core@11.0.3(vue@3.4.38(typescript@5.5.4))':
    dependencies:
      '@types/web-bluetooth': 0.0.20
      '@vueuse/metadata': 11.0.3
      '@vueuse/shared': 11.0.3(vue@3.4.38(typescript@5.5.4))
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
      vue-demi: 0.14.10(vue@3.4.38(typescript@5.5.4))
    transitivePeerDependencies:
      - '@vue/composition-api'
@@ -13724,17 +13554,10 @@ snapshots:
      - '@vue/composition-api'
      - vue

-<<<<<<< HEAD
-  '@vueuse/integrations@11.0.1(async-validator@4.2.5)(axios@1.7.5)(focus-trap@7.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.2)(vue@3.4.38(typescript@5.5.4))':
-    dependencies:
-      '@vueuse/core': 11.0.1(vue@3.4.38(typescript@5.5.4))
-      '@vueuse/shared': 11.0.1(vue@3.4.38(typescript@5.5.4))
-=======
  '@vueuse/integrations@11.0.3(async-validator@4.2.5)(axios@1.7.5)(focus-trap@7.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.2)(vue@3.4.38(typescript@5.5.4))':
    dependencies:
      '@vueuse/core': 11.0.3(vue@3.4.38(typescript@5.5.4))
      '@vueuse/shared': 11.0.3(vue@3.4.38(typescript@5.5.4))
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
      vue-demi: 0.14.10(vue@3.4.38(typescript@5.5.4))
    optionalDependencies:
      async-validator: 4.2.5
@@ -13749,11 +13572,7 @@ snapshots:

  '@vueuse/metadata@10.11.1': {}

-<<<<<<< HEAD
-  '@vueuse/metadata@11.0.1': {}
-=======
  '@vueuse/metadata@11.0.3': {}
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5

  '@vueuse/metadata@9.13.0': {}

@@ -13764,11 +13583,7 @@ snapshots:
      - '@vue/composition-api'
      - vue

-<<<<<<< HEAD
-  '@vueuse/shared@11.0.1(vue@3.4.38(typescript@5.5.4))':
-=======
  '@vueuse/shared@11.0.3(vue@3.4.38(typescript@5.5.4))':
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
    dependencies:
      vue-demi: 0.14.10(vue@3.4.38(typescript@5.5.4))
    transitivePeerDependencies:
@@ -15394,15 +15209,9 @@ snapshots:

  eslint-plugin-perfectionist@3.2.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.5.4)(vue-eslint-parser@9.4.3(eslint@9.9.1(jiti@1.21.6))):
    dependencies:
-<<<<<<< HEAD
      '@typescript-eslint/types': 8.2.0
-      '@typescript-eslint/utils': 8.2.0(eslint@9.9.0(jiti@1.21.6))(typescript@5.5.4)
-      eslint: 9.9.0(jiti@1.21.6)
-=======
-      '@typescript-eslint/types': 8.1.0
-      '@typescript-eslint/utils': 8.1.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.2.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.5.4)
      eslint: 9.9.1(jiti@1.21.6)
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
      minimatch: 10.0.1
      natural-compare-lite: 1.4.0
    optionalDependencies:
@@ -19307,10 +19116,10 @@ snapshots:
    transitivePeerDependencies:
      - rollup

-  unplugin-vue-components@0.27.4(@babel/parser@7.25.4)(rollup@4.21.0)(vue@3.4.38(typescript@5.5.4)):
+  unplugin-vue-components@0.27.4(@babel/parser@7.25.4)(rollup@4.21.1)(vue@3.4.38(typescript@5.5.4)):
    dependencies:
      '@antfu/utils': 0.7.10
-      '@rollup/pluginutils': 5.1.0(rollup@4.21.0)
+      '@rollup/pluginutils': 5.1.0(rollup@4.21.1)
      chokidar: 3.6.0
      debug: 4.3.6
      fast-glob: 3.3.2
@@ -19459,13 +19268,8 @@ snapshots:
  vite-plugin-dts@4.0.3(@types/node@22.5.0)(rollup@4.21.1)(typescript@5.5.4)(vite@5.4.2(@types/node@22.5.0)(less@4.2.0)(sass@1.77.8)(terser@5.31.6)):
    dependencies:
      '@microsoft/api-extractor': 7.47.4(@types/node@22.5.0)
-<<<<<<< HEAD
-      '@rollup/pluginutils': 5.1.0(rollup@4.21.0)
-      '@volar/typescript': 2.4.0
-=======
      '@rollup/pluginutils': 5.1.0(rollup@4.21.1)
-      '@volar/typescript': 2.3.4
->>>>>>> c439d5601faedacdc5897902e85fffae2b27276b
+      '@volar/typescript': 2.4.0
      '@vue/language-core': 2.0.29(typescript@5.5.4)
      compare-versions: 6.1.1
      debug: 4.3.6
@@ -19584,13 +19388,8 @@ snapshots:
      '@vitejs/plugin-vue': 5.1.2(vite@5.4.2(@types/node@22.5.0)(less@4.2.0)(sass@1.77.8)(terser@5.31.6))(vue@3.4.38(typescript@5.5.4))
      '@vue/devtools-api': 7.3.8
      '@vue/shared': 3.4.38
-<<<<<<< HEAD
-      '@vueuse/core': 11.0.1(vue@3.4.38(typescript@5.5.4))
-      '@vueuse/integrations': 11.0.1(async-validator@4.2.5)(axios@1.7.5)(focus-trap@7.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.2)(vue@3.4.38(typescript@5.5.4))
-=======
      '@vueuse/core': 11.0.3(vue@3.4.38(typescript@5.5.4))
      '@vueuse/integrations': 11.0.3(async-validator@4.2.5)(axios@1.7.5)(focus-trap@7.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.2)(vue@3.4.38(typescript@5.5.4))
->>>>>>> 3b5c935bb81795c48aa3d7974f824524c7a86ba5
      focus-trap: 7.5.4
      mark.js: 8.11.1
      minisearch: 7.1.0